depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-15 05:45:39 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
Petr Půlpán 2014-06-25 17:45:24 +02:00
commit 2f775107f9
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
test/test_playlists.py
View file

@ -40,6 +40,7 @@ from youtube_dl.extractor import (
KhanAcademyIE, KhanAcademyIE,
EveryonesMixtapeIE, EveryonesMixtapeIE,
RutubeChannelIE, RutubeChannelIE,
RutubePersonIE,
GoogleSearchIE, GoogleSearchIE,
GenericIE, GenericIE,
TEDIE, TEDIE,
@ -256,10 +257,18 @@ class TestPlaylists(unittest.TestCase):
def test_rutube_channel(self): def test_rutube_channel(self):
dl = FakeYDL() dl = FakeYDL()
ie = RutubeChannelIE(dl) ie = RutubeChannelIE(dl)
result = ie.extract('http://rutube.ru/tags/video/1409') result = ie.extract('http://rutube.ru/tags/video/1800/')
self.assertIsPlaylist(result) self.assertIsPlaylist(result)
self.assertEqual(result['id'], '1409') self.assertEqual(result['id'], '1800')
self.assertTrue(len(result['entries']) >= 34) self.assertTrue(len(result['entries']) >= 68)
def test_rutube_person(self):
dl = FakeYDL()
ie = RutubePersonIE(dl)
result = ie.extract('http://rutube.ru/video/person/313878/')
self.assertIsPlaylist(result)
self.assertEqual(result['id'], '313878')
self.assertTrue(len(result['entries']) >= 37)
def test_multiple_brightcove_videos(self): def test_multiple_brightcove_videos(self):
# https://github.com/rg3/youtube-dl/issues/2283 # https://github.com/rg3/youtube-dl/issues/2283

2
youtube_dl/extractor/bliptv.py
View file

@ -15,7 +15,7 @@ from ..utils import (
class BlipTVIE(SubtitlesInfoExtractor): class BlipTVIE(SubtitlesInfoExtractor):
_VALID_URL = r'https?://(?:\w+\.)?blip\.tv/(?:(?:.+-|rss/flash/)(?P<id>\d+)|((?:play/|api\.swf#)(?P<lookup_id>[\da-zA-Z]+)))' _VALID_URL = r'https?://(?:\w+\.)?blip\.tv/(?:(?:.+-|rss/flash/)(?P<id>\d+)|((?:play/|api\.swf#)(?P<lookup_id>[\da-zA-Z+]+)))'
_TESTS = [ _TESTS = [
{ {