feat: support rule-based hwmon blacklist matching

Author: honjow

py_modules/fan.py

@@ -1,5 +1,6 @@
 import json
 import os
+import re
 from typing import List
 
 from conf_manager import confManager
@@ -26,6 +27,7 @@ def __init__(self):
         self.hwmon_curve_paths = []  # 风扇曲线写入路径
 
         self.hwmon_black_list = []  # 风扇hwmon黑名单
+        self.hwmon_black_list_rules = []  # 风扇hwmon黑名单规则
 
         # EC配置变量
         self.is_ec_configured = False  # 是否配置好风扇ec
@@ -122,6 +124,14 @@ def __parse_fan_configuration_HWMON(self, name_path_map):
                         )
                         else []
                     )
+                    fc.hwmon_black_list_rules = (
+                        hwmon_config["black_list_rules"]
+                        if (
+                            "black_list_rules" in hwmon_config
+                            and hwmon_config["black_list_rules"] is not None
+                        )
+                        else []
+                    )
 
                     fan_pwm_write = hwmon_config["pwm_write"]
                     pwm_write_max = fan_pwm_write["pwm_write_max"]
@@ -229,6 +239,75 @@ def __parse_fan_configuration_HWMON(self, name_path_map):
                 except Exception:
                     logger.error(f"获取风扇({hwmon_name})hwmon信息失败:", exc_info=True)
 
+    def __match_hwmon_black_list_value(self, target_value, rule_value, match_mode):
+        def _match_string(single_rule_value: str):
+            if match_mode == "contains":
+                return single_rule_value in target_value
+            if match_mode == "regex":
+                try:
+                    return re.search(single_rule_value, target_value) is not None
+                except re.error:
+                    logger.error(
+                        f"Invalid hwmon black_list_rules regex: {single_rule_value}",
+                        exc_info=True,
+                    )
+                    return False
+            return target_value == single_rule_value
+
+        if isinstance(rule_value, str):
+            return _match_string(rule_value)
+        if isinstance(rule_value, list):
+            return any(
+                isinstance(single_rule_value, str)
+                and _match_string(single_rule_value)
+                for single_rule_value in rule_value
+            )
+        return False
+
+    def __is_hwmon_blacklisted(self, fan_config: FanConfig):
+        if PRODUCT_NAME in fan_config.hwmon_black_list:
+            logger.info(
+                f"hwmon black_list matched: product_name={PRODUCT_NAME}, hwmon={fan_config.hwmon_name}"
+            )
+            return True
+
+        for rule in fan_config.hwmon_black_list_rules:
+            if not isinstance(rule, dict):
+                continue
+
+            match_mode = rule.get("match", "exact")
+            if not isinstance(match_mode, str):
+                match_mode = "exact"
+            match_mode = match_mode.lower()
+            if match_mode not in ("exact", "contains", "regex"):
+                logger.error(
+                    f"Invalid hwmon black_list_rules match mode: {match_mode}, fallback to exact"
+                )
+                match_mode = "exact"
+
+            has_match_item = False
+            is_matched = True
+
+            if "product_name" in rule:
+                has_match_item = True
+                is_matched = is_matched and self.__match_hwmon_black_list_value(
+                    PRODUCT_NAME, rule["product_name"], match_mode
+                )
+
+            if "product_version" in rule:
+                has_match_item = True
+                is_matched = is_matched and self.__match_hwmon_black_list_value(
+                    PRODUCT_VERSION, rule["product_version"], match_mode
+                )
+
+            if has_match_item and is_matched:
+                logger.info(
+                    f"hwmon black_list_rules matched: product_name={PRODUCT_NAME}, product_version={PRODUCT_VERSION}, hwmon={fan_config.hwmon_name}, rule={rule}"
+                )
+                return True
+
+        return False
+
     # 获取配置值，支持直接数值或按机型字典格式
     def __get_value_for_product(self, config_value, default=0):
         """获取配置值，支持直接数值或按机型字典格式"""
@@ -361,9 +440,7 @@ def parse_fan_configuration(self):
 
         # self.fan_config_list 筛选, 去除黑名单
         self.fan_config_list = list(
-            filter(
-                lambda x: PRODUCT_NAME not in x.hwmon_black_list, self.fan_config_list
-            )
+            filter(lambda x: not self.__is_hwmon_blacklisted(x), self.fan_config_list)
         )
         # self.fan_config_list = [
         #     config

py_modules/fan_config/hwmon/gpdfan.yml

@@ -5,9 +5,12 @@ fans:
   - fan_name: Fan
     pwm_mode: 0
     black_list:
-      - G1618-04
       - G1618-05
       # - G1617-01
+    black_list_rules:
+      - product_name: G1618-04
+        product_version:
+          - Version 1.0
 
     pwm_enable:
       manual_value: 1

py_modules/fan_config/schema/hwmon.json

@@ -43,6 +43,13 @@
           },
           "description": "黑名单, 匹配 /sys/devices/virtual/dmi/id/product_name. 不使用该配置"
         },
+        "black_list_rules": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/BlackListRule"
+          },
+          "description": "黑名单规则, 支持 product_name 和 product_version 的组合匹配"
+        },
         "temp_mode": {
           "type": "number",
           "enum": [0, 1],
@@ -185,6 +192,47 @@
         }
       },
       "required": ["temp_write", "pwm_write"]
+    },
+    "BlackListRule": {
+      "title": "BlackListRule",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "product_name": {
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          ],
+          "description": "匹配 /sys/devices/virtual/dmi/id/product_name"
+        },
+        "product_version": {
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          ],
+          "description": "匹配 /sys/devices/virtual/dmi/id/product_version"
+        },
+        "match": {
+          "type": "string",
+          "enum": ["exact", "contains", "regex"],
+          "description": "匹配方式, 默认 exact"
+        }
+      },
+      "required": []
     }
   }
 }