script.module.slyguy -> v0.74.9

matthuisman · Nov 15, 2023 · 054cbae · 054cbae
1 parent 41b6d7d
commit 054cbae
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/script.module.slyguy/addon.xml b/script.module.slyguy/addon.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.module.slyguy" name="SlyGuy Common" provider-name="SlyGuy" version="0.74.8">
+<addon id="script.module.slyguy" name="SlyGuy Common" provider-name="SlyGuy" version="0.74.9">
   <requires>
     <import addon="slyguy.dependencies" version="0.0.8"/>
     <import addon="repository.slyguy" version="0.0.4"/>
   </requires>
+  <extension point="xbmc.python.pluginsource" library="default.py">
+    <provides>executable</provides>
+  </extension>
   <extension point="xbmc.service" library="service.py" start="login" />
-  <extension point="xbmc.python.pluginsource" library="default.py" />
   <extension point="xbmc.python.module" library="resources/modules" />
   <extension point="xbmc.addon.metadata">
-    <description lang="en">Common code required by all Slyguy add-ons</description>
+    <description lang="en">Common code, proxy and settings required by all Slyguy add-ons</description>
     <reuselanguageinvoker>true</reuselanguageinvoker>
     <license></license>
     <language></language>

diff --git a/script.module.slyguy/default.py b/script.module.slyguy/default.py
@@ -5,5 +5,4 @@
 sys.path.insert(1, os.path.realpath(os.path.join(path, 'resources/modules')))
 
 from resources.lib.plugin import plugin
-
-plugin.dispatch(sys.argv[2])
+plugin.dispatch()
diff --git a/script.module.slyguy/resources/lib/plugin.py b/script.module.slyguy/resources/lib/plugin.py
@@ -2,15 +2,21 @@
 
 from kodi_six import xbmc
 
-from slyguy import plugin, settings, gui
-from slyguy.util import get_kodi_setting, get_addon, run_plugin
+from slyguy import plugin, gui
+from slyguy.util import get_kodi_setting, get_addon
 
 from .util import check_updates, get_slyguy_addons
 from .language import _
 
+
 @plugin.route('')
 def home(**kwargs):
-    settings.open()
+    folder = plugin.Folder()
+    folder.add_item(label=_.UPDATE_ADDONS, path=plugin.url_for(update_addons))
+    folder.add_item(label=_.CHECK_LOG, path=plugin.url_for(check_log))
+    folder.add_item(label=_.INSTALL_WV_DRM, path=plugin.url_for(plugin.ROUTE_IA_INSTALL), _condition=not xbmc.getCondVisibility('System.Platform.Android'))
+    folder.add_item(label=_.SETTINGS, path=plugin.url_for(plugin.ROUTE_SETTINGS))
+    return folder
 
 @plugin.route()
 def update_addons(**kwargs):
@@ -45,7 +51,7 @@ def check_log(**kwargs):
     addon_ids = [x.lower() for x in get_slyguy_addons()]
 
     errors = []
-    text = text.decode('utf8')
+    text = text.decode('utf8', errors='ignore')
     for line in text.splitlines():
         match = None
         if 'ERROR <general>:' in line: #Kodi 19+

diff --git a/script.module.slyguy/resources/modules/slyguy/plugin.py b/script.module.slyguy/resources/modules/slyguy/plugin.py
@@ -765,12 +765,19 @@ def display(self):
             process_news()
 
     def add_item(self, *args, **kwargs):
+        condition = kwargs.pop('_condition', None)
         position = kwargs.pop('_position', None)
         kiosk = kwargs.pop('_kiosk', None)
 
         if kiosk == False and settings.getBool('kiosk', False):
             return False
 
+        if condition is not None:
+            if callable(condition):
+                condition = condition()
+            if not condition:
+                return False
+
         item = Item(*args, **kwargs)
 
         if position == None: