debian/control: Remove mplayer2 from recommends. (Closes: #841187)

[youtubedl] / youtube_dl / extractor / sohu.py

diff --git a/youtube_dl/extractor/sohu.py b/youtube_dl/extractor/sohu.py
index 29bd9ce6f76247b5ac997050075c7e720d8a3b2b..30760ca06be4b3fc112f3fe0200c74b665d64855 100644 (file)
--- a/youtube_dl/extractor/sohu.py
+++ b/youtube_dl/extractor/sohu.py
@@ -1,4 +1,4 @@
-# encoding: utf-8
+# coding: utf-8

 from __future__ import unicode_literals
 
 import re
 from __future__ import unicode_literals
 
 import re


@@ -6,7 +6,7 @@ import re
 from .common import InfoExtractor
 from ..compat import (
     compat_str,
 from .common import InfoExtractor
 from ..compat import (
     compat_str,

-    compat_urllib_request
+    compat_urllib_parse_urlencode,

 )
 from ..utils import ExtractorError
 
 )
 from ..utils import ExtractorError
 


@@ -14,10 +14,10 @@ from ..utils import ExtractorError
 class SohuIE(InfoExtractor):
     _VALID_URL = r'https?://(?P<mytv>my\.)?tv\.sohu\.com/.+?/(?(mytv)|n)(?P<id>\d+)\.shtml.*?'
 
 class SohuIE(InfoExtractor):
     _VALID_URL = r'https?://(?P<mytv>my\.)?tv\.sohu\.com/.+?/(?(mytv)|n)(?P<id>\d+)\.shtml.*?'
 

+    # Sohu videos give different MD5 sums on Travis CI and my machine

     _TESTS = [{
         'note': 'This video is available only in Mainland China',
         'url': 'http://tv.sohu.com/20130724/n382479172.shtml#super',
     _TESTS = [{
         'note': 'This video is available only in Mainland China',
         'url': 'http://tv.sohu.com/20130724/n382479172.shtml#super',

-        'md5': '29175c8cadd8b5cc4055001e85d6b372',

         'info_dict': {
             'id': '382479172',
             'ext': 'mp4',
         'info_dict': {
             'id': '382479172',
             'ext': 'mp4',


@@ -26,7 +26,6 @@ class SohuIE(InfoExtractor):
         'skip': 'On available in China',
     }, {
         'url': 'http://tv.sohu.com/20150305/n409385080.shtml',
         'skip': 'On available in China',
     }, {
         'url': 'http://tv.sohu.com/20150305/n409385080.shtml',

-        'md5': 'ac9a5d322b4bf9ae184d53e4711e4f1a',

         'info_dict': {
             'id': '409385080',
             'ext': 'mp4',
         'info_dict': {
             'id': '409385080',
             'ext': 'mp4',


@@ -34,7 +33,6 @@ class SohuIE(InfoExtractor):
         }
     }, {
         'url': 'http://my.tv.sohu.com/us/232799889/78693464.shtml',
         }
     }, {
         'url': 'http://my.tv.sohu.com/us/232799889/78693464.shtml',

-        'md5': '49308ff6dafde5ece51137d04aec311e',

         'info_dict': {
             'id': '78693464',
             'ext': 'mp4',
         'info_dict': {
             'id': '78693464',
             'ext': 'mp4',


@@ -48,7 +46,6 @@ class SohuIE(InfoExtractor):
             'title': '【神探苍实战秘籍】第13期 战争之影 赫卡里姆',
         },
         'playlist': [{
             'title': '【神探苍实战秘籍】第13期 战争之影 赫卡里姆',
         },
         'playlist': [{

-            'md5': '492923eac023ba2f13ff69617c32754a',

             'info_dict': {
                 'id': '78910339_part1',
                 'ext': 'mp4',
             'info_dict': {
                 'id': '78910339_part1',
                 'ext': 'mp4',


@@ -56,7 +53,6 @@ class SohuIE(InfoExtractor):
                 'title': '【神探苍实战秘籍】第13期 战争之影 赫卡里姆',
             }
         }, {
                 'title': '【神探苍实战秘籍】第13期 战争之影 赫卡里姆',
             }
         }, {

-            'md5': 'de604848c0e8e9c4a4dde7e1347c0637',

             'info_dict': {
                 'id': '78910339_part2',
                 'ext': 'mp4',
             'info_dict': {
                 'id': '78910339_part2',
                 'ext': 'mp4',


@@ -64,7 +60,6 @@ class SohuIE(InfoExtractor):
                 'title': '【神探苍实战秘籍】第13期 战争之影 赫卡里姆',
             }
         }, {
                 'title': '【神探苍实战秘籍】第13期 战争之影 赫卡里姆',
             }
         }, {

-            'md5': '93584716ee0657c0b205b8aa3d27aa13',

             'info_dict': {
                 'id': '78910339_part3',
                 'ext': 'mp4',
             'info_dict': {
                 'id': '78910339_part3',
                 'ext': 'mp4',


@@ -93,15 +88,10 @@ class SohuIE(InfoExtractor):
             else:
                 base_data_url = 'http://hot.vrs.sohu.com/vrs_flash.action?vid='
 
             else:
                 base_data_url = 'http://hot.vrs.sohu.com/vrs_flash.action?vid='
 

-            req = compat_urllib_request.Request(base_data_url + vid_id)
-
-            cn_verification_proxy = self._downloader.params.get('cn_verification_proxy')
-            if cn_verification_proxy:
-                req.add_header('Ytdl-request-proxy', cn_verification_proxy)
-

             return self._download_json(
             return self._download_json(

-                req, video_id,
-                'Downloading JSON data for %s' % vid_id)
+                base_data_url + vid_id, video_id,
+                'Downloading JSON data for %s' % vid_id,
+                headers=self.geo_verification_headers())

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


@@ -139,21 +129,43 @@ class SohuIE(InfoExtractor):
         for i in range(part_count):
             formats = []
             for format_id, format_data in formats_json.items():
         for i in range(part_count):
             formats = []
             for format_id, format_data in formats_json.items():

+                allot = format_data['allot']
+

                 data = format_data['data']
                 data = format_data['data']

+                clips_url = data['clipsURL']
+                su = data['su']

 
 

-                # URLs starts with http://newflv.sohu.ccgslb.net/ is not usable
-                # so retry until got a working URL

                 video_url = 'newflv.sohu.ccgslb.net'
                 video_url = 'newflv.sohu.ccgslb.net'

+                cdnId = None

                 retries = 0
                 retries = 0

-                while 'newflv.sohu.ccgslb.net' in video_url and retries < 5:
-                    download_note = 'Download information from CDN gateway for format ' + format_id
+
+                while 'newflv.sohu.ccgslb.net' in video_url:
+                    params = {
+                        'prot': 9,
+                        'file': clips_url[i],
+                        'new': su[i],
+                        'prod': 'flash',
+                        'rb': 1,
+                    }
+
+                    if cdnId is not None:
+                        params['idc'] = cdnId
+
+                    download_note = 'Downloading %s video URL part %d of %d' % (
+                        format_id, i + 1, part_count)
+

                     if retries > 0:
                         download_note += ' (retry #%d)' % retries
                     if retries > 0:
                         download_note += ' (retry #%d)' % retries

+                    part_info = self._parse_json(self._download_webpage(
+                        'http://%s/?%s' % (allot, compat_urllib_parse_urlencode(params)),
+                        video_id, download_note), video_id)
+
+                    video_url = part_info['url']
+                    cdnId = part_info.get('nid')
+

                     retries += 1
                     retries += 1

-                    cdn_info = self._download_json(
-                        'http://data.vod.itc.cn/cdnList?new=' + data['su'][i],
-                        video_id, download_note)
-                    video_url = cdn_info['url']
+                    if retries > 5:
+                        raise ExtractorError('Failed to get video URL')

 
                 formats.append({
                     'url': video_url,
 
                 formats.append({
                     'url': video_url,