diff options
| author | Petr Půlpán <Pulpan3@gmail.com> | 2014-06-25 17:45:24 +0200 |
|---|---|---|
| committer | Petr Půlpán <Pulpan3@gmail.com> | 2014-06-25 17:45:24 +0200 |
| commit | 2f775107f90b8b28d1854feacdc02248b0d03150 (patch) | |
| tree | b819575b4062a16f0d04118d1919aa1303c90062 | |
| parent | 85342674b29e474226c8a137d841fcfe16f004f5 (diff) | |
| parent | fd69098a45a85f84455140aa14c7384670eef572 (diff) | |
Merge branch 'master' of github.com:rg3/youtube-dl
| -rw-r--r-- | test/test_playlists.py | 15 | ||||
| -rw-r--r-- | youtube_dl/extractor/bliptv.py | 2 |
2 files changed, 13 insertions, 4 deletions
diff --git a/test/test_playlists.py b/test/test_playlists.py index ee91e412a..42051fe2a 100644 --- a/test/test_playlists.py +++ b/test/test_playlists.py @@ -40,6 +40,7 @@ from youtube_dl.extractor import ( KhanAcademyIE, EveryonesMixtapeIE, RutubeChannelIE, + RutubePersonIE, GoogleSearchIE, GenericIE, TEDIE, @@ -256,10 +257,18 @@ class TestPlaylists(unittest.TestCase): def test_rutube_channel(self): dl = FakeYDL() 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.assertEqual(result['id'], '1409') - self.assertTrue(len(result['entries']) >= 34) + self.assertEqual(result['id'], '1800') + 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): # https://github.com/rg3/youtube-dl/issues/2283 diff --git a/youtube_dl/extractor/bliptv.py b/youtube_dl/extractor/bliptv.py index d4da08991..acfc4ad73 100644 --- a/youtube_dl/extractor/bliptv.py +++ b/youtube_dl/extractor/bliptv.py @@ -15,7 +15,7 @@ from ..utils import ( 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 = [ { |