update from upstream

1 files changed, 55 insertions, 66 deletions

diff --git a/hypervideo_dl/extractor/kakao.py b/hypervideo_dl/extractor/kakao.py
index 31ce7a8..97c986d 100644
--- a/hypervideo_dl/extractor/kakao.py
+++ b/hypervideo_dl/extractor/kakao.py
@@ -3,21 +3,19 @@
 from __future__ import unicode_literals
 
 from .common import InfoExtractor
-from ..compat import compat_HTTPError
+from ..compat import compat_str
 from ..utils import (
-    ExtractorError,
     int_or_none,
-    str_or_none,
     strip_or_none,
-    try_get,
+    traverse_obj,
     unified_timestamp,
-    update_url_query,
 )
 
 
 class KakaoIE(InfoExtractor):
     _VALID_URL = r'https?://(?:play-)?tv\.kakao\.com/(?:channel/\d+|embed/player)/cliplink/(?P<id>\d+|[^?#&]+@my)'
-    _API_BASE_TMPL = 'http://tv.kakao.com/api/v1/ft/cliplinks/%s/'
+    _API_BASE_TMPL = 'http://tv.kakao.com/api/v1/ft/playmeta/cliplink/%s/'
+    _CDN_API = 'https://tv.kakao.com/katz/v1/ft/cliplink/%s/readyNplay?'
 
     _TESTS = [{
         'url': 'http://tv.kakao.com/channel/2671005/cliplink/301965083',
@@ -26,7 +24,7 @@ class KakaoIE(InfoExtractor):
             'id': '301965083',
             'ext': 'mp4',
             'title': '乃木坂46 バナナマン 「3期生紹介コーナーが始動！顔高低差GPも！」 『乃木坂工事中』',
-            'uploader_id': '2671005',
+            'uploader_id': 2671005,
             'uploader': '그랑그랑이',
             'timestamp': 1488160199,
             'upload_date': '20170227',
@@ -39,31 +37,17 @@ class KakaoIE(InfoExtractor):
             'ext': 'mp4',
             'description': '러블리즈 - Destiny (나의 지구) (Lovelyz - Destiny)\r\n\r\n[쇼! 음악중심] 20160611, 507회',
             'title': '러블리즈 - Destiny (나의 지구) (Lovelyz - Destiny)',
-            'uploader_id': '2653210',
+            'uploader_id': 2653210,
             'uploader': '쇼! 음악중심',
             'timestamp': 1485684628,
             'upload_date': '20170129',
         }
-    }, {
-        # geo restricted
-        'url': 'https://tv.kakao.com/channel/3643855/cliplink/412069491',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        display_id = video_id.rstrip('@my')
         api_base = self._API_BASE_TMPL % video_id
-
-        player_header = {
-            'Referer': update_url_query(
-                'http://tv.kakao.com/embed/player/cliplink/%s' % video_id, {
-                    'service': 'kakao_tv',
-                    'autoplay': '1',
-                    'profile': 'HIGH',
-                    'wmode': 'transparent',
-                })
-        }
+        cdn_api_base = self._CDN_API % video_id
 
         query = {
             'player': 'monet_html5',
@@ -75,64 +59,69 @@ class KakaoIE(InfoExtractor):
             'fields': ','.join([
                 '-*', 'tid', 'clipLink', 'displayTitle', 'clip', 'title',
                 'description', 'channelId', 'createTime', 'duration', 'playCount',
-                'likeCount', 'commentCount', 'tagList', 'channel', 'name', 'thumbnailUrl',
+                'likeCount', 'commentCount', 'tagList', 'channel', 'name',
+                'clipChapterThumbnailList', 'thumbnailUrl', 'timeInSec', 'isDefault',
                 'videoOutputList', 'width', 'height', 'kbps', 'profile', 'label'])
         }
 
-        impress = self._download_json(
-            api_base + 'impress', display_id, 'Downloading video info',
-            query=query, headers=player_header)
+        api_json = self._download_json(
+            api_base, video_id, 'Downloading video info')
 
-        clip_link = impress['clipLink']
+        clip_link = api_json['clipLink']
         clip = clip_link['clip']
 
         title = clip.get('title') or clip_link.get('displayTitle')
 
-        query.update({
-            'fields': '-*,code,message,url',
-            'tid': impress.get('tid') or '',
-        })
-
         formats = []
-        for fmt in (clip.get('videoOutputList') or []):
-            try:
-                profile_name = fmt['profile']
-                if profile_name == 'AUDIO':
-                    continue
-                query['profile'] = profile_name
-                try:
-                    fmt_url_json = self._download_json(
-                        api_base + 'raw/videolocation', display_id,
-                        'Downloading video URL for profile %s' % profile_name,
-                        query=query, headers=player_header)
-                except ExtractorError as e:
-                    if isinstance(e.cause, compat_HTTPError) and e.cause.code == 403:
-                        resp = self._parse_json(e.cause.read().decode(), video_id)
-                        if resp.get('code') == 'GeoBlocked':
-                            self.raise_geo_restricted()
-                    continue
+        for fmt in clip.get('videoOutputList', []):
+            profile_name = fmt.get('profile')
+            if not profile_name or profile_name == 'AUDIO':
+                continue
+            query.update({
+                'profile': profile_name,
+                'fields': '-*,url',
+            })
+
+            fmt_url_json = self._download_json(
+                cdn_api_base, video_id,
+                'Downloading video URL for profile %s' % profile_name,
+                query=query, fatal=False)
+            fmt_url = traverse_obj(fmt_url_json, ('videoLocation', 'url'))
+            if not fmt_url:
+                continue
 
-                fmt_url = fmt_url_json['url']
-                formats.append({
-                    'url': fmt_url,
-                    'format_id': profile_name,
-                    'width': int_or_none(fmt.get('width')),
-                    'height': int_or_none(fmt.get('height')),
-                    'format_note': fmt.get('label'),
-                    'filesize': int_or_none(fmt.get('filesize')),
-                    'tbr': int_or_none(fmt.get('kbps')),
-                })
-            except KeyError:
-                pass
+            formats.append({
+                'url': fmt_url,
+                'format_id': profile_name,
+                'width': int_or_none(fmt.get('width')),
+                'height': int_or_none(fmt.get('height')),
+                'format_note': fmt.get('label'),
+                'filesize': int_or_none(fmt.get('filesize')),
+                'tbr': int_or_none(fmt.get('kbps')),
+            })
         self._sort_formats(formats)
 
+        thumbs = []
+        for thumb in clip.get('clipChapterThumbnailList') or []:
+            thumbs.append({
+                'url': thumb.get('thumbnailUrl'),
+                'id': compat_str(thumb.get('timeInSec')),
+                'preference': -1 if thumb.get('isDefault') else 0
+            })
+        top_thumbnail = clip.get('thumbnailUrl')
+        if top_thumbnail:
+            thumbs.append({
+                'url': top_thumbnail,
+                'preference': 10,
+            })
+
         return {
-            'id': display_id,
+            'id': video_id,
             'title': title,
             'description': strip_or_none(clip.get('description')),
-            'uploader': try_get(clip_link, lambda x: x['channel']['name']),
-            'uploader_id': str_or_none(clip_link.get('channelId')),
-            'thumbnail': clip.get('thumbnailUrl'),
+            'uploader': traverse_obj(clip_link, ('channel', 'name')),
+            'uploader_id': clip_link.get('channelId'),
+            'thumbnails': thumbs,
             'timestamp': unified_timestamp(clip_link.get('createTime')),
             'duration': int_or_none(clip.get('duration')),
             'view_count': int_or_none(clip.get('playCount')),