feat: add config fetching for zone and source properties

aiorussound/const.py

@@ -155,6 +155,17 @@ class FeatureFlag(Enum):
 
 VERSIONS_BY_FLAGS = defaultdict(list)
 
+ZONE_PROPERTIES = [
+    'volume', 'bass', 'treble', 'balance', 'loudness', 'turnOnVolume', 'doNotDisturb', 'partyMode', 'status', 'mute',
+    'sharedSource', 'lastError', 'page', 'sleepTimeDefault', 'sleepTimeRemaining', 'enabled'
+]
+
+SOURCE_PROPERTIES = [
+    'type', 'channel', 'coverArtURL', 'channelName', 'genre', 'artistName', 'albumName', 'playlistName', 'songName',
+    'programServiceName', 'radioText', 'shuffleMode', 'repeatMode', 'mode', 'playStatus', 'sampleRate', 'bitRate',
+    'bitDepth', 'playTime', 'trackTime'
+]
+
 for version, flags in FLAGS_BY_VERSION.items():
     for flag in flags:
-        VERSIONS_BY_FLAGS[flag] = version
+        VERSIONS_BY_FLAGS[flag] = version

aiorussound/rio.py

@@ -3,7 +3,7 @@
 from asyncio import StreamWriter, StreamReader, AbstractEventLoop
 
 from aiorussound.const import FeatureFlag, MINIMUM_API_SUPPORT, FLAGS_BY_VERSION, RESPONSE_REGEX, DEFAULT_PORT, \
-    RECONNECT_DELAY
+    RECONNECT_DELAY, ZONE_PROPERTIES, SOURCE_PROPERTIES
 from aiorussound.exceptions import UncachedVariable, CommandException, UnsupportedRussoundVersion
 from aiorussound.util import is_feature_supported, is_fw_version_higher, zone_device_str, source_device_str, \
     controller_device_str
@@ -284,8 +284,8 @@ def __init__(self, instance: Russound, controller_id: int, mac_address: str, con
         # TODO: Metadata fetching
 
     async def fetch_configuration(self):
-        await self._init_zones()
         await self._init_sources()
+        await self._init_zones()
 
     def __str__(self):
         return f"{self.controller_id}"
@@ -307,7 +307,10 @@ async def _init_zones(self):
                 device_str = zone_device_str(self.controller_id, zone_id)
                 name = await self.instance.get_variable(device_str, "name")
                 if name:
-                    self.zones[zone_id] = Zone(self.instance, self, zone_id, name)
+                    zone = Zone(self.instance, self, zone_id, name)
+                    await zone.fetch_configuration()
+                    self.zones[zone_id] = zone
+
             except CommandException:
                 break
 
@@ -319,7 +322,9 @@ async def _init_sources(self):
                 device_str = source_device_str(source_id)
                 name = await self.instance.get_variable(device_str, "name")
                 if name:
-                    self.sources[source_id] = Source(self.instance, self, source_id, name)
+                    source = Source(self.instance, self, source_id, name)
+                    await source.fetch_configuration()
+                    self.sources[source_id] = source
             except CommandException:
                 break
 
@@ -344,6 +349,13 @@ def __init__(self, instance: Russound, controller: Controller, zone_id: int, nam
         self.zone_id = int(zone_id)
         self.name = name
 
+    async def fetch_configuration(self):
+        for prop in ZONE_PROPERTIES:
+            try:
+                await self.instance.get_variable(self.device_str(), prop)
+            except CommandException:
+                continue
+
     def __str__(self):
         return f"{self.controller.mac_address} > Z{self.zone_id}"
 
@@ -477,6 +489,13 @@ def __init__(self, instance: Russound, controller: Controller, source_id: int, n
         self.source_id = int(source_id)
         self.name = name
 
+    async def fetch_configuration(self):
+        for prop in SOURCE_PROPERTIES:
+            try:
+                await self.instance.get_variable(self.device_str(), prop)
+            except CommandException:
+                continue
+
     def __str__(self):
         return f"{self.controller.mac_address} > S{self.source_id}"
 

setup.py

@@ -2,7 +2,7 @@
 
 setup(
         name='aiorussound',
-        version='2.0.4',
+        version='2.0.5',
         packages=['aiorussound'],
         license='MIT',
         author='Noah Husby',