X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fmpora.py;h=88c9501cd4e34492003a1fe67923d1d84a9e2d2b;hb=c2e64f71d075bbc916f343916ff1e679f642a821;hp=b4cdd2a1e283cd2c5616c58bb9d4100fe0304c3f;hpb=c93c2ab1c3bc84f5525e2771c48bcd6d384d9dae;p=youtube-dl

diff --git a/youtube_dl/extractor/mpora.py b/youtube_dl/extractor/mpora.py
index b4cdd2a1e..88c9501cd 100644
--- a/youtube_dl/extractor/mpora.py
+++ b/youtube_dl/extractor/mpora.py
@@ -4,14 +4,12 @@ import json
 import re
 
 from .common import InfoExtractor
-from ..utils import (
-    int_or_none,
-)
+from ..utils import int_or_none
 
 
 class MporaIE(InfoExtractor):
     _VALID_URL = r'^https?://(www\.)?mpora\.(?:com|de)/videos/(?P<id>[^?#/]+)'
-    _IE_NAME = 'MPORA'
+    IE_NAME = 'MPORA'
 
     _TEST = {
         'url': 'http://mpora.de/videos/AAdo8okx4wiz/embed?locale=de',
@@ -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']
@@ -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'],