projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[teamfourstar] Simplify _VALID_URL and relax regexes
[youtube-dl]
/
youtube_dl
/
extractor
/
videomore.py
diff --git
a/youtube_dl/extractor/videomore.py
b/youtube_dl/extractor/videomore.py
index 8a11ff84828a26d35566c7f5fe65c3f4cdc322b4..7f25665864c696757903deeb582a64f16eec0d85 100644
(file)
--- a/
youtube_dl/extractor/videomore.py
+++ b/
youtube_dl/extractor/videomore.py
@@
-86,6
+86,11
@@
class VideomoreIE(InfoExtractor):
mobj = re.search(
r'<object[^>]+data=(["\'])https?://videomore\.ru/player\.swf\?.*config=(?P<url>https?://videomore\.ru/(?:[^/]+/)+\d+\.xml).*\1',
webpage)
mobj = re.search(
r'<object[^>]+data=(["\'])https?://videomore\.ru/player\.swf\?.*config=(?P<url>https?://videomore\.ru/(?:[^/]+/)+\d+\.xml).*\1',
webpage)
+ if not mobj:
+ mobj = re.search(
+ r'<iframe[^>]+src=([\'"])(?P<url>https?://videomore\.ru/embed/\d+)',
+ webpage)
+
if mobj:
return mobj.group('url')
if mobj:
return mobj.group('url')