Initiate new release.

[youtubedl] / youtube_dl / extractor / myvideo.py

diff --git a/youtube_dl/extractor/myvideo.py b/youtube_dl/extractor/myvideo.py
index ccb5959c4046e73f1263ecee19e829b418c6d506..6bb64eb63c52018c34650a6361e7d70cad2459e0 100644 (file)
--- a/youtube_dl/extractor/myvideo.py
+++ b/youtube_dl/extractor/myvideo.py
@@ -7,17 +7,20 @@ import re
 import json
 
 from .common import InfoExtractor
 import json
 
 from .common import InfoExtractor

-from ..utils import (
+from ..compat import (

     compat_ord,
     compat_ord,

-    compat_urllib_parse,
-    compat_urllib_request,
-
+    compat_urllib_parse_unquote,
+    compat_urllib_parse_urlencode,
+)
+from ..utils import (

     ExtractorError,
     ExtractorError,

+    sanitized_Request,

 )
 
 
 class MyVideoIE(InfoExtractor):
 )
 
 
 class MyVideoIE(InfoExtractor):

-    _VALID_URL = r'http://(?:www\.)?myvideo\.de/(?:[^/]+/)?watch/(?P<id>[0-9]+)/[^?/]+.*'
+    _WORKING = False
+    _VALID_URL = r'https?://(?:www\.)?myvideo\.de/(?:[^/]+/)?watch/(?P<id>[0-9]+)/[^?/]+.*'

     IE_NAME = 'myvideo'
     _TEST = {
         'url': 'http://www.myvideo.de/watch/8229274/bowling_fail_or_win',
     IE_NAME = 'myvideo'
     _TEST = {
         'url': 'http://www.myvideo.de/watch/8229274/bowling_fail_or_win',


@@ -32,7 +35,7 @@ class MyVideoIE(InfoExtractor):
     # Original Code from: https://github.com/dersphere/plugin.video.myvideo_de.git
     # Released into the Public Domain by Tristan Fischer on 2013-05-19
     # https://github.com/rg3/youtube-dl/pull/842
     # Original Code from: https://github.com/dersphere/plugin.video.myvideo_de.git
     # Released into the Public Domain by Tristan Fischer on 2013-05-19
     # https://github.com/rg3/youtube-dl/pull/842

-    def __rc4crypt(self,data, key):
+    def __rc4crypt(self, data, key):

         x = 0
         box = list(range(256))
         for i in list(range(256)):
         x = 0
         box = list(range(256))
         for i in list(range(256)):


@@ -48,17 +51,17 @@ class MyVideoIE(InfoExtractor):
             out += chr(compat_ord(char) ^ box[(box[x] + box[y]) % 256])
         return out
 
             out += chr(compat_ord(char) ^ box[(box[x] + box[y]) % 256])
         return out
 

-    def __md5(self,s):
+    def __md5(self, s):

         return hashlib.md5(s).hexdigest().encode()
 
         return hashlib.md5(s).hexdigest().encode()
 

-    def _real_extract(self,url):
+    def _real_extract(self, url):

         mobj = re.match(self._VALID_URL, url)
         video_id = mobj.group('id')
 
         GK = (
         mobj = re.match(self._VALID_URL, url)
         video_id = mobj.group('id')
 
         GK = (

-          b'WXpnME1EZGhNRGhpTTJNM01XVmhOREU0WldNNVpHTTJOakpt'
-          b'TW1FMU5tVTBNR05pWkRaa05XRXhNVFJoWVRVd1ptSXhaVEV3'
-          b'TnpsbA0KTVRkbU1tSTRNdz09'
+            b'WXpnME1EZGhNRGhpTTJNM01XVmhOREU0WldNNVpHTTJOakpt'
+            b'TW1FMU5tVTBNR05pWkRaa05XRXhNVFJoWVRVd1ptSXhaVEV3'
+            b'TnpsbA0KTVRkbU1tSTRNdz09'

         )
 
         # Get video webpage
         )
 
         # Get video webpage


@@ -71,7 +74,7 @@ class MyVideoIE(InfoExtractor):
             video_url = mobj.group(1) + '.flv'
 
             video_title = self._html_search_regex('<title>([^<]+)</title>',
             video_url = mobj.group(1) + '.flv'
 
             video_title = self._html_search_regex('<title>([^<]+)</title>',

-                webpage, 'title')
+                                                  webpage, 'title')

 
             return {
                 'id': video_id,
 
             return {
                 'id': video_id,


@@ -81,7 +84,7 @@ class MyVideoIE(InfoExtractor):
 
         mobj = re.search(r'data-video-service="/service/data/video/%s/config' % video_id, webpage)
         if mobj is not None:
 
         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, '')
+            request = sanitized_Request('http://www.myvideo.de/service/data/video/%s/config' % video_id, '')

             response = self._download_webpage(request, video_id,
                                               'Downloading video info')
             info = json.loads(base64.b64decode(response).decode('utf-8'))
             response = self._download_webpage(request, video_id,
                                               'Downloading video info')
             info = json.loads(base64.b64decode(response).decode('utf-8'))


@@ -106,10 +109,10 @@ class MyVideoIE(InfoExtractor):
             if not a == '_encxml':
                 params[a] = b
             else:
             if not a == '_encxml':
                 params[a] = b
             else:

-                encxml = compat_urllib_parse.unquote(b)
+                encxml = compat_urllib_parse_unquote(b)

         if not params.get('domain'):
             params['domain'] = 'www.myvideo.de'
         if not params.get('domain'):
             params['domain'] = 'www.myvideo.de'

-        xmldata_url = '%s?%s' % (encxml, compat_urllib_parse.urlencode(params))
+        xmldata_url = '%s?%s' % (encxml, compat_urllib_parse_urlencode(params))

         if 'flash_playertype=MTV' in xmldata_url:
             self._downloader.report_warning('avoiding MTV player')
             xmldata_url = (
         if 'flash_playertype=MTV' in xmldata_url:
             self._downloader.report_warning('avoiding MTV player')
             xmldata_url = (


@@ -134,7 +137,7 @@ class MyVideoIE(InfoExtractor):
         video_url = None
         mobj = re.search('connectionurl=\'(.*?)\'', dec_data)
         if mobj:
         video_url = None
         mobj = re.search('connectionurl=\'(.*?)\'', dec_data)
         if mobj:

-            video_url = compat_urllib_parse.unquote(mobj.group(1))
+            video_url = compat_urllib_parse_unquote(mobj.group(1))

             if 'myvideo2flash' in video_url:
                 self.report_warning(
                     'Rewriting URL to use unencrypted rtmp:// ...',
             if 'myvideo2flash' in video_url:
                 self.report_warning(
                     'Rewriting URL to use unencrypted rtmp:// ...',


@@ -146,10 +149,10 @@ class MyVideoIE(InfoExtractor):
             mobj = re.search('path=\'(http.*?)\' source=\'(.*?)\'', dec_data)
             if mobj is None:
                 raise ExtractorError('unable to extract url')
             mobj = re.search('path=\'(http.*?)\' source=\'(.*?)\'', dec_data)
             if mobj is None:
                 raise ExtractorError('unable to extract url')

-            video_url = compat_urllib_parse.unquote(mobj.group(1)) + compat_urllib_parse.unquote(mobj.group(2))
+            video_url = compat_urllib_parse_unquote(mobj.group(1)) + compat_urllib_parse_unquote(mobj.group(2))

 
         video_file = self._search_regex('source=\'(.*?)\'', dec_data, 'video file')
 
         video_file = self._search_regex('source=\'(.*?)\'', dec_data, 'video file')

-        video_file = compat_urllib_parse.unquote(video_file)
+        video_file = compat_urllib_parse_unquote(video_file)

 
         if not video_file.endswith('f4m'):
             ppath, prefix = video_file.split('.')
 
         if not video_file.endswith('f4m'):
             ppath, prefix = video_file.split('.')


@@ -157,11 +160,11 @@ class MyVideoIE(InfoExtractor):
         else:
             video_playpath = ''
 
         else:
             video_playpath = ''
 

-        video_swfobj = self._search_regex('swfobject.embedSWF\(\'(.+?)\'', webpage, 'swfobj')
-        video_swfobj = compat_urllib_parse.unquote(video_swfobj)
+        video_swfobj = self._search_regex(r'swfobject.embedSWF\(\'(.+?)\'', webpage, 'swfobj')
+        video_swfobj = compat_urllib_parse_unquote(video_swfobj)

 
         video_title = self._html_search_regex("<h1(?: class='globalHd')?>(.*?)</h1>",
 
         video_title = self._html_search_regex("<h1(?: class='globalHd')?>(.*?)</h1>",

-            webpage, 'title')
+                                              webpage, 'title')

 
         return {
             'id': video_id,
 
         return {
             'id': video_id,


@@ -172,4 +175,3 @@ class MyVideoIE(InfoExtractor):
             'play_path': video_playpath,
             'player_url': video_swfobj,
         }
             'play_path': video_playpath,
             'player_url': video_swfobj,
         }

-