Change flake8 max-complexity from 7 to 6

Author: 5yutan5

pyproject.toml

@@ -82,7 +82,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.flake8]
 max-line-length = 104
-max-complexity = 7
+max-complexity = 6
 docstring-convention = "google"
 per-file-ignores = ["**/__init__.py:F401", "examples/**:D103"]
 

qdarktheme/_filter.py

@@ -37,6 +37,16 @@ def _svg_resources() -> dict[str, str]:
     return json.loads(_resources.SVG_RESOURCES)
 
 
+def _transform(color: Color, color_state: dict[str, float]) -> Color:
+    if color_state.get("transparent"):
+        color = color.transparent(color_state["transparent"])
+    if color_state.get("darken"):
+        color = color.darken(color_state["darken"])
+    if color_state.get("lighten"):
+        return color.lighten(color_state["lighten"])
+    return color
+
+
 def color(color_info: str | dict[str, str | dict], state: str | None = None) -> Color:
     """Filter for template engine. This filter convert color info data to color object."""
     if isinstance(color_info, str):
@@ -48,17 +58,8 @@ def color(color_info: str | dict[str, str | dict], state: str | None = None) ->
     if state is None:
         return color
 
-    color_state = color_info[state]
-    if isinstance(color_state, str):
-        return Color.from_hex(color_state)
-
-    if color_state.get("transparent"):
-        color = color.transparent(color_state["transparent"])
-    if color_state.get("darken"):
-        color = color.darken(color_state["darken"])
-    if color_state.get("lighten"):
-        return color.lighten(color_state["lighten"])
-    return color
+    transforms = color_info[state]
+    return Color.from_hex(transforms) if isinstance(transforms, str) else _transform(color, transforms)
 
 
 def svg_format(color: Color) -> str:

qdarktheme/_style_loader.py

@@ -48,19 +48,17 @@ def _marge_colors(
 ):
     for color_id, color in _mix_theme_colors(custom_colors, theme).items():
         try:
-            parent_key, *child_key = color_id.split(">")
+            parent_key, *child_keys = color_id.split(">")
             color_value = color_values[parent_key]
-            if len(child_key) == 0:
-                if isinstance(color_value, dict):
-                    color_value["base"] = color
-                else:
-                    color_values[parent_key] = color
-            elif len(child_key) == 1 and isinstance(color_value, dict):
-                # Check if child_key exists.
-                color_value[child_key[0]]
-                color_value[child_key[0]] = color
-            else:
+            if len(child_keys) > 1 or (isinstance(color_value, str) and len(child_keys) != 0):
                 raise KeyError
+
+            if isinstance(color_value, str):
+                color_values[parent_key] = color
+            else:
+                child_key = "base" if len(child_keys) == 0 else child_keys[0]
+                color_value[child_key]  # Check if child_key exists.
+                color_value[child_key] = color
         except KeyError:
             raise KeyError(f'invalid color id for argument custom_colors: "{color_id}".') from None