X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fynet.py;h=9cd7989cc553b58043425cc5b852b258ee4834aa;hb=2a834bdb21b1a747ba91b27a582aa48e8f28ec0b;hp=66d53962a58c9d78cede366ecc684dd5fe3a3472;hpb=a0a90b3ba14ef09735624214f04bfaaa91efe8a2;p=youtube-dl diff --git a/youtube_dl/extractor/ynet.py b/youtube_dl/extractor/ynet.py index 66d53962a..9cd7989cc 100644 --- a/youtube_dl/extractor/ynet.py +++ b/youtube_dl/extractor/ynet.py @@ -9,11 +9,10 @@ from ..utils import compat_urllib_parse class YnetIE(InfoExtractor): - _VALID_URL = r'http://.*ynet\.co\.il/.*/0,7340,(?PL(?:-[0-9]+)+),00\.html' + _VALID_URL = r'http://(?:.+?\.)?ynet\.co\.il/(?:.+?/)?0,7340,(?PL(?:-[0-9]+)+),00\.html' _TESTS = [ { 'url': 'http://hot.ynet.co.il/home/0,7340,L-11659-99244,00.html', - 'md5': '002b44ee2f33d50363a1c153bed524cf', 'info_dict': { 'id': 'L-11659-99244', 'ext': 'flv', @@ -22,7 +21,6 @@ class YnetIE(InfoExtractor): } }, { 'url': 'http://hot.ynet.co.il/home/0,7340,L-8859-84418,00.html', - 'md5': '6455046ae1b48cf7e2b7cae285e53a16', 'info_dict': { 'id': 'L-8859-84418', 'ext': 'flv', @@ -33,9 +31,7 @@ class YnetIE(InfoExtractor): ] def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - video_id = mobj.group('id') - + video_id = self._match_id(url) webpage = self._download_webpage(url, video_id) content = compat_urllib_parse.unquote_plus(self._og_search_video_url(webpage))