Import kodi_version from kodiutils

Author: mediaminister

lib/inputstreamhelper/__init__.py

@@ -6,7 +6,7 @@
 import os
 from inputstreamhelper import config
 from .kodiutils import (addon_profile, addon_version, browsesingle, get_proxies, get_setting, get_setting_bool,
-                        get_setting_float, get_setting_int, jsonrpc, kodi_to_ascii, localize, log, notification,
+                        get_setting_float, get_setting_int, jsonrpc, kodi_to_ascii, kodi_version, localize, log, notification,
                         ok_dialog, progress_dialog, select_dialog, set_setting, set_setting_bool, textviewer,
                         translate_path, yesno_dialog)
 
@@ -157,13 +157,6 @@ def _widevine_path(cls):
 
         return False
 
-    @classmethod
-    def _kodi_version(cls):
-        """Return the current Kodi version"""
-        from xbmc import getInfoLabel
-        version = getInfoLabel('System.BuildVersion')
-        return version.split(' ')[0]
-
     @classmethod
     def _arch(cls):
         """Map together and return the system architecture."""
@@ -485,8 +478,8 @@ def _supports_widevine(self):
             return False
 
         from distutils.version import LooseVersion  # pylint: disable=import-error,no-name-in-module,useless-suppression
-        if LooseVersion(config.WIDEVINE_MINIMUM_KODI_VERSION[system_os()]) > LooseVersion(self._kodi_version()):
-            log('Unsupported Kodi version for Widevine: {version}', version=self._kodi_version())
+        if LooseVersion(config.WIDEVINE_MINIMUM_KODI_VERSION[system_os()]) > LooseVersion(kodi_version()):
+            log('Unsupported Kodi version for Widevine: {version}', version=kodi_version())
             ok_dialog(localize(30004), localize(30010, version=config.WIDEVINE_MINIMUM_KODI_VERSION[system_os()]))  # Kodi too old
             return False
 
@@ -1062,7 +1055,7 @@ def check_inputstream(self):
     def info_dialog(self):
         """ Show an Info box with useful info e.g. for bug reports"""
         text = localize(30800) + '\n'  # Kodi information
-        text += ' - ' + localize(30801, version=self._kodi_version()) + '\n'
+        text += ' - ' + localize(30801, version=kodi_version()) + '\n'
         text += ' - ' + localize(30802, platform=system_os(), arch=self._arch()) + '\n'
         text += '\n'
 

lib/inputstreamhelper/kodiutils.py

@@ -19,8 +19,13 @@ def __missing__(self, key):
 
 
 def kodi_version():
-    """Returns major Kodi version"""
-    return int(xbmc.getInfoLabel('System.BuildVersion').split('.')[0])
+    """Returns full Kodi version as string"""
+    return xbmc.getInfoLabel('System.BuildVersion').split(' ')[0]
+
+
+def kodi_version_major():
+    """Returns major Kodi version as integer"""
+    return int(kodi_version().split('.')[0])
 
 
 def translate_path(path):
@@ -91,7 +96,7 @@ def textviewer(heading='', text='', usemono=False):
     from xbmcgui import Dialog
     if not heading:
         heading = ADDON.getAddonInfo('name')
-    if kodi_version() < 18:
+    if kodi_version_major() < 18:
         return Dialog().textviewer(heading=heading, text=text)
     return Dialog().textviewer(heading=heading, text=text, usemono=usemono)