diff options
| author | Sergey M․ <dstftw@gmail.com> | 2014-04-05 17:20:05 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2014-04-05 17:20:05 +0700 |
| commit | 15c0e8e7b264c926b2cdc90d00c88368acd4eeba (patch) | |
| tree | 2ba2351887907a4e9fb254ccb423d5d66b38421d | |
| parent | cca37fba486562efac63cfe4820ea9184c6857b9 (diff) | |
[generic] Generalize novamov based embeds
| -rw-r--r-- | youtube_dl/extractor/generic.py | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index e0d227aec..cf245d9cd 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -511,23 +511,18 @@ 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-based player mobj = re.search( - r'<iframe[^>]+?src=(["\'])(?P<url>http://(?:(?:embed|www)\.)?novamov\.com/embed\.php.+?)\1', webpage) + r'''(?x)<iframe[^>]+?src=(["\']) + (?P<url>http://(?:(?:embed|www)\.)? + (?:novamov\.com| + nowvideo\.(?:ch|sx|eu|at|ag|co)| + videoweed\.(?:es|com)| + movshare\.(?:net|sx|ag)| + divxstage\.(?:eu|net|ch|co|at|ag)) + /embed\.php.+?)\1''', webpage) if mobj is not None: - 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|at|ag|co)/embed\.php.+?)\1', webpage) - if mobj is not None: - return self.url_result(mobj.group('url'), 'NowVideo') - - # Look for embedded VideoWeed player - mobj = re.search( - r'<iframe[^>]+?src=(["\'])(?P<url>http://(?:(?:embed|www)\.)?videoweed\.(?:es|com)/embed\.php.+?)\1', webpage) - if mobj is not None: - return self.url_result(mobj.group('url'), 'VideoWeed') + return self.url_result(mobj.group('url')) # Look for embedded Facebook player mobj = re.search( |