From b261ce12a167bfed0462831e351d76247b3f1998 Mon Sep 17 00:00:00 2001
From: showi <joachim.basmaison@gmail.com>
Date: Thu, 3 Oct 2019 21:52:16 +0200
Subject: [PATCH] WIP

---
 .vscode/settings.json                                       | 5 +++++
 default.py                                                  | 1 -
 resources/lib/qobuz/api/easy.py                             | 1 +
 resources/lib/qobuz/bootstrap.py                            | 3 ++-
 resources/lib/qobuz/debug.py                                | 3 ++-
 resources/lib/qobuz/extension/kooli/kooli/monitor.py        | 2 +-
 .../extension/kooli/kooli/script/kooli-xbmc-service.py      | 2 +-
 resources/lib/qobuz/gui/bg_progress.py                      | 3 +--
 resources/lib/qobuz/gui/dialog.py                           | 2 +-
 resources/lib/qobuz/gui/directory.py                        | 2 +-
 resources/lib/qobuz/gui/util.py                             | 6 ++++--
 resources/lib/qobuz/node/album/main.py                      | 2 +-
 resources/lib/qobuz/node/albums_by_artist.py                | 2 +-
 resources/lib/qobuz/node/article.py                         | 2 +-
 resources/lib/qobuz/node/artist.py                          | 2 +-
 resources/lib/qobuz/node/favorite.py                        | 2 +-
 resources/lib/qobuz/node/inode/main.py                      | 2 +-
 resources/lib/qobuz/node/playlist/main.py                   | 2 +-
 resources/lib/qobuz/node/testing.py                         | 2 +-
 resources/lib/qobuz/node/track/list_item.py                 | 2 +-
 resources/lib/qobuz/node/user.py                            | 2 +-
 resources/lib/qobuz/player.py                               | 2 +-
 resources/lib/qobuz/plugin.py                               | 3 ++-
 resources/lib/qobuz/renderer/xbmc.py                        | 2 +-
 resources/lib/qobuz/xbmcrpc.py                              | 2 +-
 25 files changed, 34 insertions(+), 25 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..df4ba249
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "python.formatting.autopep8Args": [
+        "ignore E402"
+    ]
+}
\ No newline at end of file
diff --git a/default.py b/default.py
index 5115a7e7..be97ebaf 100644
--- a/default.py
+++ b/default.py
@@ -8,7 +8,6 @@
 '''
 import sys
 from os import path as P
-
 sys.path.append(P.join(P.abspath(P.dirname(__file__)), 'resources', 'lib'))
 
 from qobuz.plugin import Plugin  # pylint: disable=C0413
diff --git a/resources/lib/qobuz/api/easy.py b/resources/lib/qobuz/api/easy.py
index 1669f27d..77598a0f 100644
--- a/resources/lib/qobuz/api/easy.py
+++ b/resources/lib/qobuz/api/easy.py
@@ -115,6 +115,7 @@ def login(self, username, password):
         ::return
             True on success, else False
         """
+        logger.info("LOGIN %s PASS %s" % (username, password))
         if common.is_empty(username) and common.is_empty(password):
             return True
         current_user.set_credentials(username, password)
diff --git a/resources/lib/qobuz/bootstrap.py b/resources/lib/qobuz/bootstrap.py
index 3a3a882c..317eae32 100644
--- a/resources/lib/qobuz/bootstrap.py
+++ b/resources/lib/qobuz/bootstrap.py
@@ -8,7 +8,7 @@
 '''
 import os
 import sys
-from kodi_six import xbmc
+import xbmc
 
 from qobuz import exception
 from qobuz.cache import cache
@@ -67,6 +67,7 @@ def init_cache(cls):
     @classmethod
     def bootstrap_registry(cls):
         from qobuz.api import api
+        logger.info('LOGIN %s' % config.app.registry.get('username'))
         if not api.login(
                 config.app.registry.get('username'),
                 config.app.registry.get('password')):
diff --git a/resources/lib/qobuz/debug.py b/resources/lib/qobuz/debug.py
index b1ffd30b..3dd41336 100644
--- a/resources/lib/qobuz/debug.py
+++ b/resources/lib/qobuz/debug.py
@@ -23,7 +23,8 @@ def attach_file_logger(logger):
 
 
 try:
