aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-06-27 11:44:46 -0700
committerPhilipp Hagemeister <phihag@phihag.de>2013-06-27 11:44:46 -0700
commitde282fc217e481bb3cce6158a09551658759fe01 (patch)
treeab2bfa4001bb3f89a139a02995997e925c09570a /youtube_dl
parent0e853ca4c4ca28a32e657c99a95bd460bd36ed66 (diff)
parent27473d18da11e5e7edec040a70d43e4296e303e7 (diff)
Merge pull request #954 from gitprojs/generic
Augmented Generic IE
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/generic.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 7a877b3bc..759fd60a7 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -102,7 +102,7 @@ class GenericIE(InfoExtractor):
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'<meta (?:property|name)="twitter:player:stream" (?:content|value)="(.+?)"', webpage)
@@ -135,7 +135,7 @@ class GenericIE(InfoExtractor):
# Video Title - Tagline | Site Name
# and so on and so forth; it's just not practical
video_title = self._html_search_regex(r'<title>(.*)</title>',
- webpage, u'video title')
+ webpage, u'video title', default=u'video')
# video uploader is domain name
video_uploader = self._search_regex(r'(?:https?://)?([^/]*)/.*',