From 6a398a6dc71735c8f8dc579fd6d2bdda7cf58658 Mon Sep 17 00:00:00 2001 From: carsten demming Date: Tue, 20 Feb 2018 12:44:20 +0100 Subject: [PATCH 1/3] - fixed redtube test case md5,upload date and duration --- youtube_dl/extractor/redtube.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/redtube.py b/youtube_dl/extractor/redtube.py index 843e45d36..45c4c6197 100644 --- a/youtube_dl/extractor/redtube.py +++ b/youtube_dl/extractor/redtube.py @@ -16,13 +16,13 @@ class RedTubeIE(InfoExtractor): _VALID_URL = r'https?://(?:(?:www\.)?redtube\.com/|embed\.redtube\.com/\?.*?\bid=)(?P[0-9]+)' _TESTS = [{ 'url': 'http://www.redtube.com/66418', - 'md5': '7b8c22b5e7098a3e1c09709df1126d2d', + 'md5': 'fc08071233725f26b8f014dba9590005', 'info_dict': { 'id': '66418', 'ext': 'mp4', 'title': 'Sucked on a toilet', - 'upload_date': '20120831', - 'duration': 596, + 'upload_date': '20110811', + 'duration': None, 'view_count': int, 'age_limit': 18, } From 2bae0435a84e0c6791b0e1f22ca25bb00b5781c2 Mon Sep 17 00:00:00 2001 From: carsten demming Date: Tue, 20 Feb 2018 21:48:36 +0100 Subject: [PATCH 2/3] - fixed regex to get duration --- youtube_dl/extractor/redtube.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/redtube.py b/youtube_dl/extractor/redtube.py index 45c4c6197..b9d6ecfc7 100644 --- a/youtube_dl/extractor/redtube.py +++ b/youtube_dl/extractor/redtube.py @@ -22,7 +22,7 @@ class RedTubeIE(InfoExtractor): 'ext': 'mp4', 'title': 'Sucked on a toilet', 'upload_date': '20110811', - 'duration': None, + 'duration': 596, 'view_count': int, 'age_limit': 18, } @@ -91,7 +91,7 @@ class RedTubeIE(InfoExtractor): r']+>ADDED ([^<]+)<', webpage, 'upload date', fatal=False)) duration = int_or_none(self._search_regex( - r'videoDuration\s*:\s*(\d+)', webpage, 'duration', default=None)) + '', webpage, 'duration', default=None)) view_count = str_to_int(self._search_regex( (r']*>Views\s*]*>\s*([\d,.]+)', r']*>VIEWS\s*\s*\s*([\d,.]+)'), From 81d50228b82d511c3a47791a3c0ceceef39003e8 Mon Sep 17 00:00:00 2001 From: carsten demming Date: Wed, 21 Feb 2018 00:07:38 +0100 Subject: [PATCH 3/3] - using common helper method for property - readded fallback --- youtube_dl/extractor/redtube.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/redtube.py b/youtube_dl/extractor/redtube.py index b9d6ecfc7..879bcf81d 100644 --- a/youtube_dl/extractor/redtube.py +++ b/youtube_dl/extractor/redtube.py @@ -90,8 +90,9 @@ class RedTubeIE(InfoExtractor): upload_date = unified_strdate(self._search_regex( r']+>ADDED ([^<]+)<', webpage, 'upload date', fatal=False)) - duration = int_or_none(self._search_regex( - '', webpage, 'duration', default=None)) + duration = int_or_none(self._og_search_property( + 'video:duration', webpage, default=None) or self._search_regex( + r'videoDuration\s*:\s*(\d+)', webpage, 'duration', default=None)) view_count = str_to_int(self._search_regex( (r']*>Views\s*]*>\s*([\d,.]+)', r']*>VIEWS\s*\s*\s*([\d,.]+)'),