Prepare new release.

[youtubedl] / youtube_dl / extractor / douyutv.py

diff --git a/youtube_dl/extractor/douyutv.py b/youtube_dl/extractor/douyutv.py
index ce6962755831a8c6f853271ad49112fee4fcbc63..82d8a042f58e738422a4c64b7fa90f8ac127f5fb 100644 (file)
--- a/youtube_dl/extractor/douyutv.py
+++ b/youtube_dl/extractor/douyutv.py
@@ -1,27 +1,29 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
 # coding: utf-8
 from __future__ import unicode_literals
 

-import hashlib

 import time
 import time

+import hashlib
+

 from .common import InfoExtractor
 from .common import InfoExtractor

-from ..utils import (ExtractorError, unescapeHTML)
-from ..compat import (compat_str, compat_basestring)
+from ..utils import (
+    ExtractorError,
+    unescapeHTML,
+)

 
 
 class DouyuTVIE(InfoExtractor):
     IE_DESC = '斗鱼'
 
 
 class DouyuTVIE(InfoExtractor):
     IE_DESC = '斗鱼'

-    _VALID_URL = r'https?://(?:www\.)?douyu(?:tv)?\.com/(?P<id>[A-Za-z0-9]+)'
+    _VALID_URL = r'https?://(?:www\.)?douyu(?:tv)?\.com/(?:[^/]+/)*(?P<id>[A-Za-z0-9]+)'

     _TESTS = [{
         'url': 'http://www.douyutv.com/iseven',
         'info_dict': {
             'id': '17732',
             'display_id': 'iseven',
             'ext': 'flv',
     _TESTS = [{
         'url': 'http://www.douyutv.com/iseven',
         'info_dict': {
             'id': '17732',
             'display_id': 'iseven',
             'ext': 'flv',

-            'title': 're:^清晨醒脑！T-ara根本停不下来！ [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
-            'description': 're:.*m7show@163\.com.*',
-            'thumbnail': 're:^https?://.*\.jpg$',
+            'title': 're:^清晨醒脑！T-ARA根本停不下来！ [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
+            'description': r're:.*m7show@163\.com.*',
+            'thumbnail': r're:^https?://.*\.jpg$',

             'uploader': '7师傅',
             'uploader': '7师傅',

-            'uploader_id': '431925',

             'is_live': True,
         },
         'params': {
             'is_live': True,
         },
         'params': {


@@ -35,9 +37,8 @@ class DouyuTVIE(InfoExtractor):
             'ext': 'flv',
             'title': 're:^小漠从零单排记！——CSOL2躲猫猫 [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
             'description': 'md5:746a2f7a253966a06755a912f0acc0d2',
             'ext': 'flv',
             'title': 're:^小漠从零单排记！——CSOL2躲猫猫 [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
             'description': 'md5:746a2f7a253966a06755a912f0acc0d2',

-            'thumbnail': 're:^https?://.*\.jpg$',
+            'thumbnail': r're:^https?://.*\.jpg$',

             'uploader': 'douyu小漠',
             'uploader': 'douyu小漠',

-            'uploader_id': '3769985',

             'is_live': True,
         },
         'params': {
             'is_live': True,
         },
         'params': {


@@ -50,11 +51,10 @@ class DouyuTVIE(InfoExtractor):
             'id': '17732',
             'display_id': '17732',
             'ext': 'flv',
             'id': '17732',
             'display_id': '17732',
             'ext': 'flv',

-            'title': 're:^清晨醒脑！T-ara根本停不下来！ [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
-            'description': 're:.*m7show@163\.com.*',
-            'thumbnail': 're:^https?://.*\.jpg$',
+            'title': 're:^清晨醒脑！T-ARA根本停不下来！ [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
+            'description': r're:.*m7show@163\.com.*',
+            'thumbnail': r're:^https?://.*\.jpg$',

             'uploader': '7师傅',
             'uploader': '7师傅',

-            'uploader_id': '431925',

             'is_live': True,
         },
         'params': {
             'is_live': True,
         },
         'params': {


@@ -63,6 +63,10 @@ class DouyuTVIE(InfoExtractor):
     }, {
         'url': 'http://www.douyu.com/xiaocang',
         'only_matching': True,
     }, {
         'url': 'http://www.douyu.com/xiaocang',
         'only_matching': True,

+    }, {
+        # \"room_id\"
+        'url': 'http://www.douyu.com/t/lpl',
+        'only_matching': True,

     }]
 
     def _real_extract(self, url):
     }]
 
     def _real_extract(self, url):


@@ -73,76 +77,43 @@ class DouyuTVIE(InfoExtractor):
         else:
             page = self._download_webpage(url, video_id)
             room_id = self._html_search_regex(
         else:
             page = self._download_webpage(url, video_id)
             room_id = self._html_search_regex(

-                r'"room_id"\s*:\s*(\d+),', page, 'room id')
-
-        config = None
-        # Douyu API sometimes returns error "Unable to load the requested class: eticket_redis_cache"
-        # Retry with different parameters - same parameters cause same errors
-        for i in range(5):
-            prefix = 'room/%s?aid=android&client_sys=android&time=%d' % (
-                room_id, int(time.time()))
-            auth = hashlib.md5((prefix + '1231').encode('ascii')).hexdigest()
-
-            config_page = self._download_webpage(
-                'http://www.douyutv.com/api/v1/%s&auth=%s' % (prefix, auth),
-                video_id)
-            try:
-                config = self._parse_json(config_page, video_id, fatal=False)
-            except ExtractorError:
-                # Wait some time before retrying to get a different time() value
-                self._sleep(1, video_id, msg_template='%(video_id)s: Error occurs. '
-                                                      'Waiting for %(timeout)s seconds before retrying')
-                continue
-            else:
-                break
-        if config is None:
-            raise ExtractorError('Unable to fetch API result')
+                r'"room_id\\?"\s*:\s*(\d+),', page, 'room id')

 
 

-        data = config['data']
+        # Grab metadata from mobile API
+        room = self._download_json(
+            'http://m.douyu.com/html5/live?roomId=%s' % room_id, video_id,
+            note='Downloading room info')['data']

 
 

-        error_code = config.get('error', 0)
-        if error_code is not 0:
-            error_desc = 'Server reported error %i' % error_code
-            if isinstance(data, (compat_str, compat_basestring)):
-                error_desc += ': ' + data
-            raise ExtractorError(error_desc, expected=True)
-
-        show_status = data.get('show_status')

         # 1 = live, 2 = offline
         # 1 = live, 2 = offline

-        if show_status == '2':
-            raise ExtractorError(
-                'Live stream is offline', expected=True)
-
-        base_url = data['rtmp_url']
-        live_path = data['rtmp_live']
-
-        title = self._live_title(unescapeHTML(data['room_name']))
-        description = data.get('show_details')
-        thumbnail = data.get('room_src')
-
-        uploader = data.get('nickname')
-        uploader_id = data.get('owner_uid')
-
-        multi_formats = data.get('rtmp_multi_bitrate')
-        if not isinstance(multi_formats, dict):
-            multi_formats = {}
-        multi_formats['live'] = live_path
-
-        formats = [{
-            'url': '%s/%s' % (base_url, format_path),
-            'format_id': format_id,
-            'preference': 1 if format_id == 'live' else 0,
-        } for format_id, format_path in multi_formats.items()]
-        self._sort_formats(formats)
+        if room.get('show_status') == '2':
+            raise ExtractorError('Live stream is offline', expected=True)
+
+        # Grab the URL from PC client API
+        # The m3u8 url from mobile API requires re-authentication every 5 minutes
+        tt = int(time.time())
+        signContent = 'lapi/live/thirdPart/getPlay/%s?aid=pcclient&rate=0&time=%d9TUk5fjjUjg9qIMH3sdnh' % (room_id, tt)
+        sign = hashlib.md5(signContent.encode('ascii')).hexdigest()
+        video_url = self._download_json(
+            'http://coapi.douyucdn.cn/lapi/live/thirdPart/getPlay/' + room_id,
+            video_id, note='Downloading video URL info',
+            query={'rate': 0}, headers={
+                'auth': sign,
+                'time': str(tt),
+                'aid': 'pcclient'
+            })['data']['live_url']
+
+        title = self._live_title(unescapeHTML(room['room_name']))
+        description = room.get('show_details')
+        thumbnail = room.get('room_src')
+        uploader = room.get('nickname')

 
         return {
             'id': room_id,
             'display_id': video_id,
 
         return {
             'id': room_id,
             'display_id': video_id,

+            'url': video_url,

             'title': title,
             'description': description,
             'thumbnail': thumbnail,
             'uploader': uploader,
             'title': title,
             'description': description,
             'thumbnail': thumbnail,
             'uploader': uploader,

-            'uploader_id': uploader_id,
-            'formats': formats,

             'is_live': True,
         }
             'is_live': True,
         }