aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-01-05 05:34:06 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-01-05 05:34:08 +0100
commitd981cef6b977ccd070bf2c26f3ec496a95c8f802 (patch)
treecd20e082e53dc3a79095a972c54559369a256a0b
parent6fa81ee96e88c4bed2a895fce99688cc4507d66a (diff)
[generic] Support gorillavid.in
Previously, we were a little bit over-eager and got a random swf file. Fixes #2084.
-rw-r--r--youtube_dl/extractor/generic.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 57a6b1820..8534c6f90 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -306,6 +306,9 @@ class GenericIE(InfoExtractor):
# Start with something easy: JW Player in SWFObject
mobj = re.search(r'flashvars: [\'"](?:.*&)?file=(http[^\'"&]*)', webpage)
if mobj is None:
+ # Look for gorilla-vid style embedding
+ mobj = re.search(r'(?s)jw_plugins.*?file:\s*["\'](.*?)["\']', webpage)
+ if mobj is None:
# Broaden the search a little bit
mobj = re.search(r'[^A-Za-z0-9]?(?:file|source)=(http[^\'"&]*)', webpage)
if mobj is None: