X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fgeneric.py;h=8b2d1d033ab2f260e49b18c8ecc7d1d3fc695eaf;hb=e5402ac1203c8fd0c438ad515bbd80eb288b3907;hp=5bd315051e7cfe2f003c675e0142fdf6234fc566;hpb=fa8deaf38b0d576d693a6565dcdb3b29877a4c94;p=youtube-dl diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 5bd315051..8b2d1d033 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -640,7 +640,7 @@ class GenericIE(InfoExtractor): mobj = re.search(r']*https?://api\.blip\.tv/\w+/redirect/\w+/(\d+)', webpage) if mobj: return self.url_result('http://blip.tv/a/a-'+mobj.group(1), 'BlipTV') - mobj = re.search(r'<(?:iframe|embed|object)\s[^>]*(https?://(?:\w+\.)?blip\.tv/(?:play/|api\.swf#)[a-zA-Z0-9]+)', webpage) + mobj = re.search(r'<(?:iframe|embed|object)\s[^>]*(https?://(?:\w+\.)?blip\.tv/(?:play/|api\.swf#)[a-zA-Z0-9_]+)', webpage) if mobj: return self.url_result(mobj.group(1), 'BlipTV') @@ -833,7 +833,7 @@ class GenericIE(InfoExtractor): if m_video_type is not None: def check_video(vurl): vpath = compat_urlparse.urlparse(vurl).path - return not vpath.endswith('.swf') + return '.' in vpath and not vpath.endswith('.swf') found = list(filter( check_video, re.findall(r'