Merge pull request #771 from MoojMidge/master

v7.0.7+beta.3

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.youtube" name="YouTube" version="7.0.7+beta.2" provider-name="anxdpanic, bromix, MoojMidge">
+<addon id="plugin.video.youtube" name="YouTube" version="7.0.7+beta.3" provider-name="anxdpanic, bromix, MoojMidge">
     <requires>
         <import addon="xbmc.python" version="3.0.0"/>
         <import addon="script.module.requests" version="2.27.1"/>

changelog.txt

@@ -1,3 +1,7 @@
+## v7.0.7+beta.3
+### Fixed
+- Fix plugin settings raising exception in Kodi 19-20 #769
+
 ## v7.0.7+beta.2
 ### Fixed
 - Fix invalid pageToken error by removing jump from unsupported listings #715
@@ -13,7 +17,6 @@
 - Fix failing to login #759
 - Improve resource usage
 - Fix adding video to playlist #764
-- Update video filtering for live streams #755
 
 ### Changed
 - Use internal Kodi resume enable/disable for all playback #693
@@ -25,6 +28,21 @@
 ### New
 - Enable syncing of plugin watched state with Kodi watched state when using Kodi mark as (un)watched #709
 - Add website link to video descriptions #721
+- Update video filtering for live streams #755
+  - Add options to filter/hide the following types of videos
+    - shorts
+    - upcoming videos (either live streams or premieres)
+    - upcoming live streams
+    - currently live streams
+    - upcoming premieres
+    - completed videos (previously either live or premieres)
+  - No currently live streams will be shown in searches, only in the Live subfolder
+  - No currently live or upcoming live streams will be shown in channels, only in the Live subfolder
+    - Should also be much faster
+  - Completed stream will continue to be shown in listings unless filtered out
+  - Live subfolders will not be filtered by default
+  - Filter selection dialog has option to also filter the Live subfolder
+  - Most other listings will be filtered using whatever options have been set
 
 ## v7.0.7+beta.1
 ### Fixed

resources/lib/youtube_plugin/kodion/settings/xbmc/xbmc_plugin_settings.py

@@ -22,32 +22,35 @@
 
 class SettingsProxy(object):
     def __init__(self, instance):
-        self.ref = instance
+        self._ref = instance
 
     if current_system_version.compatible(21, 0):
         def get_bool(self, *args, **kwargs):
-            return xbmcaddon.Settings.getBool(self.ref, *args, **kwargs)
+            return xbmcaddon.Settings.getBool(self.ref(), *args, **kwargs)
 
         def set_bool(self, *args, **kwargs):
-            return xbmcaddon.Settings.setBool(self.ref, *args, **kwargs)
+            return xbmcaddon.Settings.setBool(self.ref(), *args, **kwargs)
 
         def get_int(self, *args, **kwargs):
-            return xbmcaddon.Settings.getInt(self.ref, *args, **kwargs)
+            return xbmcaddon.Settings.getInt(self.ref(), *args, **kwargs)
 
         def set_int(self, *args, **kwargs):
-            return xbmcaddon.Settings.setInt(self.ref, *args, **kwargs)
+            return xbmcaddon.Settings.setInt(self.ref(), *args, **kwargs)
 
         def get_str(self, *args, **kwargs):
-            return xbmcaddon.Settings.getString(self.ref, *args, **kwargs)
+            return xbmcaddon.Settings.getString(self.ref(), *args, **kwargs)
 
         def set_str(self, *args, **kwargs):
-            return xbmcaddon.Settings.setString(self.ref, *args, **kwargs)
+            return xbmcaddon.Settings.setString(self.ref(), *args, **kwargs)
 
         def get_str_list(self, *args, **kwargs):
-            return xbmcaddon.Settings.getStringList(self.ref, *args, **kwargs)
+            return xbmcaddon.Settings.getStringList(self.ref(), *args, **kwargs)
 
         def set_str_list(self, *args, **kwargs):
-            return xbmcaddon.Settings.setStringList(self.ref, *args, **kwargs)
+            return xbmcaddon.Settings.setStringList(self.ref(), *args, **kwargs)
+
+        def ref(self):
+            return self._ref
     else:
         def get_bool(self, *args, **kwargs):
             return xbmcaddon.Addon.getSettingBool(self.ref(), *args, **kwargs)
@@ -74,6 +77,13 @@ def set_str_list(self, setting, value):
             value = ','.join(value)
             return xbmcaddon.Addon.setSetting(self.ref(), setting, value)
 
+        if current_system_version.compatible(19, 0):
+            def ref(self):
+                return self._ref
+        else:
+            def ref(self):
+                return self._ref()
+
 
 class XbmcPluginSettings(AbstractSettings):
     _instances = set()
@@ -108,6 +118,8 @@ def flush(self, xbmc_addon=None, fill=False, flush_all=True):
             # don't actually return anything...
             # Ignore return value until bug is fixed in Kodi
             self._check_set = False
+        elif current_system_version.compatible(19, 0):
+            self._proxy = SettingsProxy(xbmc_addon)
         else:
             if fill:
                 self.__class__._instances.add(xbmc_addon)