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

change f4m tests to m3u8

Browse Source
This commit is contained in:
remitamine 2015-07-20 21:15:01 +01:00
parent 801cfb8fa9
commit b0b3714618
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
youtube_dl/extractor/foxsports.py
View File

@ -11,7 +11,7 @@ class FoxSportsIE(InfoExtractor):
'url': 'http://www.foxsports.com/video?vid=432609859715', 'url': 'http://www.foxsports.com/video?vid=432609859715',
'info_dict': { 'info_dict': {
'id': 'gA0bHB3Ladz3', 'id': 'gA0bHB3Ladz3',
'ext': 'flv', 'ext': 'm3u8',
'title': 'Courtney Lee on going up 2-0 in series vs. Blazers', 'title': 'Courtney Lee on going up 2-0 in series vs. Blazers',
'description': 'Courtney Lee talks about Memphis being focused.', 'description': 'Courtney Lee talks about Memphis being focused.',
}, },
@ -29,4 +29,4 @@ class FoxSportsIE(InfoExtractor):
video_id) video_id)
return self.url_result(smuggle_url( return self.url_result(smuggle_url(
config['releaseURL'] + '&manifest=f4m', {'force_smil_url': True})) config['releaseURL'] + '&manifest=m3u', {'force_smil_url': True}))

16
youtube_dl/extractor/nationalgeographic.py
View File

@ -15,21 +15,29 @@ class NationalGeographicIE(InfoExtractor):
'url': 'http://video.nationalgeographic.com/video/news/150210-news-crab-mating-vin?source=featuredvideo', 'url': 'http://video.nationalgeographic.com/video/news/150210-news-crab-mating-vin?source=featuredvideo',
'info_dict': { 'info_dict': {
'id': '4DmDACA6Qtk_', 'id': '4DmDACA6Qtk_',
'ext': 'flv', 'ext': 'm3u8',
'title': 'Mating Crabs Busted by Sharks', 'title': 'Mating Crabs Busted by Sharks',
'description': 'md5:16f25aeffdeba55aaa8ec37e093ad8b3', 'description': 'md5:16f25aeffdeba55aaa8ec37e093ad8b3',
}, },
'add_ie': ['ThePlatform'], 'add_ie': ['ThePlatform'],
'params': {
# m3u8 download
'skip_download': True,
},
}, },
{ {
'url': 'http://video.nationalgeographic.com/wild/when-sharks-attack/the-real-jaws', 'url': 'http://video.nationalgeographic.com/wild/when-sharks-attack/the-real-jaws',
'info_dict': { 'info_dict': {
'id': '_JeBD_D7PlS5', 'id': '_JeBD_D7PlS5',
'ext': 'flv', 'ext': 'm3u8',
'title': 'The Real Jaws', 'title': 'The Real Jaws',
'description': 'md5:8d3e09d9d53a85cd397b4b21b2c77be6', 'description': 'md5:8d3e09d9d53a85cd397b4b21b2c77be6',
}, },
'add_ie': ['ThePlatform'], 'add_ie': ['ThePlatform'],
'params': {
# m3u8 download
'skip_download': True,
},
}, },
] ]
@ -48,7 +56,7 @@ class NationalGeographicIE(InfoExtractor):
theplatform_id = url_basename(content.attrib.get('url')) theplatform_id = url_basename(content.attrib.get('url'))
return self.url_result(smuggle_url( return self.url_result(smuggle_url(
'http://link.theplatform.com/s/ngs/%s?format=SMIL&formats=MPEG4&manifest=f4m' % theplatform_id, 'http://link.theplatform.com/s/ngs/%s?format=SMIL&formats=MPEG4&manifest=m3u' % theplatform_id,
# For some reason, the normal links don't work and we must force # For some reason, the normal links don't work and we must force
# the use of f4m # the use of m3u8
{'force_smil_url': True})) {'force_smil_url': True}))

8
youtube_dl/extractor/theplatform.py
View File

@ -60,10 +60,14 @@ class ThePlatformIE(InfoExtractor):
'url': 'https://player.theplatform.com/p/D6x-PC/pulse_preview/embed/select/media/yMBg9E8KFxZD', 'url': 'https://player.theplatform.com/p/D6x-PC/pulse_preview/embed/select/media/yMBg9E8KFxZD',
'info_dict': { 'info_dict': {
'id': 'yMBg9E8KFxZD', 'id': 'yMBg9E8KFxZD',
'ext': 'mp4', 'ext': 'm3u8',
'description': 'md5:644ad9188d655b742f942bf2e06b002d', 'description': 'md5:644ad9188d655b742f942bf2e06b002d',
'title': 'HIGHLIGHTS: USA bag first ever series Cup win', 'title': 'HIGHLIGHTS: USA bag first ever series Cup win',
} },
'params': {
# m3u8 download
'skip_download': True,
},
}, { }, {
'url': 'http://player.theplatform.com/p/NnzsPC/widget/select/media/4Y0TlYUr_ZT7', 'url': 'http://player.theplatform.com/p/NnzsPC/widget/select/media/4Y0TlYUr_ZT7',
'only_matching': True, 'only_matching': True,