fix clips usher

Author: anxdpanic

addon.xml

@@ -9,6 +9,7 @@
     <extension point="xbmc.addon.metadata">
         <platform>all</platform>
         <news>
+[fix] clips usher
 [chg] to relative imports
 [upd] deprecation/removal dates
         </news>

changelog.txt

@@ -1,4 +1,5 @@
 2.0.1
+[fix] clips usher
 [chg] to relative imports
 [upd] deprecation/removal dates
 

resources/lib/twitch/api/usher.py

@@ -129,6 +129,6 @@ def video(video_id):
 @clip_embed
 @query
 def clip(slug):
-    q = ClipsQuery('embed')
-    q.add_param(keys.CLIP, slug)
+    q = ClipsQuery('api/v2/clips/{clip}/status')
+    q.add_urlkw(keys.CLIP, slug)
     return q

resources/lib/twitch/parser.py

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 import re
+from ast import literal_eval
 from . import keys
 from .log import log
 
@@ -11,8 +12,6 @@
     r'BANDWIDTH=(?P<bandwidth>[0-9]+).*\n('
     r'?P<url>http.*)')
 
-_clip_embed_pattern = re.compile(r'quality_options:\s*(?P<qualities>\[[^\]]+?\])')
-
 _error_pattern = re.compile(r'.*<tr><td><b>error</b></td><td>(?P<message>.+?)</td></tr>.*', re.IGNORECASE)
 
 
@@ -73,18 +72,23 @@ def m3u8_to_list(string):
     return l
 
 
-def clip_embed_to_list(string):
-    log.debug('clip_embed_to_list called for:\n{0}'.format(string))
-    match = re.search(_clip_embed_pattern, string)
+def clip_embed_to_list(response):
+    log.debug('clip_embed_to_list called for:\n{0}'.format(response))
+
+    response = literal_eval(response)
+    qualities = list()
     l = list()
-    if match:
-        match = eval(match.group('qualities'))
+
+    if isinstance(response, dict):
+        qualities = response.get('quality_options', list())
+
+    if qualities:
         l = [{
                  'id': item['quality'],
                  'name': item['quality'],
                  'url': item['source'],
                  'bandwidth': -1
-             } for item in match]
+             } for item in qualities]
         if l:
             l.insert(0, {
                 'id': 'Source',