Various fixes (#13)

Author: michaelarnauts

Makefile

@@ -41,6 +41,9 @@ check-addon: clean build
 	cd ${TMPDIR} && kodi-addon-checker --branch=leia
 	@rm -rf ${TMPDIR}
 
+codefix:
+	@isort -l 160 resources/
+
 test: test-unit
 
 test-unit:

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

@@ -62,6 +62,14 @@ msgctxt "#30020"
 msgid "Continue watching where you left off"
 msgstr ""
 
+msgctxt "#30021"
+msgid "Kids"
+msgstr ""
+
+msgctxt "#30022"
+msgid "Show the VTM GO recommendations for Kids"
+msgstr ""
+
 
 ### SUBMENUS
 
@@ -138,7 +146,7 @@ msgstr ""
 ### MESSAGES
 
 msgctxt "#30701"
-msgid "You need to configure your credentials before you can access the content of Streamz."
+msgid "You need to configure your credentials before you can access the content of Streamz. Do you want to enter them now?"
 msgstr ""
 
 msgctxt "#30702"

resources/language/resource.language.nl_nl/strings.po

@@ -63,6 +63,14 @@ msgctxt "#30020"
 msgid "Continue watching where you left off"
 msgstr "Kijk verder waar u gebleven was"
 
+msgctxt "#30021"
+msgid "Kids"
+msgstr "Kids"
+
+msgctxt "#30022"
+msgid "Show the VTM GO recommendations for Kids"
+msgstr "Bekijk de VTM GO aanbevelingen voor kinderen"
+
 
 ### SUBMENUS
 
@@ -139,8 +147,8 @@ msgstr "Alle leeftijden"
 ### MESSAGES
 
 msgctxt "#30701"
-msgid "You need to configure your credentials before you can access the content of Streamz."
-msgstr "U moet uw inloggegevens configureren voordat u Streamz kan gebruiken."
+msgid "You need to configure your credentials before you can access the content of Streamz. Do you want to enter them now?"
+msgstr "U moet uw inloggegevens configureren voordat u Streamz kan gebruiken. Wilt u dit nu doen?"
 
 msgctxt "#30702"
 msgid "Unknown error while logging in: {code}"

resources/lib/addon.py

@@ -9,8 +9,7 @@
 from requests import HTTPError
 
 from resources.lib import kodilogging, kodiutils
-from resources.lib.streamz.exceptions import NoLoginException, InvalidLoginException, LoginErrorException, NoTelenetSubscriptionException, \
-    NoStreamzSubscriptionException
+from resources.lib.streamz.exceptions import InvalidLoginException, LoginErrorException, NoStreamzSubscriptionException, NoTelenetSubscriptionException
 
 kodilogging.config()
 routing = routing.Plugin()  # pylint: disable=invalid-name
@@ -20,23 +19,26 @@
 @routing.route('/')
 def index():
     """ Show the profile selection, or go to the main menu. """
+    while True:
+        if not kodiutils.get_setting('username') or not kodiutils.get_setting('password'):
+            if not kodiutils.yesno_dialog(message=kodiutils.localize(30701)):  # You need to configure your credentials...
+                # We have no credentials
+                kodiutils.end_of_directory()
+                kodiutils.execute_builtin('ActivateWindow(Home)')
+                return
+
+            kodiutils.open_settings()
+        else:
+            break
     try:
-        if (kodiutils.get_setting_bool('auto_login')
-                and kodiutils.get_setting('username')
-                and kodiutils.get_setting('password')
-                and kodiutils.get_setting('profile')):
+        if kodiutils.get_setting_bool('auto_login') and kodiutils.get_setting('profile'):
             # We have credentials
             show_main_menu()
 
         else:
             # Ask the user for the profile to use
             select_profile()
 
-    except NoLoginException:
-        kodiutils.ok_dialog(message=kodiutils.localize(30701))  # You need to configure your credentials...
-        kodiutils.open_settings()
-        kodiutils.container_refresh()
-
     except InvalidLoginException:
         kodiutils.ok_dialog(message=kodiutils.localize(30203))  # Your credentials are not valid!
         kodiutils.open_settings()
@@ -111,7 +113,7 @@ def show_catalog_program_season(program, season):
 
 @routing.route('/catalog/recommendations/<storefront>')
 def show_recommendations(storefront):
-    """ Shows the programs of a specific date in the tv guide """
+    """ Shows the recommendations of a storefront """
     from resources.lib.modules.catalog import Catalog
     Catalog().show_recommendations(storefront)
 

resources/lib/kodiplayer.py

@@ -4,8 +4,8 @@
 from __future__ import absolute_import, division, unicode_literals
 
 import logging
-import xbmc
 
+import xbmc
 
 _LOGGER = logging.getLogger(__name__)
 

resources/lib/kodiutils.py

@@ -111,7 +111,11 @@ def addon_path():
 
 def addon_profile():
     """Cache and return add-on profile"""
-    return to_unicode(xbmc.translatePath(ADDON.getAddonInfo('profile')))
+    if kodi_version_major() >= 19:
+        translate_path = xbmcvfs.translatePath
+    else:
+        translate_path = xbmc.translatePath
+    return to_unicode(translate_path(ADDON.getAddonInfo('profile')))
 
 
 def url_for(name, *args, **kwargs):
@@ -311,7 +315,7 @@ def set_locale():
     """Load the proper locale for date strings, only once"""
     if hasattr(set_locale, 'cached'):
         return getattr(set_locale, 'cached')
-    from locale import Error, LC_ALL, setlocale
+    from locale import LC_ALL, Error, setlocale
     locale_lang = get_global_setting('locale.language').split('.')[-1]
     locale_lang = locale_lang[:-2] + locale_lang[-2:].upper()
     # NOTE: setlocale() only works if the platform supports the Kodi configured locale
@@ -475,6 +479,11 @@ def get_addon_info(key):
     return to_unicode(ADDON.getAddonInfo(key))
 
 
+def execute_builtin(function):
+    """ Execute a Kodi Builtin """
+    xbmc.executebuiltin(function)
+
+
 def container_refresh(url=None):
     """Refresh the current container or (re)load a container by URL"""
     if url:
@@ -562,9 +571,10 @@ def get_cache(key, ttl=None):
 
     fdesc = xbmcvfs.File(fullpath, 'r')
 
+    import json
     try:
-        import json
         value = json.load(fdesc)
+        fdesc.close()
         _LOGGER.debug('Fetching %s from cache', fullpath)
         return value
     except (ValueError, TypeError):
@@ -587,7 +597,7 @@ def set_cache(key, data):
     _LOGGER.debug('Storing to cache as %s', fullpath)
     json.dump(data, fdesc)
 
-    # fdesc.close()
+    fdesc.close()
 
 
 def invalidate_cache(ttl=None):

resources/lib/modules/catalog.py

@@ -8,7 +8,7 @@
 from resources.lib import kodiutils
 from resources.lib.kodiutils import TitleItem
 from resources.lib.modules.menu import Menu
-from resources.lib.streamz.api import Api, CACHE_PREVENT
+from resources.lib.streamz.api import CACHE_PREVENT, Api
 from resources.lib.streamz.auth import Auth
 from resources.lib.streamz.exceptions import UnavailableException
 

resources/lib/modules/menu.py

@@ -7,8 +7,8 @@
 
 from resources.lib import kodiutils
 from resources.lib.kodiutils import TitleItem
-from resources.lib.streamz import Movie, Program, Episode, STOREFRONT_MAIN, STOREFRONT_MOVIES, STOREFRONT_SERIES, STOREFRONT_KIDS
-from resources.lib.streamz.api import Api, CONTENT_TYPE_MOVIE, CONTENT_TYPE_PROGRAM
+from resources.lib.streamz import STOREFRONT_KIDS, STOREFRONT_MAIN, STOREFRONT_MAIN_KIDS, STOREFRONT_MOVIES, STOREFRONT_SERIES, Episode, Movie, Program
+from resources.lib.streamz.api import CONTENT_TYPE_MOVIE, CONTENT_TYPE_PROGRAM
 from resources.lib.streamz.auth import Auth
 
 _LOGGER = logging.getLogger(__name__)
@@ -24,13 +24,14 @@ def __init__(self):
                           kodiutils.get_setting('loginprovider'),
                           kodiutils.get_setting('profile'),
                           kodiutils.get_tokens_path())
