aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/nrk.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-03-21 20:42:48 +0600
committerSergey M․ <dstftw@gmail.com>2015-03-21 20:42:48 +0600
commita09141548aa31db7c7d9457b10f5c84e6e32beba (patch)
tree23b08f6e17535ac637ee194135f83d26127fe4fd /youtube_dl/extractor/nrk.py
parent5379a2d40db3674fead7c4239afdb65ff7b389c0 (diff)
[nrk:playlist] Relax video id regex and improve _VALID_URL
Diffstat (limited to 'youtube_dl/extractor/nrk.py')
-rw-r--r--youtube_dl/extractor/nrk.py19
1 files changed, 14 insertions, 5 deletions
diff --git a/youtube_dl/extractor/nrk.py b/youtube_dl/extractor/nrk.py
index 1355ecea2..e91d3a248 100644
--- a/youtube_dl/extractor/nrk.py
+++ b/youtube_dl/extractor/nrk.py
@@ -77,17 +77,25 @@ class NRKIE(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 = {
+ _TESTS = [{
'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)
@@ -97,7 +105,8 @@ class NRKPlaylistIE(InfoExtractor):
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)