R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[gameone] This fix resolves issue #4552

Browse Source 
The duration metadata for certain episodes contained floating point
numbers instead of integers. Now only the integer part will be
interpreted. Also added a test for this
This commit is contained in:
Tobias Bell 2014-12-23 22:09:21 +01:00
parent 544dec6298
commit 55f0cab3a3
1 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
youtube_dl/extractor/gameone.py
View File

@ -21,21 +21,38 @@ RAW_MP4_URL = 'http://cdn.riptide-mtvn.com/'
class GameOneIE(InfoExtractor): class GameOneIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?gameone\.de/tv/(?P<id>\d+)' _VALID_URL = r'https?://(?:www\.)?gameone\.de/tv/(?P<id>\d+)'
_TEST = { _TESTS = [
'url': 'http://www.gameone.de/tv/288', {
'md5': '136656b7fb4c9cb4a8e2d500651c499b', 'url': 'http://www.gameone.de/tv/288',
'info_dict': { 'md5': '136656b7fb4c9cb4a8e2d500651c499b',
'id': '288', 'info_dict': {
'ext': 'mp4', 'id': '288',
'title': 'Game One - Folge 288', 'ext': 'mp4',
'duration': 1238, 'title': 'Game One - Folge 288',
'thumbnail': 'http://s3.gameone.de/gameone/assets/video_metas/teaser_images/000/643/636/big/640x360.jpg', 'duration': 1238,
'description': 'FIFA-Pressepokal 2014, Star Citizen, Kingdom Come: Deliverance, Project Cars, Schöner Trants Nerdquiz Folge 2 Runde 1', 'thumbnail': 'http://s3.gameone.de/gameone/assets/video_metas/teaser_images/000/643/636/big/640x360.jpg',
'age_limit': 16, 'description': 'FIFA-Pressepokal 2014, Star Citizen, Kingdom Come: Deliverance, Project Cars, Schöner Trants Nerdquiz Folge 2 Runde 1',
'upload_date': '20140513', 'age_limit': 16,
'timestamp': 1399980122, 'upload_date': '20140513',
'timestamp': 1399980122,
}
},
{
'url': 'http://gameone.de/tv/220',
'md5': '5227ca74c4ae6b5f74c0510a7c48839e',
'info_dict': {
'id': '220',
'ext': 'mp4',
'upload_date': '20120918',
'description': 'Jet Set Radio HD, Tekken Tag Tournament 2, Source Filmmaker',
'timestamp': 1347971451,
'title': 'Game One - Folge 220',
'duration': 896,
'age_limit': 16,
}
} }
}
]
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
@ -66,7 +83,7 @@ class GameOneIE(InfoExtractor):
video_id, video_id,
'Downloading media:content') 'Downloading media:content')
rendition_items = content.findall('.//rendition') rendition_items = content.findall('.//rendition')
duration = int(rendition_items[0].get('duration')) duration = int(rendition_items[0].get('duration').split('.')[0])
formats = [ formats = [
{ {
'url': re.sub(r'.*/(r2)', RAW_MP4_URL + r'\1', r.find('./src').text), 'url': re.sub(r'.*/(r2)', RAW_MP4_URL + r'\1', r.find('./src').text),
@ -105,7 +122,8 @@ class GameOnePlaylistIE(InfoExtractor):
webpage = self._download_webpage('http://www.gameone.de/tv', 'TV') webpage = self._download_webpage('http://www.gameone.de/tv', 'TV')
max_id = max(map(int, re.findall(r'<a href="/tv/(\d+)"', webpage))) max_id = max(map(int, re.findall(r'<a href="/tv/(\d+)"', webpage)))
entries = [ entries = [
self.url_result('http://www.gameone.de/tv/%d' % video_id, 'GameOne') self.url_result('http://www.gameone.de/tv/%d' %
video_id, 'GameOne')
for video_id in range(max_id, 0, -1)] for video_id in range(max_id, 0, -1)]
return { return {