-    from kodi_six import xbmc, xbmcaddon
+    import xbmc
+    import xbmcaddon
 
     class XbmcLogger(logging.Handler):
 
diff --git a/resources/lib/qobuz/extension/kooli/kooli/monitor.py b/resources/lib/qobuz/extension/kooli/kooli/monitor.py
index 01fc4c70..ed57806f 100644
--- a/resources/lib/qobuz/extension/kooli/kooli/monitor.py
+++ b/resources/lib/qobuz/extension/kooli/kooli/monitor.py
@@ -7,7 +7,7 @@
     :license: GPLv3, see LICENSE for more details.
 '''
 import time
-from kodi_six import xbmc  # pylint:disable=E0401
+import xbmc  # pylint:disable=E0401
 
 from qobuz.cache import cache_util
 from qobuz.debug import getLogger
diff --git a/resources/lib/qobuz/extension/kooli/kooli/script/kooli-xbmc-service.py b/resources/lib/qobuz/extension/kooli/kooli/script/kooli-xbmc-service.py
index cc9150b6..3f2cc126 100644
--- a/resources/lib/qobuz/extension/kooli/kooli/script/kooli-xbmc-service.py
+++ b/resources/lib/qobuz/extension/kooli/kooli/script/kooli-xbmc-service.py
@@ -21,7 +21,7 @@
 from kooli import log
 from kooli import qobuz_lib_path
 
-from kodi_six import xbmc  # pylint:disable=E0401
+import xbmc  # pylint:disable=E0401
 from kooli.application import application, shutdown_server, qobuzApp
 from kooli.monitor import Monitor
 from qobuz import config
diff --git a/resources/lib/qobuz/gui/bg_progress.py b/resources/lib/qobuz/gui/bg_progress.py
index 3bb553c2..d114b24f 100644
--- a/resources/lib/qobuz/gui/bg_progress.py
+++ b/resources/lib/qobuz/gui/bg_progress.py
@@ -1,5 +1,4 @@
-from kodi_six import xbmcgui  # pylint:disable=E0401
-
+import xbmcgui  # pylint:disable=E0401
 
 class Progress(xbmcgui.DialogProgressBG):
     def __init__(self, heading='Qobuz', message=None, enable=True):
diff --git a/resources/lib/qobuz/gui/dialog.py b/resources/lib/qobuz/gui/dialog.py
index 7e0cab53..97c1ebc2 100644
--- a/resources/lib/qobuz/gui/dialog.py
+++ b/resources/lib/qobuz/gui/dialog.py
@@ -1,4 +1,4 @@
-from kodi_six import xbmcgui
+import xbmcgui
 
 from qobuz.debug import getLogger
 
diff --git a/resources/lib/qobuz/gui/directory.py b/resources/lib/qobuz/gui/directory.py
index 4e23ad99..499141a4 100644
--- a/resources/lib/qobuz/gui/directory.py
+++ b/resources/lib/qobuz/gui/directory.py
@@ -8,7 +8,7 @@
 '''
 import time
 
-from kodi_six import xbmcplugin  # pylint:disable=E0401
+import xbmcplugin  # pylint:disable=E0401
 
 from qobuz.debug import getLogger
 from qobuz.gui.bg_progress import Progress
diff --git a/resources/lib/qobuz/gui/util.py b/resources/lib/qobuz/gui/util.py
index d179af52..d17bab0b 100644
--- a/resources/lib/qobuz/gui/util.py
+++ b/resources/lib/qobuz/gui/util.py
@@ -17,7 +17,9 @@
 logger = getLogger(__name__)
 
 try:
-    from kodi_six import xbmc, xbmcgui, xbmcplugin  # pylint:disable=E0401
+    import xbmc
+    import xbmcgui
+    import xbmcplugin  # pylint:disable=E0401
 
     class Keyboard(xbmc.Keyboard):
         def __init__(self, _default, heading='', _hidden=True):
