X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Fmpora.py;h=88c9501cd4e34492003a1fe67923d1d84a9e2d2b;hb=ea1d5bdcddc4b9bdac0ef5555f080484c33467a9;hp=6a8e2cc442c25327d9d91acebb47d4e109750731;hpb=dfa50793d8541ff2c5603f7c3b727c0f6e551d8d;p=youtube-dl diff --git a/youtube_dl/extractor/mpora.py b/youtube_dl/extractor/mpora.py index 6a8e2cc44..88c9501cd 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,7 +28,7 @@ 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) @@ -46,7 +44,7 @@ class MporaIE(InfoExtractor): r'_([0-9]+)\.[a-zA-Z0-9]+$', src['src'], False, default=None) vcodec = src['type'].partition('/')[2] - + formats.append({ 'format_id': encoding_id + '-' + vcodec, 'url': src['src'],