vsslctrl 0.1.8.dev1__tar.gz → 0.1.9.dev1__tar.gz

{vsslctrl-0.1.8.dev1 → vsslctrl-0.1.9.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vsslctrl
-Version: 0.1.8.dev1
+Version: 0.1.9.dev1
 Summary: Package for controlling VSSL's range of streaming amplifiers
 Author-email: vsslctrl <vsslcontrolled@proton.me>
 Classifier: Development Status :: 4 - Beta
@@ -39,7 +39,7 @@ There should not be any *[VSSL Agent's](https://vssl.gitbook.io/vssl-rest-api/ge
 
 ## TODOs
 
-* **A1(.x)** specific control e.g sub crossover, bluetooth
+* **A.1(x)** specific control e.g sub crossover, bluetooth
 * Better test coverage
 
 ## Basic Usage

{vsslctrl-0.1.8.dev1 → vsslctrl-0.1.9.dev1}/README.md

@@ -18,7 +18,7 @@ There should not be any *[VSSL Agent's](https://vssl.gitbook.io/vssl-rest-api/ge
 
 ## TODOs
 
-* **A1(.x)** specific control e.g sub crossover, bluetooth
+* **A.1(x)** specific control e.g sub crossover, bluetooth
 * Better test coverage
 
 ## Basic Usage

{vsslctrl-0.1.8.dev1 → vsslctrl-0.1.9.dev1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vsslctrl"
-version = "0.1.8.dev1"
+version = "0.1.9.dev1"
 description = "Package for controlling VSSL's range of streaming amplifiers"
 authors = [
   { name="vsslctrl", email="vsslcontrolled@proton.me" },

{vsslctrl-0.1.8.dev1 → vsslctrl-0.1.9.dev1}/vsslctrl/core.py

@@ -87,8 +87,7 @@ class Vssl:
                 raise VsslCtrlException(message)
 
             except VsslCtrlException:
-                zone_count = self.model.zone_count
-                message = f"Device model only has {zone_count} zones instead of {len(self.zones)}"
+                message = f"Device model {self.model.name} only has {self.model.zone_count} zones not {len(self.zones)}."
                 self._log_critical(message)
                 await first_zone.disconnect()
                 raise VsslCtrlException(message)
@@ -194,6 +193,11 @@ class Vssl:
     #
     # Work out the a model given some device info
     #
+    #
+    #
+    # THIS WONT WORK FOR ORIGINAL A SERIES! TODO!
+    #
+    #
     def _infer_device_model(self, data: Dict[str, int]):
         # if we dont have a model, default to x series
         if not self.model:

{vsslctrl-0.1.8.dev1 → vsslctrl-0.1.9.dev1}/vsslctrl/device.py

@@ -205,57 +205,72 @@ class Model:
 
 
 class Models(VsslEnum):
-    A1 = Model(
+    A1X = Model(
         {
-            "name": "A.1",
+            "name": "A.1x",
             "zones": SINGLE_ZONE,
             "input_sources": INPUT_SOURCES_FOR_1_ZONE_DEVICE,
             "analog_output_sources": ANALOG_OUTPUT_SOURCES_FOR_1_ZONE_DEVICE,
             "features": [Features.BLUETOOTH, Features.SUBWOOFER_CROSSOVER],
         }
     )
-    A3 = Model(
+    A3X = Model(
         {
-            "name": "A.3",
+            "name": "A.3x",
             "zones": THREE_ZONES,
-            "input_sources": INPUT_SOURCES_FOR_A3,
-            "analog_output_sources": ANALOG_OUTPUT_SOURCES_FOR_A3,
-            "features": [Features.GROUPING, Features.PARTY_MODE],
+            "input_sources": INPUT_SOURCES_FOR_3_ZONE_DEVICE,
+            "analog_output_sources": ANALOG_OUTPUT_SOURCES_FOR_3_ZONE_DEVICE,
+            "features": [Features.GROUPING],
         }
     )
-    A6 = Model(
+    A6X = Model(
         {
-            "name": "A.6",
+            "name": "A.6x",
             "zones": SIX_ZONES,
-            "input_sources": INPUT_SOURCES_FOR_A6,
-            "analog_output_sources": ANALOG_OUTPUT_SOURCES_FOR_A6,
-            "features": [Features.GROUPING, Features.PARTY_MODE],
+            "input_sources": INPUT_SOURCES_FOR_6_ZONE_DEVICE,
+            "analog_output_sources": ANALOG_OUTPUT_SOURCES_FOR_6_ZONE_DEVICE,
+            "features": [Features.GROUPING],
         }
     )
-    A1X = Model(
+    A1 = Model(
         {
-            "name": "A.1x",
+            "name": "A.1",
             "zones": SINGLE_ZONE,
             "input_sources": INPUT_SOURCES_FOR_1_ZONE_DEVICE,
             "analog_output_sources": ANALOG_OUTPUT_SOURCES_FOR_1_ZONE_DEVICE,
             "features": [Features.BLUETOOTH, Features.SUBWOOFER_CROSSOVER],
         }
     )
-    A3X = Model(
+    A3 = Model(
         {
-            "name": "A.3x",
+            "name": "A.3",
             "zones": THREE_ZONES,
-            "input_sources": INPUT_SOURCES_FOR_3_ZONE_DEVICE,
-            "analog_output_sources": ANALOG_OUTPUT_SOURCES_FOR_3_ZONE_DEVICE,
-            "features": [Features.GROUPING],
+            "input_sources": INPUT_SOURCES_FOR_A3,
+            "analog_output_sources": ANALOG_OUTPUT_SOURCES_FOR_A3,
+            "features": [Features.GROUPING, Features.PARTY_MODE],
         }
     )
-    A6X = Model(
+    A6 = Model(
         {
-            "name": "A.6x",
+            "name": "A.6",
             "zones": SIX_ZONES,
-            "input_sources": INPUT_SOURCES_FOR_6_ZONE_DEVICE,
-            "analog_output_sources": ANALOG_OUTPUT_SOURCES_FOR_6_ZONE_DEVICE,
-            "features": [Features.GROUPING],
+            "input_sources": INPUT_SOURCES_FOR_A6,
+            "analog_output_sources": ANALOG_OUTPUT_SOURCES_FOR_A6,
+            "features": [Features.GROUPING, Features.PARTY_MODE],
         }
     )
+
+    @classmethod
+    def get_model_names(cls):
+        return [model.value.name for model in cls]
+
+    @classmethod
+    def get_model_by_name(cls, name):
+        # Preprocess input name: convert to lowercase and remove dots
+        name_cleaned = name.lower().replace(".", "")
+
+        for model in cls:
+            # Preprocess model name: convert to lowercase and remove dots
+            if model.value.name.lower().replace(".", "") == name_cleaned:
+                return model.value
+        return None  # Return None if no match is found

{vsslctrl-0.1.8.dev1 → vsslctrl-0.1.9.dev1}/vsslctrl.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vsslctrl
-Version: 0.1.8.dev1
+Version: 0.1.9.dev1
 Summary: Package for controlling VSSL's range of streaming amplifiers
 Author-email: vsslctrl <vsslcontrolled@proton.me>
 Classifier: Development Status :: 4 - Beta
@@ -39,7 +39,7 @@ There should not be any *[VSSL Agent's](https://vssl.gitbook.io/vssl-rest-api/ge
 
 ## TODOs
 
-* **A1(.x)** specific control e.g sub crossover, bluetooth
+* **A.1(x)** specific control e.g sub crossover, bluetooth
 * Better test coverage
 
 ## Basic Usage