Merge pull request #219 from anxdpanic/pr_matrix

1.0.5

Author: anxdpanic

addon.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.tubed" name="Tubed" version="1.0.4" provider-name="anxdpanic">
+<addon id="plugin.video.tubed" name="Tubed" version="1.0.5" provider-name="anxdpanic">
     <requires>
         <import addon="xbmc.python" version="3.0.0"/>
         <import addon="inputstream.adaptive"/>
         <import addon="script.module.arrow" version="0.15.5+matrix.1"/>
         <import addon="script.module.requests" version="2.22.0+matrix.1"/>
         <import addon="script.module.pyxbmct" version="1.3.1+matrix.1"/>
-        <import addon="script.module.tubed.api" version="1.0.2"/>
+        <import addon="script.module.tubed.api" version="1.0.12"/>
     </requires>
     <extension point="xbmc.python.pluginsource" library="resources/lib/addon.py">
         <provides>video</provides>
@@ -15,7 +15,8 @@
     <extension point="xbmc.service" library="resources/lib/service.py"/>
     <extension point="xbmc.addon.metadata">
         <news>
-- added weblate translations
+- add tv client login for access to age gated content
+- updated translations from Weblate
         </news>
         <assets>
             <icon>resources/media/icon.png</icon>

resources/language/resource.language.en_gb/strings.po

@@ -1059,3 +1059,11 @@ msgstr ""
 msgctxt "#30257"
 msgid "No entries found"
 msgstr ""
+
+msgctxt "#30258"
+msgid "v3 Data API Client"
+msgstr ""
+
+msgctxt "#30259"
+msgid "YouTube-TV API Client"
+msgstr ""

resources/lib/src/api/api.py

@@ -46,19 +46,29 @@ def __init__(self, language='en-US', region='US'):
 
         self._api.ACCESS_TOKEN = self.users.access_token
 
+        self._api.ACCESS_TOKEN_TV = self.users.tv_access_token
+
         self._usher = usher
 
         self.quality = self._usher.Quality
 
         self.api = v3
         self.client = oauth.Client()
+        self.tv_client = oauth.Client(str(CREDENTIALS.TV_ID), str(CREDENTIALS.TV_SECRET))
+
         self.refresh_token()
+        self.tv_refresh_token()
 
     @property
     def logged_in(self):
         self.refresh_token()
         return self.users.access_token and not self.users.token_expired
 
+    @property
+    def tv_logged_in(self):
+        self.tv_refresh_token()
+        return self.users.tv_access_token and not self.users.tv_token_expired
+
     @property
     def language(self):
         return self._language.replace('-', '_')
@@ -706,6 +716,59 @@ def refresh_client(self):
         self.client = oauth.Client()
         memoizer.reset_cache()
 
