Merge pull request #8 from anxdpanic/dev

remove v2, v3, refactor and updates v5

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="1.0.0~alpha3" provider-name="A Talented Community">
+<addon id="script.module.python.twitch" name="python-twitch for Kodi" version="1.0.0~alpha4" provider-name="A Talented Community">
     <requires>
         <import addon="xbmc.python" version="2.1.0"/>
         <import addon="script.module.six" version="1.9.0"/>
@@ -10,19 +10,6 @@
         <platform>all</platform>
         <news>
 - initial release
-- use script.module.requests
-- remove default client_id
-- add oauth token support
-- add authorization, client id headers to all api calls
-- update api.twitch to use https
-- update usher to allow_source
-- videos.by_channel from broadcasts bool to broadcast_type: 'archive', 'highlight', 'upload'
-- update m3u_pattern
-- add initial v5 (wip)
-- add support for additional methods in queries (PUT/DELETE/POST)
-- v5 add communities, update follow/unfollow/blocks
-- add basics for implicit oauth2
-- update usher base url
         </news>
         <assets>
             <icon>icon.png</icon>

changelog.txt

@@ -1,15 +1,2 @@
 1.0.0
 - initial release
-- use script.module.requests
-- remove default client_id
-- add oauth token support
-- add authorization, client id headers to all api calls
-- update api.twitch to use https
-- update usher to allow_source
-- videos.by_channel from broadcasts bool to broadcast_type: 'archive', 'highlight', 'upload'
-- update m3u_pattern
-- add initial v5 (wip)
-- add support for additional methods in queries (PUT/DELETE/POST)
-- v5 add communities, update follow/unfollow/blocks
-- add basics for implicit oauth2
-- update usher base url

resources/lib/twitch/api/parameters.py

@@ -38,3 +38,19 @@ class SortBy(_Parameter):
     LOGIN = 'login'
 
     _valid = [CREATED_AT, LAST_BROADCAST, LOGIN]
+
+
+class BroadcastType(_Parameter):
+    ARCHIVE = 'archive'
+    HIGHLIGHT = 'highlight'
+    UPLOAD = 'upload'
+
+    _valid = [ARCHIVE, HIGHLIGHT, UPLOAD]
+
+
+class StreamType(_Parameter):
+    LIVE = 'live'
+    PLAYLIST = 'playlist'
+    ALL = 'all'
+
+    _valid = [LIVE, PLAYLIST, ALL]

resources/lib/twitch/api/usher.py

@@ -14,20 +14,22 @@
 def channel_token(channel):
     q = HiddenApiQuery('channels/{channel}/access_token')
     q.add_urlkw(keys.CHANNEL, channel)
+    q.add_param(keys.NEED_HTTPS, Boolean.TRUE)
     return q
 
 
 @query
-def vod_token(id):
+def vod_token(video_id):
     q = HiddenApiQuery('vods/{vod}/access_token')
-    q.add_urlkw(keys.VOD, id)
+    q.add_urlkw(keys.VOD, video_id)
+    q.add_param(keys.NEED_HTTPS, Boolean.TRUE)
     return q
 
 
 @query
-def _legacy_video(id):
+def _legacy_video(video_id):
     q = HiddenApiQuery('videos/{id}')
-    q.add_urlkw(keys.ID, id)
+    q.add_urlkw(keys.ID, video_id)
     return q
 
 
@@ -41,28 +43,32 @@ def live(channel):
     q.add_param(keys.SIG, token[keys.SIG])
     q.add_param(keys.TOKEN, token[keys.TOKEN])
     q.add_param(keys.ALLOW_SOURCE, Boolean.TRUE)
+    q.add_param(keys.ALLOW_SPECTRE, Boolean.TRUE)
     return q
 
 
 @m3u8
 @query
-def _vod(id):
-    id = id[1:]
+def _vod(video_id):
+    video_id = video_id[1:]
 
-    token = vod_token(id)
+    token = vod_token(video_id)
 
     q = UsherQuery('vod/{id}')
-    q.add_urlkw(keys.ID, 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.ALLOW_SOURCE, Boolean.TRUE)
     return q
 
 
-def video(id):
-    if id.startswith('v'):
-        return _vod(id)
-    elif id.startswith(('a', 'c')):
-        return _legacy_video(id)
+def video(video_id):
+    if video_id.startswith('videos'):
+        video_id = 'v' + video_id[6:]
+        return _vod(video_id)
+    elif video_id.startswith('v'):
+        return _vod(video_id)
+    elif video_id.startswith(('a', 'c')):
+        return _legacy_video(video_id)
     else:
         raise NotImplementedError('Unknown Video Type')