Add compatibility for kodi 19 and bump version

Author: i96751414

addon.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.flix" name="Flix" provider-name="i96751414" version="0.0.10">
+<addon id="plugin.video.flix" name="Flix" provider-name="i96751414" version="0.0.11">
     <requires>
-        <import addon="xbmc.python" version="2.24.0"/>
+        <!--<import addon="xbmc.python" version="3.0.0"/>-->
         <import addon="script.module.routing" version="0.2.3"/>
         <import addon="script.module.requests" version="2.22.0"/>
         <import addon="script.module.cached" version="0.0.1"/>
         <import addon="script.module.tmdbsimple" version="2.2.0"/>
-        <import addon="script.module.futures" version="2.2.0"/>
         <import addon="script.module.defusedxml" version="0.6.0"/>
+        <!-- futures must be optional so we have py2/3 compatibility -->
+        <import addon="script.module.futures" version="2.2.0" optional="true"/>
     </requires>
     <extension point="xbmc.python.pluginsource" library="navigation.py">
         <provides>video</provides>

dependencies.py

@@ -0,0 +1,3 @@
+from lib.api.compatibility import register_module
+
+register_module("concurrent.futures", "script.module.futures")

lib/api/compatibility.py

@@ -0,0 +1,37 @@
+import importlib
+import os
+import sys
+
+import xbmc
+import xbmcaddon
+from defusedxml import ElementTree
+
+PY3 = sys.version_info.major >= 3
+
+
+class UndefinedModuleError(ImportError):
+    pass
+
+
+def register_module(name, py2_module=None, py3_module=None):
+    try:
+        importlib.import_module(name)
+        xbmc.log("{} module is already installed".format(name), xbmc.LOGDEBUG)
+    except ImportError:
+        xbmc.log("Failed to import module. Going to register it.", xbmc.LOGDEBUG)
+        module = py3_module if PY3 else py2_module
+        if module is None:
+            raise UndefinedModuleError("No module was defined")
+        install_and_register_module(name, module)
+
+
+def install_and_register_module(name, module):
+    xbmc.log("Installing and registering module {}:{}".format(name, module), xbmc.LOGINFO)
+    xbmc.executebuiltin("InstallAddon(" + module + ")", wait=True)
+    path = xbmcaddon.Addon(module).getAddonInfo("path")
+    if not PY3:
+        # noinspection PyUnresolvedReferences
+        path = path.decode("utf-8")
+    tree = ElementTree.parse(os.path.join(path, "addon.xml"))
+    library_path = tree.find("./extension[@point='xbmc.python.module']").attrib["library"]
+    sys.path.append(os.path.join(path, library_path))

navigation.py

@@ -1,5 +1,6 @@
 import os
 
+import dependencies  # noqa
 from lib.api.flix.kodi import ADDON_DATA
 from lib.navigation import run
 

service.py

@@ -1,3 +1,4 @@
+import dependencies  # noqa
 from lib.service import run
 
 run()