projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0c708f1
)
Improve some regexes for embedded players
author
dst
<dstftw@gmail.com>
Wed, 29 Jan 2014 21:26:46 +0000
(
04:26
+0700)
committer
dst
<dstftw@gmail.com>
Wed, 29 Jan 2014 21:26:46 +0000
(
04:26
+0700)
youtube_dl/extractor/generic.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/generic.py
b/youtube_dl/extractor/generic.py
index 48de379b723741ed826e19bc1d4db308cf7bed8e..e0d51996ded5f1604bebe5d0c03c1dbc815f31ce 100644
(file)
--- a/
youtube_dl/extractor/generic.py
+++ b/
youtube_dl/extractor/generic.py
@@
-254,7
+254,7
@@
class GenericIE(InfoExtractor):
# Look for embedded (iframe) Vimeo player
mobj = re.search(
# Look for embedded (iframe) Vimeo player
mobj = re.search(
- r'<iframe[^>]+?src="((?:https?:)?//player
.vimeo
.com/video/.+?)"', webpage)
+ r'<iframe[^>]+?src="((?:https?:)?//player
\.vimeo\
.com/video/.+?)"', webpage)
if mobj:
player_url = unescapeHTML(mobj.group(1))
surl = smuggle_url(player_url, {'Referer': url})
if mobj:
player_url = unescapeHTML(mobj.group(1))
surl = smuggle_url(player_url, {'Referer': url})
@@
-262,7
+262,7
@@
class GenericIE(InfoExtractor):
# Look for embedded (swf embed) Vimeo player
mobj = re.search(
# Look for embedded (swf embed) Vimeo player
mobj = re.search(
- r'<embed[^>]+?src="(https?://(?:www\.)?vimeo
.com/moogaloop
.swf.+?)"', webpage)
+ r'<embed[^>]+?src="(https?://(?:www\.)?vimeo
\.com/moogaloop\
.swf.+?)"', webpage)
if mobj:
return self.url_result(mobj.group(1), 'Vimeo')
if mobj:
return self.url_result(mobj.group(1), 'Vimeo')
@@
-332,7
+332,7
@@
class GenericIE(InfoExtractor):
return self.url_result(mobj.group(1), 'Aparat')
# Look for MPORA videos
return self.url_result(mobj.group(1), 'Aparat')
# Look for MPORA videos
- mobj = re.search(r'<iframe .*?src="(http://mpora\.
com
/videos/[^"]+)"', webpage)
+ mobj = re.search(r'<iframe .*?src="(http://mpora\.
(?:com|de)
/videos/[^"]+)"', webpage)
if mobj is not None:
return self.url_result(mobj.group(1), 'Mpora')
if mobj is not None:
return self.url_result(mobj.group(1), 'Mpora')
@@
-350,7
+350,7
@@
class GenericIE(InfoExtractor):
# Look for embedded Huffington Post player
mobj = re.search(
# Look for embedded Huffington Post player
mobj = re.search(
- r'<iframe[^>]+?src=(["\'])(?P<url>https?://embed\.live.huffingtonpost\.com/.+?)\1', webpage)
+ r'<iframe[^>]+?src=(["\'])(?P<url>https?://embed\.live
\
.huffingtonpost\.com/.+?)\1', webpage)
if mobj is not None:
return self.url_result(mobj.group('url'), 'HuffPost')
if mobj is not None:
return self.url_result(mobj.group('url'), 'HuffPost')