|
@ -511,23 +511,18 @@ class GenericIE(InfoExtractor): |
|
|
if mobj is not None: |
|
|
if mobj is not None: |
|
|
return self.url_result(mobj.group(1), 'Mpora') |
|
|
return self.url_result(mobj.group(1), 'Mpora') |
|
|
|
|
|
|
|
|
# Look for embedded NovaMov player |
|
|
|
|
|
|
|
|
# Look for embedded NovaMov-based player |
|
|
mobj = re.search( |
|
|
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: |
|
|
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 |
|
|
# Look for embedded Facebook player |
|
|
mobj = re.search( |
|
|
mobj = re.search( |
|
|