summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergey M. <dstftw@gmail.com>2014-02-24 23:37:42 +0700
committerSergey M. <dstftw@gmail.com>2014-02-24 23:37:42 +0700
commitb1c6c32f785d2e0ec943da0bc88609bcd4409ae3 (patch)
treea8bdb1d94954594041bd20cb2924c5aa724cb506
parentf1c9dfcc010611adf145f74d86047b7387b62025 (diff)
downloadyoutube-dl-b1c6c32f785d2e0ec943da0bc88609bcd4409ae3.tar.gz
youtube-dl-b1c6c32f785d2e0ec943da0bc88609bcd4409ae3.tar.xz
youtube-dl-b1c6c32f785d2e0ec943da0bc88609bcd4409ae3.zip
[generic] Add support for nowvideo embedded videos
-rw-r--r--youtube_dl/extractor/generic.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 9a2e54d14..22d1b5daa 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -363,11 +363,17 @@ class GenericIE(InfoExtractor):
         if mobj is not None:
             return self.url_result(mobj.group(1), 'Mpora')
 
-        # Look for embedded Novamov player
+        # 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')
+            return self.url_result(mobj.group('url'), 'NovaMov')
+
+        # Look for embedded NowVideo player
+        mobj = re.search(
+            r'<iframe[^>]+?src=(["\'])(?P<url>http://(?:(?:embed|www)\.)?nowvideo\.(?:ch|sx|eu)/embed\.php.+?)\1', webpage)
+        if mobj is not None:
+            return self.url_result(mobj.group('url'), 'NowVideo')
 
         # Look for embedded Facebook player
         mobj = re.search(