Merge pull request #64 from anxdpanic/dev

2.0.7

Author: anxdpanic

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.module.python.twitch" name="python-twitch for Kodi" version="2.0.6" provider-name="A Talented Community">
+<addon id="script.module.python.twitch" name="python-twitch for Kodi" version="2.0.7" provider-name="A Talented Community">
     <requires>
         <import addon="xbmc.python" version="2.20.0"/>
         <import addon="script.module.six" version="1.11.0"/>
@@ -9,7 +9,7 @@
     <extension point="xbmc.addon.metadata">
         <platform>all</platform>
         <news>
-[add] add missing helix api endpoints
+[add] add platform parameter to usher
         </news>
         <assets>
             <icon>icon.png</icon>

changelog.txt

@@ -1,3 +1,6 @@
+2.0.7
+[add] add platform parameter to usher
+
 2.0.6
 [add] add missing helix api endpoints
 

resources/lib/twitch/api/usher.py

@@ -30,21 +30,21 @@ def valid_video_id(video_id):
 
 
 @query
-def channel_token(channel):
+def channel_token(channel, platform=keys.WEB):
     q = HiddenApiQuery('channels/{channel}/access_token')
     q.add_urlkw(keys.CHANNEL, channel)
     q.add_param(keys.NEED_HTTPS, Boolean.TRUE)
-    q.add_param(keys.PLATFORM, keys.WEB)
+    q.add_param(keys.PLATFORM, platform)
     q.add_param(keys.PLAYER_BACKEND, keys.MEDIAPLAYER)
     return q
 
 
 @query
-def vod_token(video_id):
+def vod_token(video_id, platform=keys.WEB):
     q = HiddenApiQuery('vods/{vod}/access_token')
     q.add_urlkw(keys.VOD, video_id)
     q.add_param(keys.NEED_HTTPS, Boolean.TRUE)
-    q.add_param(keys.PLATFORM, keys.WEB)
+    q.add_param(keys.PLATFORM, platform)
     q.add_param(keys.PLAYER_BACKEND, keys.MEDIAPLAYER)
     return q
 
@@ -56,8 +56,8 @@ def _legacy_video(video_id):
     return q
 
 
-def live_request(channel):
-    token = channel_token(channel)
+def live_request(channel, platform=keys.WEB):
+    token = channel_token(channel, platform=platform)
     if keys.ERROR in token:
         return token
     else:
@@ -99,18 +99,18 @@ def _live(channel, token):
 
 
 @m3u8
-def live(channel):
-    token = channel_token(channel)
+def live(channel, platform=keys.WEB):
+    token = channel_token(channel, platform=platform)
     if keys.ERROR in token:
         return token
     else:
         return _live(channel, token)
 
 
-def video_request(video_id):
+def video_request(video_id, platform=keys.WEB):
     video_id = valid_video_id(video_id)
     if video_id:
-        token = vod_token(video_id)
+        token = vod_token(video_id, platform=platform)
         if keys.ERROR in token:
             return token
         else:
@@ -156,10 +156,10 @@ def _vod(video_id, token):
 
 
 @m3u8
-def video(video_id):
+def video(video_id, platform=keys.WEB):
     video_id = valid_video_id(video_id)
     if video_id:
-        token = vod_token(video_id)
+        token = vod_token(video_id, platform=platform)
         if keys.ERROR in token:
             return token
         else: