ansol/youtube-dl
7
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-19 11:34:04 +00:00
Code Issues Projects Releases Wiki Activity

[twitch] Move URL matching tests into extractor

Browse Source
This commit is contained in:
Philipp Hagemeister 2015-01-22 18:18:21 +01:00
parent 650ab5beeb
commit 78111136db
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/test_all_urls.py
View File

@ -14,7 +14,6 @@ from test.helper import gettestcases
from youtube_dl.extractor import ( from youtube_dl.extractor import (
FacebookIE, FacebookIE,
gen_extractors, gen_extractors,
TwitchIE,
YoutubeIE, YoutubeIE,
) )
@ -72,18 +71,6 @@ class TestAllURLsMatching(unittest.TestCase):
self.assertMatch('http://www.youtube.com/results?search_query=making+mustard', ['youtube:search_url']) self.assertMatch('http://www.youtube.com/results?search_query=making+mustard', ['youtube:search_url'])
self.assertMatch('https://www.youtube.com/results?baz=bar&search_query=youtube-dl+test+video&filters=video&lclk=video', ['youtube:search_url']) self.assertMatch('https://www.youtube.com/results?baz=bar&search_query=youtube-dl+test+video&filters=video&lclk=video', ['youtube:search_url'])
def test_twitch_channelid_matching(self):
self.assertTrue(TwitchIE.suitable('twitch.tv/vanillatv'))
self.assertTrue(TwitchIE.suitable('www.twitch.tv/vanillatv'))
self.assertTrue(TwitchIE.suitable('http://www.twitch.tv/vanillatv'))
self.assertTrue(TwitchIE.suitable('http://www.twitch.tv/vanillatv/'))
def test_twitch_videoid_matching(self):
self.assertTrue(TwitchIE.suitable('http://www.twitch.tv/vanillatv/b/328087483'))
def test_twitch_chapterid_matching(self):
self.assertTrue(TwitchIE.suitable('http://www.twitch.tv/tsm_theoddone/c/2349361'))
def test_youtube_extract(self): def test_youtube_extract(self):
assertExtractId = lambda url, id: self.assertEqual(YoutubeIE.extract_id(url), id) assertExtractId = lambda url, id: self.assertEqual(YoutubeIE.extract_id(url), id)
assertExtractId('http://www.youtube.com/watch?&v=BaW_jenozKc', 'BaW_jenozKc') assertExtractId('http://www.youtube.com/watch?&v=BaW_jenozKc', 'BaW_jenozKc')

7
youtube_dl/extractor/twitch.py
View File

@ -148,14 +148,17 @@ class TwitchChapterIE(TwitchItemBaseIE):
_ITEM_TYPE = 'chapter' _ITEM_TYPE = 'chapter'
_ITEM_SHORTCUT = 'c' _ITEM_SHORTCUT = 'c'
_TEST = { _TESTS = [{
'url': 'http://www.twitch.tv/acracingleague/c/5285812', 'url': 'http://www.twitch.tv/acracingleague/c/5285812',
'info_dict': { 'info_dict': {
'id': 'c5285812', 'id': 'c5285812',
'title': 'ACRL Off Season - Sports Cars @ Nordschleife', 'title': 'ACRL Off Season - Sports Cars @ Nordschleife',
}, },
'playlist_mincount': 3, 'playlist_mincount': 3,
} }, {
'url': 'http://www.twitch.tv/tsm_theoddone/c/2349361',
'only_matching': True,
}]
class TwitchVodIE(TwitchItemBaseIE): class TwitchVodIE(TwitchItemBaseIE):