Merge branch 'master' of https://github.com/DarkstaIkers/youtube-dl into DarkstaIkers...

[youtube-dl] / youtube_dl / extractor / videomore.py

diff --git a/youtube_dl/extractor/videomore.py b/youtube_dl/extractor/videomore.py
index 328b5b7fbae72d8bfe28909488665c65bec2c8a7..7f25665864c696757903deeb582a64f16eec0d85 100644 (file)
--- a/youtube_dl/extractor/videomore.py
+++ b/youtube_dl/extractor/videomore.py
@@ -84,8 +84,13 @@ class VideomoreIE(InfoExtractor):
     @staticmethod
     def _extract_url(webpage):
         mobj = re.search(
-            r'<object[^>]+data=(["\'])https?://videomore.ru/player\.swf\?.*config=(?P<url>https?://videomore\.ru/(?:[^/]+/)+\d+\.xml).*\1',
+            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')