+    @api_request
+    def tv_refresh_token(self):
+        if self.users.tv_access_token and self.users.tv_token_expired:
+            access_token, expiry = self.tv_client.refresh_token(self.users.tv_refresh_token)
+            self.users.tv_access_token = access_token
+            self.users.tv_token_expiry = time.time() + int(expiry)
+            self.users.save()
+            self.tv_refresh_client()
+
+    @api_request
+    def tv_revoke_token(self):
+        if self.users.tv_refresh_token:
+            self.tv_client.revoke_token(self.users.tv_refresh_token)
+            self.users.tv_access_token = ''
+            self.users.tv_refresh_token = ''
+            self.users.tv_token_expiry = -1
+            self.users.save()
+            self.tv_refresh_client()
+
+    @api_request
+    def tv_request_codes(self):
+        return self.tv_client.request_codes()
+
+    @api_request
+    def tv_request_access_token(self, device_code):
+        data = self.tv_client.request_access_token(device_code)
+
+        if 'error' not in data:
+            access_token = data.get('access_token', '')
+            refresh_token = data.get('refresh_token', '')
+            token_expiry = time.time() + int(data.get('expires_in', 3600))
+
+            if not access_token and not refresh_token:
+                token_expiry = -1
+
+            self.users.tv_access_token = access_token
+            self.users.tv_refresh_token = refresh_token
+            self.users.tv_token_expiry = token_expiry
+            self.users.save()
+            self.tv_refresh_client()
+            return True
+
+        if data['error'] == 'authorization_pending':
+            return False
+
+        return data
+
+    def tv_refresh_client(self):
+        self.users.load()
+        self._api.ACCESS_TOKEN_TV = self.users.tv_access_token
+        self.tv_client = oauth.Client(str(CREDENTIALS.TV_ID), str(CREDENTIALS.TV_SECRET))
+        memoizer.reset_cache()
+
     def calculate_next_page_token(self, page):
         """
             Copyright (C) 2014-2016 bromix (plugin.video.youtube)

resources/lib/src/api/decorators.py

@@ -30,6 +30,7 @@ def wrapper(*args, **kwargs):
         if len(args) > 0 and not func.__name__.endswith('refresh_token'):
             try:
                 args[0].refresh_token()
+                args[0].tv_refresh_token()
             except AttributeError:
                 pass
 

resources/lib/src/constants/credentials.py

@@ -15,6 +15,10 @@
 
 import xbmcvfs  # pylint: disable=import-error
 
+from tubed_api import API_KEY_TV
+from tubed_api import CLIENT_ID_TV
+from tubed_api import CLIENT_SECRET_TV
+
 _KEY = 'QUl6YVN5QUR0T0RKVTB4d3BXdWZfbUE1N3VFdUNwT0FfcjN6WEtv'
 _ID = 'OTAxOTQ1MDk2MjU2LWV2MGk5dmFuczd0Z25iYTRtNjZjaTQ2ZGFnc3RlY2Y1'
 _SECRET = 'Y2RMSldUdHdrWENod2ZsV1dqYnNwYVNH'
@@ -48,5 +52,10 @@ class CREDENTIALS(Enum):
     SECRET = _SECRET
     TOKEN = ''
 
+    TV_KEY = API_KEY_TV
+    TV_ID = CLIENT_ID_TV
+    TV_SECRET = CLIENT_SECRET_TV
+    TV_TOKEN = ''
+
     def __str__(self):
         return b64decode(str(self.value)).decode('utf-8')

resources/lib/src/constants/strings.py

@@ -191,4 +191,6 @@
     'Would you like to enable InputStream Adaptive now?': 30255,
     'Settings': 30256,
     'No entries found': 30257,
+    'v3 Data API Client': 30258,
+    'YouTube-TV API Client': 30259,
 }

resources/lib/src/dialogs/sign_in.py

@@ -29,9 +29,15 @@ def __init__(self, context, window, **kwargs):
         self._context = context
         self.window = window
 
+        self.tv_client = kwargs.get('tv_client') is True
         self.demo = kwargs.get('mode') == 'demo'
 
-        self.title = bold(context.i18n('Sign In'))
+        if not self.tv_client:
+            client_title = context.i18n('v3 Data API Client')
+        else:
+            client_title = context.i18n('YouTube-TV API Client')
+
+        self.title = bold(' '.join([context.i18n('Sign In'), '-', client_title]))
 
         super().__init__(self.title)
 
@@ -62,7 +68,10 @@ def start(self):
         if self.demo:
             data = SIGN_IN_CODES
         else:
-            data = self.context.api.request_codes()
+            if not self.tv_client:
+                data = self.context.api.request_codes()
+            else:
+                data = self.context.api.tv_request_codes()
 
         self.device_code = data['device_code']
         self.user_code = data['user_code']
@@ -82,8 +91,8 @@ def start(self):
         self.connect(pyxbmct.ACTION_NAV_BACK, self.close)
         self.connect(ACTION_STOP, self.close)
 
-        self.thread = DialogThread(self.context, self.device_code,
-                                   self.interval, self.close, self.demo)
+        self.thread = DialogThread(self.context, self.device_code, self.interval,
+                                   self.close, self.demo, self.tv_client)
 
         self.doModal()
 
@@ -119,7 +128,7 @@ def set_controls(self):
 
         self.client_id = pyxbmct.Label(
             self.context.i18n('Client ID: %s') %
-            bold(str(CREDENTIALS.ID)),
+            bold(str(CREDENTIALS.ID)) if not self.tv_client else bold(str(CREDENTIALS.TV_ID)),
             font='font10',
             alignment=2
         )
@@ -130,7 +139,7 @@ def set_navigation(self):
 
 
 class DialogThread(threading.Thread):
-    def __init__(self, context, device_code, interval, close, demo=False):
+    def __init__(self, context, device_code, interval, close, demo=False, tv_client=False):
         super().__init__()
 
         self._stopped = threading.Event()
@@ -141,6 +150,7 @@ def __init__(self, context, device_code, interval, close, demo=False):
         self.interval = interval
 
         self.demo = demo
+        self.tv_client = tv_client
 
         self.monitor = xbmc.Monitor()
 
@@ -170,7 +180,11 @@ def run(self):
             for _ in range(steps):
                 # self.update_progress(int(float((100.0 // steps)) * index))
 
-                signed_in = self.context.api.request_access_token(self.device_code)
+                if self.tv_client:
+                    signed_in = self.context.api.tv_request_access_token(self.device_code)
+                else:
+                    signed_in = self.context.api.request_access_token(self.device_code)
+
                 if signed_in:
                     self.signed_in = True
                     self.stop()

resources/lib/src/routes/main_menu.py

@@ -37,13 +37,15 @@ def invoke(context):  # pylint: disable=too-many-branches,too-many-statements
     users = None
 
     logged_in = context.api.logged_in
+    tv_logged_in = context.api.tv_logged_in
+
     fanart = context.addon.getAddonInfo('fanart')
 
     has_channel_mine = False
     if logged_in:
         has_channel_mine = context.api.channel_by_username('mine') != {}
 
-    if not logged_in:
+    if not logged_in or not tv_logged_in:
         if show_main_menu_item('sign.in'):
             label = context.i18n('Sign in with Google')
             action = Action(

resources/lib/src/routes/sign_in.py

@@ -15,7 +15,17 @@
 
 
 def invoke(context):
-    signed_in = open_dialog(context, SignInDialog)
+    logged_in = context.api.logged_in
+    tv_logged_in = context.api.tv_logged_in
 
-    if signed_in:
+    signed_in = False
+    tv_signed_in = False
+
+    if not logged_in:
+        signed_in = open_dialog(context, SignInDialog)
+
+    if not tv_logged_in:
+        tv_signed_in = open_dialog(context, SignInDialog, tv_client=True)
+
+    if signed_in or tv_signed_in:
         xbmc.executebuiltin('Container.Refresh')

resources/lib/src/routes/sign_out.py

@@ -17,5 +17,6 @@ def invoke(context):
                               context.i18n('You are about to sign out, are you sure?')):
 
         context.api.revoke_token()
+        context.api.tv_revoke_token()
 
         xbmc.executebuiltin('Container.Refresh')