fenix
/
ytdl-nightly
mirror of https://github.com/ytdl-org/ytdl-nightly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[redtube] Fix duration extraction and update test

This commit is contained in:
Wandang 2018-02-21 15:55:28 +01:00 committed by Sergey M
parent 8315ee6c4c
commit 18ebd1a843
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
youtube_dl/extractor/redtube.py
View File

@ -16,12 +16,12 @@ class RedTubeIE(InfoExtractor):
_VALID_URL = r'https?://(?:(?:www\.)?redtube\.com/|embed\.redtube\.com/\?.*?\bid=)(?P<id>[0-9]+)' _VALID_URL = r'https?://(?:(?:www\.)?redtube\.com/|embed\.redtube\.com/\?.*?\bid=)(?P<id>[0-9]+)'
_TESTS = [{ _TESTS = [{
'url': 'http://www.redtube.com/66418', 'url': 'http://www.redtube.com/66418',
'md5': '7b8c22b5e7098a3e1c09709df1126d2d', 'md5': 'fc08071233725f26b8f014dba9590005',
'info_dict': { 'info_dict': {
'id': '66418', 'id': '66418',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Sucked on a toilet', 'title': 'Sucked on a toilet',
'upload_date': '20120831', 'upload_date': '20110811',
'duration': 596, 'duration': 596,
'view_count': int, 'view_count': int,
'age_limit': 18, 'age_limit': 18,
@ -90,8 +90,9 @@ class RedTubeIE(InfoExtractor):
upload_date = unified_strdate(self._search_regex( upload_date = unified_strdate(self._search_regex(
r'<span[^>]+>ADDED ([^<]+)<', r'<span[^>]+>ADDED ([^<]+)<',
webpage, 'upload date', fatal=False)) webpage, 'upload date', fatal=False))
duration = int_or_none(self._search_regex( duration = int_or_none(self._og_search_property(
r'videoDuration\s*:\s*(\d+)', webpage, 'duration', default=None)) '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( view_count = str_to_int(self._search_regex(
(r'<div[^>]*>Views</div>\s*<div[^>]*>\s*([\d,.]+)', (r'<div[^>]*>Views</div>\s*<div[^>]*>\s*([\d,.]+)',
r'<span[^>]*>VIEWS</span>\s*</td>\s*<td>\s*([\d,.]+)'), r'<span[^>]*>VIEWS</span>\s*</td>\s*<td>\s*([\d,.]+)'),