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

Merge branch 'master' of github.com:rg3/youtube-dl

This commit is contained in:
Philipp Hagemeister 2014-02-15 15:34:17 +01:00
parent 4edff78531 99043c2ea5
commit 6a7a389679
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/test_playlists.py
View File

@ -55,10 +55,10 @@ class TestPlaylists(unittest.TestCase):
def test_dailymotion_user(self): def test_dailymotion_user(self):
dl = FakeYDL() dl = FakeYDL()
ie = DailymotionUserIE(dl) ie = DailymotionUserIE(dl)
result = ie.extract('http://www.dailymotion.com/user/generation-quoi/') result = ie.extract('https://www.dailymotion.com/user/nqtv')
self.assertIsPlaylist(result) self.assertIsPlaylist(result)
self.assertEqual(result['title'], 'Génération Quoi') self.assertEqual(result['title'], 'Rémi Gaillard')
self.assertTrue(len(result['entries']) >= 26) self.assertTrue(len(result['entries']) >= 100)
def test_vimeo_channel(self): def test_vimeo_channel(self):
dl = FakeYDL() dl = FakeYDL()

1
youtube_dl/extractor/francetv.py
View File

@ -184,6 +184,7 @@ class GenerationQuoiIE(InfoExtractor):
# It uses Dailymotion # It uses Dailymotion
'skip_download': True, 'skip_download': True,
}, },
'skip': 'Only available from France',
} }
def _real_extract(self, url): def _real_extract(self, url):

12
youtube_dl/extractor/ndr.py
View File

@ -26,15 +26,15 @@ class NDRIE(InfoExtractor):
}, },
}, },
{ {
'url': 'http://www.ndr.de/903/audio191719.html', 'url': 'http://www.ndr.de/info/audio51535.html',
'md5': '41ed601768534dd18a9ae34d84798129', 'md5': 'bb3cd38e24fbcc866d13b50ca59307b8',
'note': 'Audio file', 'note': 'Audio file',
'info_dict': { 'info_dict': {
'id': '191719', 'id': '51535',
'ext': 'mp3', 'ext': 'mp3',
'title': '"Es war schockierend"', 'title': 'La Valette entgeht der Hinrichtung',
'description': 'md5:ed7ff8364793545021a6355b97e95f10', 'description': 'md5:22f9541913a40fe50091d5cdd7c9f536',
'duration': 112, 'duration': 884,
} }
} }
] ]

1
youtube_dl/extractor/sohu.py
View File

@ -17,6 +17,7 @@ class SohuIE(InfoExtractor):
u'info_dict': { u'info_dict': {
u'title': u'MV：Far East Movement《The Illest》', u'title': u'MV：Far East Movement《The Illest》',
}, },
u'skip': u'Only available from China',
} }
def _real_extract(self, url): def _real_extract(self, url):

3
youtube_dl/extractor/vesti.py
View File

@ -87,8 +87,7 @@ class VestiIE(InfoExtractor):
video_id = mobj.group('id') video_id = mobj.group('id')
else: else:
mobj = re.search( mobj = re.search(
r'<div.+?id="current-video-holder".*?>\s*<iframe src="http://player\.rutv\.ru/iframe/(?P<type>[^/]+)/id/(?P<id>\d+)[^"]*"', r'<iframe.+?src="http://player\.rutv\.ru/iframe/(?P<type>[^/]+)/id/(?P<id>\d+)[^"]*".*?></iframe>', page)
page)
if not mobj: if not mobj:
raise ExtractorError('No media found') raise ExtractorError('No media found')