From 56a93763c2977b718938a8f800a03fa0c89929d9 Mon Sep 17 00:00:00 2001 From: Vignesh Date: Sat, 23 Nov 2013 23:48:49 -0800 Subject: [PATCH] GenericIE: Relaxing JW Player regex to be more generic Removing the "&" from the regular expressions parsing JW Player's videos. Doing this helps not truncate (potentially mandatory) arguments in the file URL. Example case which was failing because of this and works successfully after applying this patch: http://goo.gl/7X5tOk --- youtube_dl/extractor/generic.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 0b5f2b2bb..28d0f7502 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -203,13 +203,13 @@ class GenericIE(InfoExtractor): return self.url_result(burl) # Start with something easy: JW Player in SWFObject - mobj = re.search(r'flashvars: [\'"](?:.*&)?file=(http[^\'"&]*)', webpage) + mobj = re.search(r'flashvars: [\'"](?:.*&)?file=(http[^\'"]*)', webpage) if mobj is None: # Broaden the search a little bit - mobj = re.search(r'[^A-Za-z0-9]?(?:file|source)=(http[^\'"&]*)', webpage) + mobj = re.search(r'[^A-Za-z0-9]?(?:file|source)=(http[^\'"]*)', webpage) if mobj is None: # Broaden the search a little bit: JWPlayer JS loader - mobj = re.search(r'[^A-Za-z0-9]?file["\']?:\s*["\'](http[^\'"&]*)', webpage) + mobj = re.search(r'[^A-Za-z0-9]?file["\']?:\s*["\'](http[^\'"]*)', webpage) if mobj is None: # Try to find twitter cards info mobj = re.search(r'