@@ -85,7 +87,7 @@ def dialogLoginFailure():
     '''
     dialog = xbmcgui.Dialog()
     if dialog.yesno(lang(30010), lang(30036), lang(30042)):
-        qobuz.addon.openSettings()
+        # qobuz.addon.openSettings()
         xbmcplugin.endOfDirectory(
             handle=int(sys.argv[1]),
             succeeded=False,
diff --git a/resources/lib/qobuz/node/album/main.py b/resources/lib/qobuz/node/album/main.py
index ab47a9a1..954bd6a8 100644
--- a/resources/lib/qobuz/node/album/main.py
+++ b/resources/lib/qobuz/node/album/main.py
@@ -7,7 +7,7 @@
     :license: GPLv3, see LICENSE for more details.
 '''
 import time
-from kodi_six import xbmcgui  # pylint:disable=E0401
+import xbmcgui  # pylint:disable=E0401
 
 from .props import propsMap, informationTemplate
 from qobuz import config
diff --git a/resources/lib/qobuz/node/albums_by_artist.py b/resources/lib/qobuz/node/albums_by_artist.py
index 2b4519e7..e3fba20e 100644
--- a/resources/lib/qobuz/node/albums_by_artist.py
+++ b/resources/lib/qobuz/node/albums_by_artist.py
@@ -7,7 +7,7 @@
     :license: GPLv3, see LICENSE for more details.
 '''
 import weakref
-from kodi_six import xbmcgui
+import xbmcgui
 
 from qobuz.api import api
 from qobuz.debug import getLogger
diff --git a/resources/lib/qobuz/node/article.py b/resources/lib/qobuz/node/article.py
index ac3d4c96..c840fdb4 100644
--- a/resources/lib/qobuz/node/article.py
+++ b/resources/lib/qobuz/node/article.py
@@ -6,7 +6,7 @@
     :copyright: (c) 2012-2018 by Joachim Basmaison, Cyril Leclerc
     :license: GPLv3, see LICENSE for more details.
 '''
-from kodi_six import xbmcgui  # pylint:disable=E0401
+import xbmcgui  # pylint:disable=E0401
 
 from qobuz.api import api
 from qobuz.debug import getLogger
diff --git a/resources/lib/qobuz/node/artist.py b/resources/lib/qobuz/node/artist.py
index 0c09db6e..e97f38ac 100644
--- a/resources/lib/qobuz/node/artist.py
+++ b/resources/lib/qobuz/node/artist.py
@@ -6,7 +6,7 @@
     :copyright: (c) 2012-2018 by Joachim Basmaison, Cyril Leclerc
     :license: GPLv3, see LICENSE for more details.
 '''
-from kodi_six import xbmcgui  # pylint:disable=E0401
+import xbmcgui  # pylint:disable=E0401
 
 from qobuz.api import api
 from qobuz.debug import getLogger
diff --git a/resources/lib/qobuz/node/favorite.py b/resources/lib/qobuz/node/favorite.py
index a0303b62..e53a9852 100644
--- a/resources/lib/qobuz/node/favorite.py
+++ b/resources/lib/qobuz/node/favorite.py
@@ -6,7 +6,7 @@
     :copyright: (c) 2012-2018 by Joachim Basmaison, Cyril Leclerc
     :license: GPLv3, see LICENSE for more details.
 '''
-from kodi_six import xbmcgui  # pylint:disable=E0401
+import xbmcgui  # pylint:disable=E0401
 
 from qobuz import exception
 from qobuz.api import api
diff --git a/resources/lib/qobuz/node/inode/main.py b/resources/lib/qobuz/node/inode/main.py
index e4eb9ccd..86bac2c7 100644
--- a/resources/lib/qobuz/node/inode/main.py
+++ b/resources/lib/qobuz/node/inode/main.py
@@ -284,7 +284,7 @@ def makeListItem(self, **ka):
             return  a xbml list item
             Class can overload this method
         '''
-        from kodi_six import xbmcgui  # pylint:disable=E0401
+        import xbmcgui  # pylint:disable=E0401
         if 'url' not in ka:
             ka['url'] = self.make_url()
         if 'label' not in ka:
diff --git a/resources/lib/qobuz/node/playlist/main.py b/resources/lib/qobuz/node/playlist/main.py
index 65668a5b..e271ed76 100644
--- a/resources/lib/qobuz/node/playlist/main.py
+++ b/resources/lib/qobuz/node/playlist/main.py
@@ -6,7 +6,7 @@
     :copyright: (c) 2012-2018 by Joachim Basmaison, Cyril Leclerc
     :license: GPLv3, see LICENSE for more details.
 '''
