Merge pull request #50 from anxdpanic/dev

2.0.4~beta1

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.3" provider-name="A Talented Community">
+<addon id="script.module.python.twitch" name="python-twitch for Kodi" version="2.0.4~beta1" provider-name="A Talented Community">
     <requires>
         <import addon="xbmc.python" version="2.20.0"/>
         <import addon="script.module.six" version="1.9.0"/>
@@ -9,7 +9,7 @@
     <extension point="xbmc.addon.metadata">
         <platform>all</platform>
         <news>
-[chg] redact user ip from token logging
+[fix] video/live stream token encoding
         </news>
         <assets>
             <icon>icon.png</icon>

changelog.txt

@@ -1,3 +1,6 @@
+2.0.4
+[fix] video/live stream token encoding
+
 2.0.3
 [chg] redact user ip from token logging
 

resources/lib/twitch/api/usher.py

@@ -49,8 +49,8 @@ def live_request(channel):
     else:
         q = UsherQuery('api/channel/hls/{channel}.m3u8')
         q.add_urlkw(keys.CHANNEL, channel)
-        q.add_param(keys.SIG, token[keys.SIG])
-        q.add_param(keys.TOKEN, token[keys.TOKEN])
+        q.add_param(keys.SIG, token[keys.SIG].encode('utf-8'))
+        q.add_param(keys.TOKEN, token[keys.TOKEN].encode('utf-8'))
         q.add_param(keys.ALLOW_SOURCE, Boolean.TRUE)
         q.add_param(keys.ALLOW_SPECTRE, Boolean.TRUE)
         q.add_param(keys.ALLOW_AUDIO_ONLY, Boolean.TRUE)
@@ -65,8 +65,8 @@ def live_request(channel):
 def _live(channel, token):
     q = UsherQuery('api/channel/hls/{channel}.m3u8')
     q.add_urlkw(keys.CHANNEL, channel)
-    q.add_param(keys.SIG, token[keys.SIG])
-    q.add_param(keys.TOKEN, token[keys.TOKEN])
+    q.add_param(keys.SIG, token[keys.SIG].encode('utf-8'))
+    q.add_param(keys.TOKEN, token[keys.TOKEN].encode('utf-8'))
     q.add_param(keys.ALLOW_SOURCE, Boolean.TRUE)
     q.add_param(keys.ALLOW_SPECTRE, Boolean.TRUE)
     q.add_param(keys.ALLOW_AUDIO_ONLY, Boolean.TRUE)
@@ -92,8 +92,8 @@ def video_request(video_id):
         else:
             q = UsherQuery('vod/{id}')
             q.add_urlkw(keys.ID, video_id)
-            q.add_param(keys.NAUTHSIG, token[keys.SIG])
-            q.add_param(keys.NAUTH, token[keys.TOKEN])
+            q.add_param(keys.NAUTHSIG, token[keys.SIG].encode('utf-8'))
+            q.add_param(keys.NAUTH, token[keys.TOKEN].encode('utf-8'))
             q.add_param(keys.ALLOW_SOURCE, Boolean.TRUE)
             q.add_param(keys.ALLOW_AUDIO_ONLY, Boolean.TRUE)
             url = '?'.join([q.url, urlencode(q.params)])
@@ -108,8 +108,8 @@ def video_request(video_id):
 def _vod(video_id, token):
     q = UsherQuery('vod/{id}')
     q.add_urlkw(keys.ID, video_id)
-    q.add_param(keys.NAUTHSIG, token[keys.SIG])
-    q.add_param(keys.NAUTH, token[keys.TOKEN])
+    q.add_param(keys.NAUTHSIG, token[keys.SIG].encode('utf-8'))
+    q.add_param(keys.NAUTH, token[keys.TOKEN].encode('utf-8'))
     q.add_param(keys.ALLOW_SOURCE, Boolean.TRUE)
     q.add_param(keys.ALLOW_AUDIO_ONLY, Boolean.TRUE)
     return q