Merge pull request #70 from anxdpanic/dev

fix clip usher

Author: anxdpanic

addon.xml

@@ -9,7 +9,7 @@
     <extension point="xbmc.addon.metadata">
         <platform>all</platform>
         <news>
-[fix] Python 3 - don't decode string when processing clips
+[fix] clip usher
         </news>
         <assets>
             <icon>icon.png</icon>

changelog.txt

@@ -1,3 +1,6 @@
+2.0.12
+[fix] clip usher
+
 2.0.11
 [fix] Python 3 - don't decode string when processing clips
 

resources/lib/twitch/api/usher.py

@@ -11,6 +11,8 @@
     See LICENSES/GPL-3.0-only for more information.
 """
 
+import json
+
 from .. import keys
 from ..api.parameters import Boolean
 from ..parser import m3u8, clip_embed
@@ -170,7 +172,32 @@ def video(video_id, platform=keys.WEB, headers={}):
 
 @clip_embed
 @query
-def clip(slug):
-    q = ClipsQuery('api/v2/clips/{clip}/status')
-    q.add_urlkw(keys.CLIP, slug)
+def clip(slug, headers={}):
+    data = json.dumps({
+        'query': '''{
+      clip(slug: "%s") {
+        broadcaster {
+          displayName
+        }
+        createdAt
+        curator {
+          displayName
+          id
+        }
+        durationSeconds
+        id
+        tiny: thumbnailURL(width: 86, height: 45)
+        small: thumbnailURL(width: 260, height: 147)
+        medium: thumbnailURL(width: 480, height: 272)
+        title
+        videoQualities {
+          frameRate
+          quality
+          sourceURL
+        }
+        viewCount
+      }
+    }''' % slug,
+    })
+    q = ClipsQuery(headers=headers, data=data)
     return q

resources/lib/twitch/parser.py

@@ -11,8 +11,7 @@
 """
 
 import re
-from ast import literal_eval
-from six import PY2
+
 from . import keys
 from .log import log
 
@@ -133,20 +132,18 @@ def m3u8_to_list(string):
 
 def clip_embed_to_list(response):
     log.debug('clip_embed_to_list called for:\n{0}'.format(response))
-    if PY2 or isinstance(response, bytes):
-        response = response.decode('utf-8')
-    response = literal_eval(response)
     qualities = list()
     l = list()
 
     if isinstance(response, dict):
-        qualities = response.get('quality_options', list())
+        clip = response.get('data', {}).get('clip', {})
+        qualities = clip.get('videoQualities', list())
 
     if qualities:
         l = [{
             'id': item['quality'],
             'name': item['quality'],
-            'url': item['source'],
+            'url': item['sourceURL'],
             'bandwidth': -1
         } for item in qualities]
         if l:

resources/lib/twitch/queries.py

@@ -24,7 +24,7 @@
 _helix_baseurl = 'https://api.twitch.tv/helix/'
 _hidden_baseurl = 'https://api.twitch.tv/api/'
 _usher_baseurl = 'https://usher.ttvnw.net/'
-_clips_baseurl = 'https://clips.twitch.tv/'
+_clips_baseurl = 'https://gql.twitch.tv/gql'
 _uploads_baseurl = 'https://uploads.twitch.tv/'
 _oauth_baseurl = 'https://api.twitch.tv/kraken/oauth2/'
 
@@ -195,11 +195,12 @@ def __init__(self, path, headers={}, data={}, method=methods.GET):
         self.add_path(path)
 
 
-class ClipsQuery(DownloadQuery):
-    def __init__(self, path, headers={}, data={}, method=methods.GET):
+class ClipsQuery(JsonQuery):
+    def __init__(self, path='', headers={}, data={}, method=methods.POST):
         _headers = deepcopy(headers)
         super(ClipsQuery, self).__init__(_clips_baseurl, _headers, data, method)
-        self.add_path(path)
+        if path:
+            self.add_path(path)
 
 
 class UploadsQuery(DownloadQuery):