-from kodi_six import xbmcgui  # pylint:disable=E0401
+import xbmcgui  # pylint:disable=E0401
 
 from .context_menu import attach_context_menu
 from .props import propsMap
diff --git a/resources/lib/qobuz/node/testing.py b/resources/lib/qobuz/node/testing.py
index 3b321a21..166e2d1c 100644
--- a/resources/lib/qobuz/node/testing.py
+++ b/resources/lib/qobuz/node/testing.py
@@ -12,7 +12,7 @@
 from qobuz.node.inode import INode
 from time import time
 import requests
-from kodi_six import xbmcgui  # pylint:disable=E0401
+import xbmcgui  # pylint:disable=E0401
 
 logger = getLogger(__name__)
 
diff --git a/resources/lib/qobuz/node/track/list_item.py b/resources/lib/qobuz/node/track/list_item.py
index c129ba6c..32c6b0fd 100644
--- a/resources/lib/qobuz/node/track/list_item.py
+++ b/resources/lib/qobuz/node/track/list_item.py
@@ -1,4 +1,4 @@
-from kodi_six import xbmcgui
+import xbmcgui
 
 from qobuz.constants import Mode
 from qobuz.debug import getLogger
diff --git a/resources/lib/qobuz/node/user.py b/resources/lib/qobuz/node/user.py
index e37b6c37..ea7fdd1e 100644
--- a/resources/lib/qobuz/node/user.py
+++ b/resources/lib/qobuz/node/user.py
@@ -6,7 +6,7 @@
     :copyright: (c) 2012-2018 by Joachim Basmaison, Cyril Leclerc
     :license: GPLv3, see LICENSE for more details.
 '''
-from kodi_six import xbmcgui  # pylint:disable=E0401
+import xbmcgui  # pylint:disable=E0401
 
 from qobuz.api.user import current as user
 from qobuz.debug import getLogger
diff --git a/resources/lib/qobuz/player.py b/resources/lib/qobuz/player.py
index de8645f8..b52c645f 100644
--- a/resources/lib/qobuz/player.py
+++ b/resources/lib/qobuz/player.py
@@ -7,7 +7,7 @@
     :license: GPLv3, see LICENSE for more details.
 '''
 
-from kodi_six import xbmc, xbmcgui  # pylint:disable=E0401
+import xbmc, xbmcgui  # pylint:disable=E0401
 
 from qobuz import config
 from qobuz.debug import getLogger
diff --git a/resources/lib/qobuz/plugin.py b/resources/lib/qobuz/plugin.py
index f5750d45..373a8380 100644
--- a/resources/lib/qobuz/plugin.py
+++ b/resources/lib/qobuz/plugin.py
@@ -8,7 +8,8 @@
 '''
 import os
 
-from kodi_six import xbmc, xbmcaddon
+import xbmc
+import xbmcaddon
 
 
 class Plugin(object):
diff --git a/resources/lib/qobuz/renderer/xbmc.py b/resources/lib/qobuz/renderer/xbmc.py
index f796226d..08133c2a 100644
--- a/resources/lib/qobuz/renderer/xbmc.py
+++ b/resources/lib/qobuz/renderer/xbmc.py
@@ -6,7 +6,7 @@
     :copyright: (c) 2012-2018 by Joachim Basmaison, Cyril Leclerc
     :license: GPLv3, see LICENSE for more details.
 '''
-from kodi_six import xbmcplugin  # pylint:disable=E0401
+import xbmcplugin # pylint:disable=E0401
 
 from qobuz import config
 from qobuz import exception
diff --git a/resources/lib/qobuz/xbmcrpc.py b/resources/lib/qobuz/xbmcrpc.py
index d0532732..6b78b15d 100644
--- a/resources/lib/qobuz/xbmcrpc.py
+++ b/resources/lib/qobuz/xbmcrpc.py
@@ -15,7 +15,7 @@
 logger = getLogger(__name__)
 
 try:
-    from kodi_six import xbmc
+    import xbmc
 except ImportError as e:
     logger.warn('ImportError(Outside XBMC): %s', e)