aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/generic.py
diff options
context:
space:
mode:
authorRemita Amine <remitamine@gmail.com>2019-10-17 13:21:44 +0100
committerRemita Amine <remitamine@gmail.com>2019-10-17 13:21:44 +0100
commit755541a4c8ac3dd4e8b9abd0c7df95182a1f3fd4 (patch)
tree33763c40eb2894ceb62fb15aae8ea15dc92d476f /youtube_dl/extractor/generic.py
parent86f63633c8e7c62ce245d1352d4d381efb614466 (diff)
downloadyoutube-dl-755541a4c8ac3dd4e8b9abd0c7df95182a1f3fd4.tar.xz
[mangomolo] fix video format extraction and add support for player URLs
Diffstat (limited to 'youtube_dl/extractor/generic.py')
-rw-r--r--youtube_dl/extractor/generic.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index ec43c5ae4..5ed952b29 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -2962,10 +2962,14 @@ class GenericIE(InfoExtractor):
# Look for Mangomolo embeds
mobj = re.search(
- r'''(?x)<iframe[^>]+src=(["\'])(?P<url>(?:https?:)?//(?:www\.)?admin\.mangomolo\.com/analytics/index\.php/customers/embed/
+ r'''(?x)<iframe[^>]+src=(["\'])(?P<url>(?:https?:)?//
+ (?:
+ admin\.mangomolo\.com/analytics/index\.php/customers/embed|
+ player\.mangomolo\.com/v1
+ )/
(?:
video\?.*?\bid=(?P<video_id>\d+)|
- index\?.*?\bchannelid=(?P<channel_id>(?:[A-Za-z0-9+/=]|%2B|%2F|%3D)+)
+ (?:index|live)\?.*?\bchannelid=(?P<channel_id>(?:[A-Za-z0-9+/=]|%2B|%2F|%3D)+)
).+?)\1''', webpage)
if mobj is not None:
info = {