-        self._api = Api(self._auth)
 
     def show_mainmenu(self):
         """ Show the main menu. """
         listing = []
 
-        if self._auth.login().product == 'STREAMZ':
+        account = self._auth.login()
+
+        if account.product == 'STREAMZ':
             listing.append(TitleItem(
                 title=kodiutils.localize(30015),  # Recommendations
                 path=kodiutils.url_for('show_recommendations', storefront=STOREFRONT_MAIN),
@@ -67,14 +68,26 @@ def show_mainmenu(self):
                 ),
             ))
 
-        elif self._auth.login().product == 'STREAMZ_KIDS':
             listing.append(TitleItem(
-                title=kodiutils.localize(30015),  # Recommendations
+                title=kodiutils.localize(30021),  # Kids
                 path=kodiutils.url_for('show_recommendations', storefront=STOREFRONT_KIDS),
                 art_dict=dict(
                     icon='DefaultFavourites.png',
                     fanart=kodiutils.get_addon_info('fanart'),
                 ),
+                info_dict=dict(
+                    plot=kodiutils.localize(30022),
+                ),
+            ))
+
+        elif account.product == 'STREAMZ_KIDS':
+            listing.append(TitleItem(
+                title=kodiutils.localize(30015),  # Recommendations
+                path=kodiutils.url_for('show_recommendations', storefront=STOREFRONT_MAIN_KIDS),
+                art_dict=dict(
+                    icon='DefaultFavourites.png',
+                    fanart=kodiutils.get_addon_info('fanart'),
+                ),
                 info_dict=dict(
                     plot=kodiutils.localize(30016),
                 ),

resources/lib/modules/metadata.py

@@ -6,7 +6,7 @@
 import logging
 
 from resources.lib import kodiutils
-from resources.lib.streamz import Program, Movie
+from resources.lib.streamz import Movie, Program
 from resources.lib.streamz.api import Api
 from resources.lib.streamz.auth import Auth
 

resources/lib/modules/player.py

@@ -5,11 +5,11 @@
 
 import logging
 
-from resources.lib.kodiplayer import KodiPlayer
 from resources.lib import kodiutils
+from resources.lib.kodiplayer import KodiPlayer
 from resources.lib.streamz.api import Api
 from resources.lib.streamz.auth import Auth
-from resources.lib.streamz.exceptions import UnavailableException, LimitReachedException, StreamGeoblockedException, StreamUnavailableException
+from resources.lib.streamz.exceptions import LimitReachedException, StreamGeoblockedException, StreamUnavailableException, UnavailableException
 from resources.lib.streamz.stream import Stream
 
 _LOGGER = logging.getLogger(__name__)

resources/lib/service.py

@@ -9,6 +9,7 @@
 from xbmc import Monitor
 
 from resources.lib import kodilogging, kodiutils
+from resources.lib.streamz.exceptions import NoLoginException
 
 kodilogging.config()
 _LOGGER = logging.getLogger(__name__)
@@ -48,7 +49,11 @@ def update_status(_i, _total):
             """ Allow to cancel the background job """
             return self.abortRequested() or not kodiutils.get_setting_bool('metadata_update')
 
-        success = Metadata().fetch_metadata(callback=update_status)
+        try:
+            success = Metadata().fetch_metadata(callback=update_status)
+        except NoLoginException:
+            # We have no login yet, but that's okay, we will retry later
+            success = True
 
         # Update metadata_last_updated
         if success:

resources/lib/streamz/__init__.py

@@ -9,7 +9,8 @@
 STOREFRONT_MAIN = 'eba52f64-92da-4fec-804b-278ebafc75fd'
 STOREFRONT_MOVIES = '4f163159-15c3-452c-b275-1747b144cfa0'
 STOREFRONT_SERIES = 'dba19d15-1ddf-49ef-8eb5-99c59a1fb377'
-STOREFRONT_KIDS = 'e0c175c0-a43c-4eed-bdca-e1e95a726bc0'
+STOREFRONT_KIDS = 'a53d1ec3-ab43-4942-9d31-4f4754b4f519'
+STOREFRONT_MAIN_KIDS = 'e0c175c0-a43c-4eed-bdca-e1e95a726bc0'
 
 
 class Profile:

resources/lib/streamz/api.py

@@ -7,7 +7,7 @@
 import logging
 
 from resources.lib import kodiutils
-from resources.lib.streamz import Category, Movie, Episode, Season, Program, util, API_ENDPOINT
+from resources.lib.streamz import API_ENDPOINT, Category, Episode, Movie, Program, Season, util
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -346,7 +346,8 @@ def do_search(self, search):
         :type search: str
         :rtype list[Union[Movie, Program]]
         """
-        response = util.http_get(API_ENDPOINT + '/%s/search/?query=%s' % (self._mode(), quote(search)),
+        response = util.http_get(API_ENDPOINT + '/%s/search/?query=%s' % (self._mode(),
+                                                                          kodiutils.to_unicode(quote(kodiutils.from_unicode(search)))),
                                  token=self._tokens.jwt_token,
                                  profile=self._tokens.profile)
         results = json.loads(response.text)
@@ -430,5 +431,6 @@ def _parse_channel(url):
             return None
 
         import os.path
+
         # The channels id's we use in resources.lib.modules.CHANNELS neatly matches this part in the url.
         return str(os.path.basename(url).split('-')[0])

resources/lib/streamz/auth.py

@@ -9,9 +9,9 @@
 import re
 from hashlib import md5
 
-from resources.lib.streamz import util, API_ENDPOINT, Profile
-from resources.lib.streamz.exceptions import LoginErrorException, NoLoginException, NoTelenetSubscriptionException, NoStreamzSubscriptionException, \
-    InvalidLoginException
+from resources.lib.streamz import API_ENDPOINT, Profile, util
+from resources.lib.streamz.exceptions import (InvalidLoginException, LoginErrorException, NoLoginException, NoStreamzSubscriptionException,
+                                              NoTelenetSubscriptionException)
 
 try:  # Python 3
     from urllib.parse import parse_qs, urlsplit

resources/lib/streamz/stream.py

@@ -6,7 +6,7 @@
 import json
 import logging
 
-from resources.lib.streamz import ResolvedStream, util, API_ENDPOINT
+from resources.lib.streamz import API_ENDPOINT, ResolvedStream, util
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -190,9 +190,9 @@ def create_license_key(key_url, key_type='R', key_headers=None, key_value=None):
         :rtype: str
         """
         try:  # Python 3
-            from urllib.parse import urlencode, quote
+            from urllib.parse import quote, urlencode
         except ImportError:  # Python 2
-            from urllib import urlencode, quote
+            from urllib import quote, urlencode
 
         header = ''
         if key_headers:

resources/lib/streamz/util.py

@@ -8,7 +8,7 @@
 import requests
 from requests import HTTPError
 
-from resources.lib.streamz.exceptions import InvalidTokenException, InvalidLoginException, UnavailableException, LimitReachedException
+from resources.lib.streamz.exceptions import InvalidLoginException, InvalidTokenException, LimitReachedException, UnavailableException
 
 _LOGGER = logging.getLogger(__name__)