Merge pull request #16 from anxdpanic/dev

error passthrough in parser

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~alpha8" provider-name="A Talented Community">
+<addon id="script.module.python.twitch" name="python-twitch for Kodi" version="1.0.0~alpha9" provider-name="A Talented Community">
     <requires>
         <import addon="xbmc.python" version="2.1.0"/>
         <import addon="script.module.six" version="1.9.0"/>

resources/lib/twitch/api/usher.py

@@ -34,11 +34,8 @@ def _legacy_video(video_id):
     return q
 
 
-@m3u8
 @query
-def live(channel):
-    token = channel_token(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])
@@ -49,12 +46,17 @@ def live(channel):
 
 
 @m3u8
-@query
-def _vod(video_id):
-    video_id = video_id[1:]
+def live(channel):
+    token = channel_token(channel)
+    if keys.ERROR in token:
+        return token
+    else:
+        return _live(channel, token)
 
-    token = vod_token(video_id)
 
+@m3u8
+@query
+def _vod(video_id, token):
     q = UsherQuery('vod/{id}')
     q.add_urlkw(keys.ID, video_id)
     q.add_param(keys.NAUTHSIG, token[keys.SIG])
@@ -64,13 +66,22 @@ def _vod(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)
+    if video_id.startswith('videos') or video_id.startswith('v'):
+        if video_id.startswith('videos'):
+            video_id = 'v' + video_id[6:]
+        video_id = video_id[1:]
+        token = vod_token(video_id)
+        if keys.ERROR in token:
+            return token
+        else:
+            return _vod(video_id, token)
     elif video_id.startswith(('a', 'c')):
-        return _legacy_video(video_id)
+        video_id = video_id[1:]
+        token = vod_token(video_id)
+        if keys.ERROR in token:
+            return token
+        else:
+            return _vod(video_id, token)
     else:
         raise NotImplementedError('Unknown Video Type')
 

resources/lib/twitch/parser.py

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 import re
+from twitch import keys
 from twitch.logging import log
 
 _m3u_pattern = re.compile(
@@ -12,10 +13,20 @@
 
 _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)
+
 
 def m3u8(f):
     def m3u8_wrapper(*args, **kwargs):
-        return m3u8_to_list(f(*args, **kwargs))
+        results = f(*args, **kwargs)
+        if keys.ERROR in results:
+            if isinstance(results, dict):
+                return results
+            else:
+                error = re.search(_error_pattern, results)
+                if error:
+                    return {'error': 'Error', 'message': error.group('message'), 'status': 0}
+        return m3u8_to_list(results)
 
     return m3u8_wrapper