From: dst <dstftw@gmail.com>
Date: Wed, 8 Jan 2014 01:07:11 +0000 (+0700)
Subject: [novamov] Add embedded player support
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=8f89e68781c62f1173980dde06cdfefbd3020be5;p=youtube-dl

[novamov] Add embedded player support
---

diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 70001f87d..e15642107 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -311,6 +311,12 @@ class GenericIE(InfoExtractor):
         mobj = re.search(r'<iframe .*?src="(http://mpora\.com/videos/[^"]+)"', webpage)
         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)
diff --git a/youtube_dl/extractor/novamov.py b/youtube_dl/extractor/novamov.py
index 50e3233ce..48ee00da3 100644
--- 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',