SONOS:

- bump to 1.8.8 - introduce item handling from smartplugin - code cleanup
sisamiwe · Nov 13, 2024 · 334dc5a · 334dc5a
1 parent 940af3a
commit 334dc5a
Show file tree

Hide file tree

Showing 48 changed files with 85 additions and 78 deletions.
diff --git a/sonos/__init__.py b/sonos/__init__.py
diff --git a/sonos/plugin.yaml b/sonos/plugin.yaml
@@ -12,7 +12,7 @@ plugin:
   documentation: https://github.com/smarthomeNG/plugins/blob/master/sonos/README.md
   support: https://knx-user-forum.de/forum/supportforen/smarthome-py/25151-sonos-anbindung
 
-  version: 1.8.7                 # Plugin version
+  version: 1.8.8                 # Plugin version
   sh_minversion: '1.5.1'           # minimum shNG version to use this plugin
   py_minversion: '3.8'             # minimum Python version to use for this plugin
   multi_instance: False          # plugin supports multi instance
@@ -227,13 +227,15 @@ item_attributes:
 
   sonos_dpt3_step:
     type: int
+    default: 2
     description:
       de: 'Relatives dpt3 Inkrement'
       en: 'Relative dpt3 increment'
     mandatory: False
 
   sonos_dpt3_time:
     type: int
+    default: 1
     description:
       de: 'Dpt3 Zeitinkrement'
       en: 'Dpt3 time increment'

diff --git a/sonos/requirements.txt b/sonos/requirements.txt
diff --git a/sonos/search_uids.py b/sonos/search_uids.py
diff --git a/sonos/soco/__init__.py b/sonos/soco/__init__.py
diff --git a/sonos/soco/alarms.py b/sonos/soco/alarms.py
diff --git a/sonos/soco/cache.py b/sonos/soco/cache.py
diff --git a/sonos/soco/compat.py b/sonos/soco/compat.py
diff --git a/sonos/soco/config.py b/sonos/soco/config.py
diff --git a/sonos/soco/core.py b/sonos/soco/core.py
diff --git a/sonos/soco/data_structure_quirks.py b/sonos/soco/data_structure_quirks.py
diff --git a/sonos/soco/data_structures.py b/sonos/soco/data_structures.py
diff --git a/sonos/soco/data_structures_entry.py b/sonos/soco/data_structures_entry.py
diff --git a/sonos/soco/discovery.py b/sonos/soco/discovery.py
diff --git a/sonos/soco/events.py b/sonos/soco/events.py
diff --git a/sonos/soco/events_asyncio.py b/sonos/soco/events_asyncio.py
diff --git a/sonos/soco/events_base.py b/sonos/soco/events_base.py
diff --git a/sonos/soco/events_twisted.py b/sonos/soco/events_twisted.py
diff --git a/sonos/soco/exceptions.py b/sonos/soco/exceptions.py
diff --git a/sonos/soco/groups.py b/sonos/soco/groups.py
diff --git a/sonos/soco/ms_data_structures.py b/sonos/soco/ms_data_structures.py
diff --git a/sonos/soco/music_library.py b/sonos/soco/music_library.py
diff --git a/sonos/soco/music_services/__init__.py b/sonos/soco/music_services/__init__.py
diff --git a/sonos/soco/music_services/accounts.py b/sonos/soco/music_services/accounts.py
diff --git a/sonos/soco/music_services/data_structures.py b/sonos/soco/music_services/data_structures.py
diff --git a/sonos/soco/music_services/music_service.py b/sonos/soco/music_services/music_service.py
diff --git a/sonos/soco/music_services/token_store.py b/sonos/soco/music_services/token_store.py
diff --git a/sonos/soco/plugins/__init__.py b/sonos/soco/plugins/__init__.py
diff --git a/sonos/soco/plugins/example.py b/sonos/soco/plugins/example.py
diff --git a/sonos/soco/plugins/plex.py b/sonos/soco/plugins/plex.py
diff --git a/sonos/soco/plugins/sharelink.py b/sonos/soco/plugins/sharelink.py
diff --git a/sonos/soco/plugins/spotify.py b/sonos/soco/plugins/spotify.py
diff --git a/sonos/soco/plugins/wimp.py b/sonos/soco/plugins/wimp.py
diff --git a/sonos/soco/services.py b/sonos/soco/services.py
diff --git a/sonos/soco/snapshot.py b/sonos/soco/snapshot.py
diff --git a/sonos/soco/soap.py b/sonos/soco/soap.py
diff --git a/sonos/soco/utils.py b/sonos/soco/utils.py
diff --git a/sonos/soco/xml.py b/sonos/soco/xml.py
diff --git a/sonos/soco/zonegroupstate.py b/sonos/soco/zonegroupstate.py
diff --git a/sonos/sv_widgets/widget_sonos.css b/sonos/sv_widgets/widget_sonos.css
diff --git a/sonos/sv_widgets/widget_sonos.html b/sonos/sv_widgets/widget_sonos.html
diff --git a/sonos/sv_widgets/widget_sonos.js b/sonos/sv_widgets/widget_sonos.js
diff --git a/sonos/sv_widgets/widget_widget_sonos.player.html b/sonos/sv_widgets/widget_widget_sonos.player.html
diff --git a/sonos/user_doc.rst b/sonos/user_doc.rst
diff --git a/sonos/utils.py b/sonos/utils.py
diff --git a/sonos/webif/__init__.py b/sonos/webif/__init__.py
@@ -71,8 +71,8 @@ def index(self, reload=None):
 
         return tmpl.render(p=self.plugin,
                            webif_pagelength=pagelength,
-                           item_list=self.plugin.item_list,
-                           item_count=len(self.plugin.item_list),
+                           item_list=self.plugin.get_item_list(),
+                           item_count=len(self.plugin.get_item_list()),
                            plugin_shortname=self.plugin.get_shortname(),
                            plugin_version=self.plugin.get_version(),
                            plugin_info=self.plugin.get_info(),
@@ -103,7 +103,7 @@ def get_data_html(self, dataSet=None):
             data = dict()
 
             data['items'] = {}
-            for item in self.plugin.item_list:
+            for item in self.plugin.get_item_list():
                 data['items'][item.property.path] = {}
                 data['items'][item.property.path]['value'] = item() if item() is not None else '-'
                 data['items'][item.property.path]['last_update'] = item.property.last_update.strftime('%d.%m.%Y %H:%M:%S')

diff --git a/sonos/webif/static/img/plugin_logo.png b/sonos/webif/static/img/plugin_logo.png
diff --git a/sonos/webif/templates/index.html b/sonos/webif/templates/index.html