Review comments fixed

miio/airfilter_util.py

@@ -1,5 +1,6 @@
 import enum
 import re
+from typing import Optional
 
 
 class FilterType(enum.Enum):
@@ -21,12 +22,20 @@ class FilterTypeUtil:
 
     _filter_type_cache = {}
 
-    def determine_filter_type(self, product_id: str) -> FilterType:
+    def determine_filter_type(self, rfid_tag: Optional[str], product_id: Optional[str]) -> Optional[FilterType]:
         """
         Determine Xiaomi air filter type based on its product ID.
 
+        :param rfid_tag: RFID tag value
         :param product_id: Product ID such as "0:0:30:33"
         """
+        if rfid_tag is None:
+            return None
+        if rfid_tag == "0:0:0:0:0:0:0":
+            return FilterType.Unknown
+        if product_id is None:
+            return FilterType.Regular
+
         ft = self._filter_type_cache.get(product_id, None)
         if ft is None:
             for filter_re, filter_type in FILTER_TYPE_RE:

miio/airpurifier.py

@@ -226,13 +226,7 @@ def filter_rfid_tag(self) -> Optional[str]:
     @property
     def filter_type(self) -> Optional[FilterType]:
         """Type of installed filter."""
-        if self.filter_rfid_tag is None:
-            return None
-        if self.filter_rfid_tag == "0:0:0:0:0:0:0":
-            return FilterType.Unknown
-        if self.filter_rfid_product_id is None:
-            return FilterType.Regular
-        return self.filter_type_util.determine_filter_type(self.filter_rfid_product_id)
+        return self.filter_type_util.determine_filter_type(self.filter_rfid_tag, self.filter_rfid_product_id)
 
     @property
     def learn_mode(self) -> bool:

miio/airpurifier_miot.py

@@ -195,13 +195,7 @@ def filter_rfid_tag(self) -> Optional[str]:
     @property
     def filter_type(self) -> Optional[FilterType]:
         """Type of installed filter."""
-        if self.filter_rfid_tag is None:
-            return None
-        if self.filter_rfid_tag == "0:0:0:0:0:0:0":
-            return FilterType.Unknown
-        if self.filter_rfid_product_id is None:
-            return FilterType.Regular
-        return self.filter_type_util.determine_filter_type(self.filter_rfid_product_id)
+        return self.filter_type_util.determine_filter_type(self.filter_rfid_tag, self.filter_rfid_product_id)
 
     def __repr__(self) -> str:
         s = (
@@ -364,12 +358,13 @@ def set_mode(self, mode: OperationMode):
         default_output=format_output("Setting favorite level to {level}"),
     )
     def set_favorite_level(self, level: int):
-        """Set favorite level."""
+        """Set favorite level.
+         Set the favorite level used when the mode is `favorite`,
+         should be  between 0 and 14.
+        """
         if level < 0 or level > 14:
             raise AirPurifierMiotException("Invalid favorite level: %s" % level)
 
-        # Set the favorite level used when the mode is `favorite`,
-        # should be  between 0 and 14.
         return self.set_property("favorite_level", level)
 
     @command(

miio/tests/test_airfilter_util.py

@@ -12,15 +12,21 @@ def airfilter_util(request):
 
 @pytest.mark.usefixtures("airfilter_util")
 class TestAirFilterUtil(TestCase):
+    def test_determine_filter_type__recognises_unknown_filter(self):
+        assert (
+            self.filter_type_util.determine_filter_type("0:0:0:0:0:0:0", None)
+            is FilterType.Unknown
+        )
+
     def test_determine_filter_type__recognises_antibacterial_filter(self):
         assert (
-            self.filter_type_util.determine_filter_type("12:34:41:30")
+            self.filter_type_util.determine_filter_type("80:64:d1:ba:4f:5f:4", "12:34:41:30")
             is FilterType.AntiBacterial
         )
 
     def test_determine_filter_type__recognises_antiformaldehyde_filter(self):
         assert (
-            self.filter_type_util.determine_filter_type("12:34:00:31")
+            self.filter_type_util.determine_filter_type("80:64:d1:ba:4f:5f:4", "12:34:00:31")
             is FilterType.AntiFormaldehyde
         )
 
@@ -30,9 +36,10 @@ def test_determine_filter_type__falls_back_to_regular_filter(self):
             "12:34:56:31",
             "12:34:56:31:11:11",
             "CO:FF:FF:EE",
+            None,
         ]
         for product_id in regular_filters:
             assert (
-                self.filter_type_util.determine_filter_type(product_id)
+                self.filter_type_util.determine_filter_type("80:64:d1:ba:4f:5f:4", product_id)
                 is FilterType.Regular
             )