X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fmpora.py;h=387935d4db784641377b72f5be9ec5e7649f5908;hb=191b7cbba95679b389a509420993af56ef51545d;hp=0836243ea6a7e5b6a74e74311e33e5fb56c6a788;hpb=0dc13f4c4a440519f85c79a94f6ba7587ed3a2fc;p=youtube-dl diff --git a/youtube_dl/extractor/mpora.py b/youtube_dl/extractor/mpora.py index 0836243ea..387935d4d 100644 --- a/youtube_dl/extractor/mpora.py +++ b/youtube_dl/extractor/mpora.py @@ -4,9 +4,7 @@ import json import re from .common import InfoExtractor -from ..utils import ( - int_or_none, -) +from ..utils import int_or_none class MporaIE(InfoExtractor): @@ -20,7 +18,7 @@ class MporaIE(InfoExtractor): 'info_dict': { 'title': 'Katy Curd - Winter in the Forest', 'duration': 416, - 'uploader': 'petenewman', + 'uploader': 'Peter Newman Media', }, } @@ -30,11 +28,11 @@ class MporaIE(InfoExtractor): webpage = self._download_webpage(url, video_id) data_json = self._search_regex( - r"new FM\.Player\('[^']+',\s*(\{.*?)\);\n", webpage, 'json') + r"new FM\.Player\('[^']+',\s*(\{.*?)\).player;", webpage, 'json') data = json.loads(data_json) - uploader = data['info_overlay']['name'] + uploader = data['info_overlay'].get('username') duration = data['video']['duration'] // 1000 thumbnail = data['video']['encodings']['sd']['poster'] title = data['info_overlay']['title']