youtube-dl

commit bb3c20965e8e816b8918ca085e0b7dae2b52a322
parent 10bff13a6687527c2290c9345c50a337771a0bb1
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Wed,  8 Jan 2014 01:27:11 -0800

Merge pull request #2116 from dstftw/novamov

[novamov] Add embedded player support
Diffstat:
M
youtube_dl/extractor/generic.py
 | 
6
++++++
M
youtube_dl/extractor/novamov.py
 | 
2
+-

2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
@@ -312,6 +312,12 @@ class GenericIE(InfoExtractor):
         if mobj is not None:
             return self.url_result(mobj.group(1), 'Mpora')
 
+        # Look for embedded Novamov player
+        mobj = re.search(
+            r'<iframe[^>]+?src=(["\'])(?P<url>http://(?:(?:embed|www)\.)?novamov\.com/embed\.php.+?)\1', webpage)
+        if mobj is not None:
+            return self.url_result(mobj.group('url'), 'Novamov')
+
         # Start with something easy: JW Player in SWFObject
         mobj = re.search(r'flashvars: [\'"](?:.*&)?file=(http[^\'"&]*)', webpage)
         if mobj is None:
diff --git a/youtube_dl/extractor/novamov.py b/youtube_dl/extractor/novamov.py
@@ -10,7 +10,7 @@ from ..utils import (
 
 
 class NovamovIE(InfoExtractor):
-    _VALID_URL = r'http://(?:www\.novamov\.com/video/|embed\.novamov\.com/embed\.php\?v=)(?P<videoid>[a-z\d]{13})'
+    _VALID_URL = r'http://(?:(?:www\.)?novamov\.com/video/|(?:(?:embed|www)\.)novamov\.com/embed\.php\?v=)(?P<videoid>[a-z\d]{13})'
 
     _TEST = {
         'url': 'http://www.novamov.com/video/4rurhn9x446jj',