From: Sergey M․ Date: Thu, 19 Apr 2018 15:36:33 +0000 (+0700) Subject: [extremetube] Fix metadata extraction X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=d317973284f6d9886bda0bf8215ffb4f060af41d;p=youtube-dl [extremetube] Fix metadata extraction --- diff --git a/youtube_dl/extractor/extremetube.py b/youtube_dl/extractor/extremetube.py index 445f9438d..acd4090fa 100644 --- a/youtube_dl/extractor/extremetube.py +++ b/youtube_dl/extractor/extremetube.py @@ -8,12 +8,12 @@ class ExtremeTubeIE(KeezMoviesIE): _VALID_URL = r'https?://(?:www\.)?extremetube\.com/(?:[^/]+/)?video/(?P[^/#?&]+)' _TESTS = [{ 'url': 'http://www.extremetube.com/video/music-video-14-british-euro-brit-european-cumshots-swallow-652431', - 'md5': '1fb9228f5e3332ec8c057d6ac36f33e0', + 'md5': '92feaafa4b58e82f261e5419f39c60cb', 'info_dict': { 'id': 'music-video-14-british-euro-brit-european-cumshots-swallow-652431', 'ext': 'mp4', 'title': 'Music Video 14 british euro brit european cumshots swallow', - 'uploader': 'unknown', + 'uploader': 'anonim', 'view_count': int, 'age_limit': 18, } @@ -36,10 +36,10 @@ class ExtremeTubeIE(KeezMoviesIE): r']+title="([^"]+)"[^>]*>', webpage, 'title') uploader = self._html_search_regex( - r'Uploaded by:\s*\s*(.+?)\s*', + r'Uploaded by:\s*]+>\s*]+>(.+?)', webpage, 'uploader', fatal=False) view_count = str_to_int(self._search_regex( - r'Views:\s*\s*([\d,\.]+)', + r'Views:\s*]+>\s*<[^>]+>([\d,\.]+)