projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5379a2d
)
[nrk:playlist] Relax video id regex and improve _VALID_URL
author
Sergey M․
<dstftw@gmail.com>
Sat, 21 Mar 2015 14:42:48 +0000
(20:42 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 21 Mar 2015 14:42:48 +0000
(20:42 +0600)
youtube_dl/extractor/nrk.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/nrk.py
b/youtube_dl/extractor/nrk.py
index 1355ecea2926e738996a57cf7026eeb59f64ea16..e91d3a248ec3367af8b7e9a8f60be0d503877481 100644
(file)
--- a/
youtube_dl/extractor/nrk.py
+++ b/
youtube_dl/extractor/nrk.py
@@
-77,17
+77,25
@@
class NRKIE(InfoExtractor):
class NRKPlaylistIE(InfoExtractor):
class NRKPlaylistIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?nrk\.no/(?!video)
[^/]+/
(?P<id>[^/]+)'
+ _VALID_URL = r'http://(?:www\.)?nrk\.no/(?!video)
(?:[^/]+/)+
(?P<id>[^/]+)'
- _TEST
=
{
+ _TEST
S = [
{
'url': 'http://www.nrk.no/troms/gjenopplev-den-historiske-solformorkelsen-1.12270763',
'info_dict': {
'id': 'gjenopplev-den-historiske-solformorkelsen-1.12270763',
'title': 'Gjenopplev den historiske solformørkelsen',
'description': 'md5:c2df8ea3bac5654a26fc2834a542feed',
},
'url': 'http://www.nrk.no/troms/gjenopplev-den-historiske-solformorkelsen-1.12270763',
'info_dict': {
'id': 'gjenopplev-den-historiske-solformorkelsen-1.12270763',
'title': 'Gjenopplev den historiske solformørkelsen',
'description': 'md5:c2df8ea3bac5654a26fc2834a542feed',
},
- 'playlist_mincount': 2,
- }
+ 'playlist_count': 2,
+ }, {
+ 'url': 'http://www.nrk.no/kultur/bok/rivertonprisen-til-karin-fossum-1.12266449',
+ 'info_dict': {
+ 'id': 'rivertonprisen-til-karin-fossum-1.12266449',
+ 'title': 'Rivertonprisen til Karin Fossum',
+ 'description': 'Første kvinne på 15 år til å vinne krimlitteraturprisen.',
+ },
+ 'playlist_count': 5,
+ }]
def _real_extract(self, url):
playlist_id = self._match_id(url)
def _real_extract(self, url):
playlist_id = self._match_id(url)
@@
-97,7
+105,8
@@
class NRKPlaylistIE(InfoExtractor):
entries = [
self.url_result('nrk:%s' % video_id, 'NRK')
for video_id in re.findall(
entries = [
self.url_result('nrk:%s' % video_id, 'NRK')
for video_id in re.findall(
- r'class="[^"]*\brich\b[^"]*"[^>]+data-video-id="(\d+)"', webpage)
+ r'class="[^"]*\brich\b[^"]*"[^>]+data-video-id="([^"]+)"',
+ webpage)
]
playlist_title = self._og_search_title(webpage)
]
playlist_title = self._og_search_title(webpage)