projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rohieb-patch/enhance-tagesschau-regex'
[youtube-dl]
/
youtube_dl
/
extractor
/
mpora.py
diff --git
a/youtube_dl/extractor/mpora.py
b/youtube_dl/extractor/mpora.py
index 6db3c67a5a471d9cd850ad3bd828a9e2478c00e3..5a1bee5c85ea3e8c6105a58e5d34ab233a1ddbd2 100644
(file)
--- a/
youtube_dl/extractor/mpora.py
+++ b/
youtube_dl/extractor/mpora.py
@@
-5,7
+5,7
@@
from ..utils import int_or_none
class MporaIE(InfoExtractor):
class MporaIE(InfoExtractor):
- _VALID_URL = r'https?://(www\.)?mpora\.(?:com|de)/videos/(?P<id>[^?#/]+)'
+ _VALID_URL = r'https?://(
?:
www\.)?mpora\.(?:com|de)/videos/(?P<id>[^?#/]+)'
IE_NAME = 'MPORA'
_TEST = {
IE_NAME = 'MPORA'
_TEST = {
@@
-25,7
+25,9
@@
class MporaIE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
data_json = self._search_regex(
webpage = self._download_webpage(url, video_id)
data_json = self._search_regex(
- r"new FM\.Player\('[^']+',\s*(\{.*?)\).player;", webpage, 'json')
+ [r"new FM\.Player\('[^']+',\s*(\{.*?)\).player;",
+ r"new\s+FM\.Kaltura\.Player\('[^']+'\s*,\s*({.+?})\);"],
+ webpage, 'json')
data = self._parse_json(data_json, video_id)
uploader = data['info_overlay'].get('username')
data = self._parse_json(data_json, video_id)
uploader = data['info_overlay'].get('username')