projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
12c3ec3
)
[metacafe] Avoid excessive nesting
author
Philipp Hagemeister
<phihag@phihag.de>
Thu, 21 Aug 2014 11:37:19 +0000
(13:37 +0200)
committer
Philipp Hagemeister
<phihag@phihag.de>
Thu, 21 Aug 2014 11:37:19 +0000
(13:37 +0200)
youtube_dl/extractor/metacafe.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/metacafe.py
b/youtube_dl/extractor/metacafe.py
index c3a4a333cdd697dc8f4ed49af63d8996ca043d19..96a4f101870b43f7e27c4654a3bfa7c67ae325a1 100644
(file)
--- a/
youtube_dl/extractor/metacafe.py
+++ b/
youtube_dl/extractor/metacafe.py
@@
-134,6
+134,7
@@
class MetacafeIE(InfoExtractor):
# Extract URL, uploader and title from webpage
self.report_extraction(video_id)
# Extract URL, uploader and title from webpage
self.report_extraction(video_id)
+ video_url = None
mobj = re.search(r'(?m)&mediaURL=([^&]+)', webpage)
if mobj is not None:
mediaURL = compat_urllib_parse.unquote(mobj.group(1))
mobj = re.search(r'(?m)&mediaURL=([^&]+)', webpage)
if mobj is not None:
mediaURL = compat_urllib_parse.unquote(mobj.group(1))
@@
-146,14
+147,16
@@
class MetacafeIE(InfoExtractor):
else:
gdaKey = mobj.group(1)
video_url = '%s?__gda__=%s' % (mediaURL, gdaKey)
else:
gdaKey = mobj.group(1)
video_url = '%s?__gda__=%s' % (mediaURL, gdaKey)
-
els
e:
+
if video_url is Non
e:
mobj = re.search(r'<video src="([^"]+)"', webpage)
if mobj:
video_url = mobj.group(1)
video_ext = 'mp4'
mobj = re.search(r'<video src="([^"]+)"', webpage)
if mobj:
video_url = mobj.group(1)
video_ext = 'mp4'
- else:
- flashvars = self._search_regex(
- r' name="flashvars" value="(.*?)"', webpage, 'flashvars')
+ if video_url is None:
+ flashvars = self._search_regex(
+ r' name="flashvars" value="(.*?)"', webpage, 'flashvars',
+ default=None)
+ if flashvars:
vardict = compat_parse_qs(flashvars)
if 'mediaData' not in vardict:
raise ExtractorError('Unable to extract media URL')
vardict = compat_parse_qs(flashvars)
if 'mediaData' not in vardict:
raise ExtractorError('Unable to extract media URL')
@@
-165,6
+168,7
@@
class MetacafeIE(InfoExtractor):
video_url = '%s?__gda__=%s' % (mediaURL, mobj.group('key'))
video_ext = determine_ext(video_url)
video_url = '%s?__gda__=%s' % (mediaURL, mobj.group('key'))
video_ext = determine_ext(video_url)
+
video_title = self._html_search_regex(
r'(?im)<title>(.*) - Video</title>', webpage, 'title')
description = self._og_search_description(webpage)
video_title = self._html_search_regex(
r'(?im)<title>(.*) - Video</title>', webpage, 'title')
description = self._og_search_description(webpage)