X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ftogglesg.py;h=22c6c91b9f15529076100ca07b523a9dd52e11b7;hb=e33c9cba7c6c9d4a04d749c88ab447a57bcfe423;hp=47b2bfcb8e71f8bae8507a0eef90909ef3002756;hpb=989e9f8eadc936ab47fcd0b7ba63aac13020a526;p=youtube-dl diff --git a/youtube_dl/extractor/togglesg.py b/youtube_dl/extractor/togglesg.py index 47b2bfcb8..22c6c91b9 100644 --- a/youtube_dl/extractor/togglesg.py +++ b/youtube_dl/extractor/togglesg.py @@ -17,7 +17,7 @@ from ..utils import ( class ToggleSgIE(InfoExtractor): IE_NAME = 'togglesg' - _VALID_URL = r'https?://video\.toggle\.sg/(?:en|zh)/(?:series|clips|movies)/.+?/(?P[0-9]+)' + _VALID_URL = r'https?://video\.toggle\.sg/(?:en|zh)/(?:series|clips|movies)/(?:[^/]+/)+(?P[0-9]+)' _TESTS = [{ 'url': 'http://video.toggle.sg/en/series/lion-moms-tif/trailers/lion-moms-premier/343115', 'info_dict': { @@ -46,8 +46,9 @@ class ToggleSgIE(InfoExtractor): 'skip_download': 'DRM-protected wvm download', } }, { + # this also tests correct video id extraction 'note': 'm3u8 links are geo-restricted, but Android/mp4 is okay', - 'url': 'http://video.toggle.sg/en/series/28th-sea-games-5-show/ep11/332861', + 'url': 'http://video.toggle.sg/en/series/28th-sea-games-5-show/28th-sea-games-5-show-ep11/332861', 'info_dict': { 'id': '332861', 'ext': 'mp4',