diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-01-08 01:27:11 -0800 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-01-08 01:27:11 -0800 |
| commit | bb3c20965e8e816b8918ca085e0b7dae2b52a322 (patch) | |
| tree | f6af6e1496fcb255ca56d7557ef937620f64bd27 | |
| parent | 10bff13a6687527c2290c9345c50a337771a0bb1 (diff) | |
| parent | 5f59ee794252f0a5a33c770cf8c0039486184d78 (diff) | |
Merge pull request #2116 from dstftw/novamov
[novamov] Add embedded player support
| -rw-r--r-- | youtube_dl/extractor/generic.py | 6 | ||||
| -rw-r--r-- | youtube_dl/extractor/novamov.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 70001f87d..ff23161d7 100644 --- 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 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', |