From 1426441ad78a17a95f820cd27b55f00638b9023f Mon Sep 17 00:00:00 2001 From: Enigmaquip Date: Sat, 11 Nov 2017 16:49:00 -0700 Subject: [PATCH] Simplify extractor --- youtube_dl/extractor/screencast.py | 47 +++++------------------------- 1 file changed, 8 insertions(+), 39 deletions(-) diff --git a/youtube_dl/extractor/screencast.py b/youtube_dl/extractor/screencast.py index ea0e6592e..dfefec64d 100644 --- a/youtube_dl/extractor/screencast.py +++ b/youtube_dl/extractor/screencast.py @@ -62,45 +62,13 @@ class ScreencastIE(InfoExtractor): video_id = self._match_id(url) webpage = self._download_webpage(url, video_id) - video_url = self._html_search_regex( - r'Title: ([^<]+)', - r'class="tabSeperator">>(.+?)<', - r'([^<]+)'], - webpage, 'title') - thumbnail = self._og_search_thumbnail(webpage) + json_url = self._html_search_regex( + r'json\+oembed" href="([^"]+)"', webpage, + 'json embed', default=None) + data = self._download_json(json_url,video_id) + video_url = data.get('url') + title = data.get('title') or self._og_search_title(webpage, default=None) + thumbnail = data.get('thumbnail_url') or self._og_search_thumbnail(webpage, default=None) description = self._og_search_description(webpage, default=None) if description is None: description = self._html_search_meta('description', webpage) @@ -112,3 +80,4 @@ class ScreencastIE(InfoExtractor): 'description': description, 'thumbnail': thumbnail, } +