Merge pull request #30 from aanderse/kodi-19

port to kodi 19.x

Author: aanderse

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.program.steam.library" name="Steam Library" version="0.7.0" provider-name="aanderse">
+<addon id="plugin.program.steam.library" name="Steam Library" version="0.8.0" provider-name="aanderse">
     <requires>
-        <import addon="xbmc.python" version="2.19.0" />
+        <import addon="xbmc.python" version="3.0.0" />
         <import addon="script.module.requests" version="2.18.4" />
         <import addon="script.module.requests-cache" version="0.4.13" />
         <import addon="script.module.routing" version="0.2.0"/>
@@ -43,6 +43,8 @@
             - added support for more arts types and views for games, such as posters
             - added play time information and sorting games by play time
             - Offline support of the game lists, with a caching mechanism of the Steam API responses
+            v0.8.0 (2021-03-12)
+            - ported to kodi 19.x
         </news>
         <assets>
             <icon>icon.png</icon>

resources/arts.py

@@ -6,14 +6,14 @@
 import requests
 import requests_cache
 
-from util import log
+from .util import log
 
 __addon__ = xbmcaddon.Addon()
 artFallbackEnabled = __addon__.getSetting("enable-art-fallback") == 'true'  # Kodi stores boolean settings as strings
 monthsBeforeArtsExpiration = int(__addon__.getSetting("arts-expire-after-months"))  # Default is 2 months
 
 # define the cache file to reside in the ..\Kodi\userdata\addon_data\(your addon)
-addonUserDataFolder = xbmc.translatePath(__addon__.getAddonInfo('profile')).decode('utf-8')
+addonUserDataFolder = xbmc.translatePath(__addon__.getAddonInfo('profile'))
 ART_AVAILABILITY_CACHE_FILE = xbmc.translatePath(os.path.join(addonUserDataFolder, 'requests_cache_arts'))
 
 cached_requests = requests_cache.core.CachedSession(ART_AVAILABILITY_CACHE_FILE, backend='sqlite',

resources/main.py

@@ -3,10 +3,10 @@
 import sys
 import xbmcplugin
 
-import arts
-import registry
-import steam
-from util import *
+from . import arts
+from . import registry
+from . import steam
+from .util import *
 
 __addon__ = xbmcaddon.Addon()
 

resources/registry.py

@@ -4,10 +4,10 @@
 
 import os
 import xbmc
-from util import *
+from .util import *
 
 if os.name == 'nt':
-    import _winreg
+    import winreg
 
 
 # https://github.com/lutris/lutris/blob/master/lutris/util/steam.py
@@ -50,10 +50,10 @@ def is_installed_win(app_id):
     :return: True if the app is installed, false otherwise
     """
     try:
-        app = _winreg.OpenKey(_winreg.HKEY_CURRENT_USER, "Software\\Valve\\Steam\\Apps\\" + app_id)
-        print(_winreg.QueryInfoKey(app)[1])
-        for i in range(_winreg.QueryInfoKey(app)[1]):
-            name, value, type = _winreg.EnumValue(app, i)
+        app = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Valve\\Steam\\Apps\\" + app_id)
+        print(winreg.QueryInfoKey(app)[1])
+        for i in range(winreg.QueryInfoKey(app)[1]):
+            name, value, type = winreg.EnumValue(app, i)
             if name == "Installed":
                 return value == 1
 
@@ -73,10 +73,10 @@ def get_installed_steam_apps(registry_path):
 
     if os.name == 'nt':
         try:
-            apps = _winreg.OpenKey(_winreg.HKEY_CURRENT_USER, "Software\\Valve\\Steam\\Apps")
-            print(_winreg.QueryInfoKey(apps)[0])
-            for i in range(_winreg.QueryInfoKey(apps)[0]):
-                app_id = _winreg.EnumKey(apps, i)
+            apps = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Valve\\Steam\\Apps")
+            print(winreg.QueryInfoKey(apps)[0])
+            for i in range(winreg.QueryInfoKey(apps)[0]):
+                app_id = winreg.EnumKey(apps, i)
                 if is_installed_win(app_id):
                     installed_apps.append(app_id)
 

resources/steam.py

@@ -10,13 +10,13 @@
 import requests
 import requests_cache
 
-from util import log
+from .util import log
 
 __addon__ = xbmcaddon.Addon()
 minutesBeforeGamesListsExpiration = int(__addon__.getSetting("games-expire-after-minutes"))  # Default is 3 days
 
 # define the cache file to reside in the ..\Kodi\userdata\addon_data\(your addon)
-addonUserDataFolder = xbmc.translatePath(__addon__.getAddonInfo('profile')).decode('utf-8')
+addonUserDataFolder = xbmc.translatePath(__addon__.getAddonInfo('profile'))
 STEAM_GAMES_CACHE_FILE = xbmc.translatePath(os.path.join(addonUserDataFolder, 'requests_cache_games'))
 
 # cache expires after: 86400=1 day   604800=7 days