X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fdrtv.py;h=d5df18d7c971c18f01c51128c75fbe4ee09ea070;hb=171ca612af948b2966e56054ce3a25a9f5ab2a76;hp=510ef04b0602290d44ebc038211b0d12a7d29824;hpb=71e7da653382b38d8cecde20d60f722417f1cf93;p=youtube-dl.git diff --git a/youtube_dl/extractor/drtv.py b/youtube_dl/extractor/drtv.py index 510ef04b0..d5df18d7c 100644 --- a/youtube_dl/extractor/drtv.py +++ b/youtube_dl/extractor/drtv.py @@ -6,7 +6,7 @@ from ..utils import parse_iso8601 class DRTVIE(SubtitlesInfoExtractor): - _VALID_URL = r'https?://(?:www\.)?dr\.dk/tv/se/(?:[^/]+/)+(?P[\da-z-]+)(?:[/#?]|$)' + _VALID_URL = r'https?://(?:www\.)?dr\.dk/tv/se/(?:[^/]+/)*(?P[\da-z-]+)(?:[/#?]|$)' _TEST = { 'url': 'http://www.dr.dk/tv/se/partiets-mand/partiets-mand-7-8', @@ -25,9 +25,15 @@ class DRTVIE(SubtitlesInfoExtractor): def _real_extract(self, url): video_id = self._match_id(url) - programcard = self._download_json( - 'http://www.dr.dk/mu/programcard/expanded/%s' % video_id, video_id, 'Downloading video JSON') + webpage = self._download_webpage(url, video_id) + + video_id = self._search_regex( + r'data-(?:material-identifier|episode-slug)="([^"]+)"', + webpage, 'video id') + programcard = self._download_json( + 'http://www.dr.dk/mu/programcard/expanded/%s' % video_id, + video_id, 'Downloading video JSON') data = programcard['Data'][0] title = data['Title']