vsslctrl 0.1.8.dev1__py3-none-any.whl → 0.1.9.dev1__py3-none-any.whl

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/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.dist-info → vsslctrl-0.1.9.dev1.dist-info}/METADATA

@@ -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.dist-info → vsslctrl-0.1.9.dev1.dist-info}/RECORD

@@ -2,10 +2,10 @@ vsslctrl/__init__.py,sha256=W7cljoE7L3DukAVr_TEqkxFycYrUbJiqaHrOlbPkmKU,145
 vsslctrl/api_alpha.py,sha256=UxsMKOFK4Uit3QoF96Wa3VE1WdbCq7FOJjt-3fewAe0,33962
 vsslctrl/api_base.py,sha256=a80CRtUkYK2OwXQOL8bP-YOvt4YE-ALd-VONza_gjK8,9623
 vsslctrl/api_bravo.py,sha256=pchZN16KIvdSrqkI1WU9PA9IEmxkyyP-XifxpRC0jDE,12283
-vsslctrl/core.py,sha256=vgwmiaJf46kL5O8-vQ4JXuMhj-ms8_qt-0PO7-1yEuk,9068
+vsslctrl/core.py,sha256=G6XSH2_sxVaB6AfR6Btt8SMqiihlBQ6n_UZB9lsO7fw,9114
 vsslctrl/data_structure.py,sha256=i6xG72kQqFDSoEhI307Iw9QXTquMNMc4qMUGOK0MEbw,9793
 vsslctrl/decorators.py,sha256=lG8cYSSA-fNvdcp_90lv58tj50bF6iPoigLKcucWSSI,1707
-vsslctrl/device.py,sha256=n4WbGHRJBw1k9eiG9DksxJtuFRaHBn7geOvrv0WLgkI,5560
+vsslctrl/device.py,sha256=M6fcd2ggE-ConHoENpQ3WtGQzmSyok9t-8Kt5pd-r6U,6104
 vsslctrl/discovery.py,sha256=3z7z6YQUtvjFvRlQOZXIu6Wd4M896rMbi8SUkTub3AM,5568
 vsslctrl/event_bus.py,sha256=9liAEJnZfthJwy5O-qc3pDIWRBv5AcV19PjMCwH_niU,5014
 vsslctrl/exceptions.py,sha256=EEfNlu--9PMIidj3V3ZB8c7p3My8siqKw7YIOjPFaqE,419
@@ -16,8 +16,8 @@ vsslctrl/track.py,sha256=_lQNHYe8ZBm3v1lehFLjZruF5-Rz8PGWuQN-zISBgwc,10136
 vsslctrl/transport.py,sha256=XJFy0kl9y7hm3YV4_9ElBrq3u6--_k73UKJqKdO6Rqg,6993
 vsslctrl/utils.py,sha256=FWOMHM_sl1Cp1xab-V6b-A5B7qRmDN67hMMxV4ReWCk,2087
 vsslctrl/zone.py,sha256=teSk8oE3LKteidRnuVK3koUOqtN-90LclEx0-T4FhAE,12978
-vsslctrl-0.1.8.dev1.dist-info/LICENSE,sha256=67Ekj8PIxjEvkPd7L3GYJ8dyvn1EC4sPM3q3FKtpN6w,1065
-vsslctrl-0.1.8.dev1.dist-info/METADATA,sha256=Mdh-StM-gY7AeaBQrg8wbSuki-lgmL-sNVufXs3oGkI,16990
-vsslctrl-0.1.8.dev1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-vsslctrl-0.1.8.dev1.dist-info/top_level.txt,sha256=MRycO_RKageNX27UZ2bLJDMlfeWTQzUZlsd3hS-0u3Y,9
-vsslctrl-0.1.8.dev1.dist-info/RECORD,,
+vsslctrl-0.1.9.dev1.dist-info/LICENSE,sha256=67Ekj8PIxjEvkPd7L3GYJ8dyvn1EC4sPM3q3FKtpN6w,1065
+vsslctrl-0.1.9.dev1.dist-info/METADATA,sha256=fKQI1brfCRDqoXlXfPNB_22heY6oQC-fxjADf02JYro,16990
+vsslctrl-0.1.9.dev1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+vsslctrl-0.1.9.dev1.dist-info/top_level.txt,sha256=MRycO_RKageNX27UZ2bLJDMlfeWTQzUZlsd3hS-0u3Y,9
+vsslctrl-0.1.9.dev1.dist-info/RECORD,,