refactor: Updated agile innovative blinkstick classes with a parameterized _claims classmethod

Author: JnyJny

src/busylight_core/vendors/agile_innovative/blinkstick_base.py

@@ -34,6 +34,24 @@ def vendor() -> str:
         """Return the vendor name for this device."""
         return "Agile Innovative"
 
+    @classmethod
+    def _claims(
+        cls, hardware: Hardware, major: int, release_number: int | None = None
+    ) -> bool:
+        """Return True if the hardware matches the BlinkStick criteria."""
+
+        claim = super().claims(hardware)
+
+        try:
+            major, _ = cls.get_version(hardware.serial_number)
+        except ValueError:
+            return False
+
+        if release_number is None:
+            return claim and major == major
+
+        return claim and major == major and hardware.release_number == release_number
+
     @property
     def state(self) -> State:
         """BlinkStick state property."""

src/busylight_core/vendors/agile_innovative/blinkstick_flex.py

@@ -25,17 +25,10 @@ class BlinkStickFlex(BlinkStickBase):
 
     @classmethod
     def claims(cls, hardware: Hardware) -> bool:
-        """Check if the hardware describes a BlinkStick Flex."""
-        claim = super().claims(hardware)
-
-        try:
-            major, _ = cls.get_version(hardware.serial_number)
-        except ValueError:
-            return False
-
-        return claim and major == 3 and hardware.release_number == 0x203
+        """Return True if the hardware describes a BlinkStick Flex."""
+        return cls._claims(hardware, 3, 0x203)
 
     @cached_property
     def state(self) -> State:
-        """Get the current state of the BlinkStick Flex."""
+        """The state of the BlinkStick Flex."""
         return State.blinkstick_flex()

src/busylight_core/vendors/agile_innovative/blinkstick_nano.py

@@ -25,17 +25,10 @@ class BlinkStickNano(BlinkStickBase):
 
     @classmethod
     def claims(cls, hardware: Hardware) -> bool:
-        """Check if the hardware describes a BlinkStick Nano."""
-        claim = super().claims(hardware)
-
-        try:
-            major, _ = cls.get_version(hardware.serial_number)
-        except ValueError:
-            return False
-
-        return claim and major == 3 and hardware.release_number == 0x202
+        """Return True if the hardware describes a BlinkStick Nano."""
+        return cls._claims(hardware, 3, 0x202)
 
     @cached_property
     def state(self) -> State:
-        """Get the current state of the BlinkStick Nano."""
+        """The state of the BlinkStick Nano."""
         return State.blinkstick_nano()

src/busylight_core/vendors/agile_innovative/blinkstick_pro.py

@@ -25,17 +25,10 @@ class BlinkStickPro(BlinkStickBase):
 
     @classmethod
     def claims(cls, hardware: Hardware) -> bool:
-        """Check if the hardware describes a BlinkStick Pro."""
-        claim = super().claims(hardware)
-
-        try:
-            major, _ = cls.get_version(hardware.serial_number)
-        except ValueError:
-            return False
-
-        return claim and major == 2
+        """Return True if the hardware describes a BlinkStick Pro."""
+        return cls._claims(hardware, 2)
 
     @cached_property
     def state(self) -> State:
-        """Get the current state of the BlinkStick Pro."""
+        """The state of the BlinkStick Pro."""
         return State.blinkstick_pro()

src/busylight_core/vendors/agile_innovative/blinkstick_square.py

@@ -26,16 +26,9 @@ class BlinkStickSquare(BlinkStickBase):
     @classmethod
     def claims(cls, hardware: Hardware) -> bool:
         """Return True if the hardware describes a BlinkStick Square."""
-        claim = super().claims(hardware)
-
-        try:
-            major, _ = cls.get_version(hardware.serial_number)
-        except ValueError:
-            return False
-
-        return claim and major == 3 and hardware.release_number == 0x200
+        return cls._claims(hardware, 3, 0x200)
 
     @cached_property
     def state(self) -> State:
-        """Get the current state of the BlinkStick Square."""
+        """The state of the BlinkStick Square."""
         return State.blinkstick_square()

src/busylight_core/vendors/agile_innovative/blinkstick_strip.py

@@ -25,17 +25,10 @@ class BlinkStickStrip(BlinkStickBase):
 
     @classmethod
     def claims(cls, hardware: Hardware) -> bool:
-        """Check if the hardware describes a BlinkStick Strip."""
-        claim = super().claims(hardware)
-
-        try:
-            major, _ = cls.get_version(hardware.serial_number)
-        except ValueError:
-            return False
-
-        return claim and major == 3 and hardware.release_number == 0x201
+        """Return True if the hardware describes a BlinkStick Strip."""
+        return cls._claims(hardware, 3, 0x201)
 
     @cached_property
     def state(self) -> State:
-        """Get the current state of the BlinkStick Strip."""
+        """The state of the BlinkStick Strip."""
         return State.blinkstick_strip()