Merge tag 'upstream/2013.10.23'

[youtubedl] / youtube_dl / extractor / myvideo.py

diff --git a/youtube_dl/extractor/myvideo.py b/youtube_dl/extractor/myvideo.py
index 47a44e3e0ec0acce8bec22fe1c2622658549ae2f..0404e6e43f381c86f8bb91633ca5524564009957 100644 (file)
--- a/youtube_dl/extractor/myvideo.py
+++ b/youtube_dl/extractor/myvideo.py
@@ -2,11 +2,13 @@ import binascii
 import base64
 import hashlib
 import re
 import base64
 import hashlib
 import re

+import json

 
 from .common import InfoExtractor
 from ..utils import (
     compat_ord,
     compat_urllib_parse,
 
 from .common import InfoExtractor
 from ..utils import (
     compat_ord,
     compat_urllib_parse,

+    compat_urllib_request,

 
     ExtractorError,
 )
 
     ExtractorError,
 )


@@ -16,8 +18,16 @@ from ..utils import (
 class MyVideoIE(InfoExtractor):
     """Information Extractor for myvideo.de."""
 
 class MyVideoIE(InfoExtractor):
     """Information Extractor for myvideo.de."""
 

-    _VALID_URL = r'(?:http://)?(?:www\.)?myvideo\.de/watch/([0-9]+)/([^?/]+).*'
+    _VALID_URL = r'(?:http://)?(?:www\.)?myvideo\.de/(?:[^/]+/)?watch/([0-9]+)/([^?/]+).*'

     IE_NAME = u'myvideo'
     IE_NAME = u'myvideo'

+    _TEST = {
+        u'url': u'http://www.myvideo.de/watch/8229274/bowling_fail_or_win',
+        u'file': u'8229274.flv',
+        u'md5': u'2d2753e8130479ba2cb7e0a37002053e',
+        u'info_dict': {
+            u"title": u"bowling-fail-or-win"
+        }
+    }

 
     # Original Code from: https://github.com/dersphere/plugin.video.myvideo_de.git
     # Released into the Public Domain by Tristan Fischer on 2013-05-19
 
     # Original Code from: https://github.com/dersphere/plugin.video.myvideo_de.git
     # Released into the Public Domain by Tristan Fischer on 2013-05-19


@@ -77,6 +87,20 @@ class MyVideoIE(InfoExtractor):
                 'ext':      video_ext,
             }]
 
                 'ext':      video_ext,
             }]
 

+        mobj = re.search(r'data-video-service="/service/data/video/%s/config' % video_id, webpage)
+        if mobj is not None:
+            request = compat_urllib_request.Request('http://www.myvideo.de/service/data/video/%s/config' % video_id, '')
+            response = self._download_webpage(request, video_id,
+                                              u'Downloading video info')
+            info = json.loads(base64.b64decode(response).decode('utf-8'))
+            return {'id': video_id,
+                    'title': info['title'],
+                    'url': info['streaming_url'].replace('rtmpe', 'rtmpt'),
+                    'play_path': info['filename'],
+                    'ext': 'flv',
+                    'thumbnail': info['thumbnail'][0]['url'],
+                    }
+

         # try encxml
         mobj = re.search('var flashvars={(.+?)}', webpage)
         if mobj is None:
         # try encxml
         mobj = re.search('var flashvars={(.+?)}', webpage)
         if mobj is None: