Merge branch 'fdev31:main' into main

Author: levnikmyskin

.pre-commit-config.yaml

@@ -13,10 +13,6 @@ repos:
     hooks:
       - id: prettier
         exclude: "main.*"
-  - repo: https://github.com/ambv/black
-    rev: "23.3.0"
-    hooks:
-      - id: black
   - repo: https://github.com/lovesegfault/beautysh
     rev: "v6.2.1"
     hooks:
@@ -25,3 +21,17 @@ repos:
     rev: "v1.30.0"
     hooks:
       - id: yamllint
+  - repo: https://github.com/PyCQA/flake8
+    rev: 7.0.0
+    hooks:
+      - id: flake8
+        args: [--max-line-length=140]
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: "v0.4.4"
+    hooks:
+      # Run the linter.
+      - id: ruff
+        args: [--fix]
+      # Run the formatter.
+      - id: ruff-format

pyproject.toml

@@ -26,3 +26,85 @@ black = "^23.3.0"
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
+
+[tool.ruff]
+line-length = 140
+preview = true
+
+exclude = ["*_v?.py", "tests", "scripts", "sample_extension", ".git"]
+
+
+[tool.ruff.lint]
+fixable = ["ALL"]
+select = [
+    # pycodestyle
+    "E", # error
+    "W", # warn
+    # builtins
+    "A",
+    # bugbear
+    "B",
+    # comprehensions
+    "C",
+    # err msg
+    "EM",
+    # str concat
+    "ISC",
+    # import conventions
+    "ICN",
+    # flake8 log
+    "G",
+    "LOG",
+    # pep8 naming
+    "D",
+    # pydocstyle
+    "D",
+    # mccabe
+    "C",
+    # Pyflakes
+    "F",
+    # pyupgrade
+    "UP",
+    # flake8-bugbear
+    "B",
+    # flake8-simplify
+    "SIM",
+    # isort
+    "I",
+    # flake-2020
+    "YTT",
+    # flake-annotations
+    "ANN",
+    # flake-async
+    "ASYNC",
+    # flake-blind-except
+    "BLE",
+    # flake-boolean-trap
+    "FBT",
+    # pytest
+    "PT",
+    # self
+    "SLF",
+    # tidy-imports
+    "TID",
+    # type checking
+    "TCH",
+    # unused arg
+    "ARG",
+    # pathlib
+    "PTH",
+    # pylint
+    "PL",
+    # perflnt
+    "PERF",
+    # ruf
+    "RUF",
+]
+ignore = ["ANN201", "ANN001", "ANN002", "ANN202", "ARG002", "PLR", "C", "FBT002", "D107", "ANN204", "D"]
+
+[tool.ruff.format]
+indent-style = "space"
+line-ending = "auto"
+
+[tool.ruff.lint.pydocstyle]
+convention = "google"

src/wlr_layout_ui/__init__.py

@@ -49,7 +49,7 @@ def main():
         profiles = load_profiles()
         if sys.argv[1] == "-l":
             print("")
-            for p in profiles.keys():
+            for p in profiles:
                 print(f" - {p}")
         elif sys.argv[1] == "-m":
             load()
@@ -80,40 +80,18 @@ def main():
             try:
                 profile = profiles[sys.argv[1]]
             except KeyError:
-                print("No such profile: %s" % sys.argv[1])
+                print(f"No such profile: {sys.argv[1]}")
                 raise SystemExit(1)
             apply_profile(profile)
         sys.exit(0)
     load()
-    max_width = int(
-        sum(
-            max(screen.available, key=lambda mode: mode.width).width
-            for screen in displayInfo
-        )
-        // UI_RATIO
-    )
-    max_height = int(
-        sum(
-            max(screen.available, key=lambda mode: mode.height).height
-            for screen in displayInfo
-        )
-        // UI_RATIO
-    )
+    max_width = int(sum(max(screen.available, key=lambda mode: mode.width).width for screen in displayInfo) // UI_RATIO)
+    max_height = int(sum(max(screen.available, key=lambda mode: mode.height).height for screen in displayInfo) // UI_RATIO)
     average_width = int(
-        sum(
-            max(screen.available, key=lambda mode: mode.width).width
-            for screen in displayInfo
-        )
-        / len(displayInfo)
-        // UI_RATIO
+        sum(max(screen.available, key=lambda mode: mode.width).width for screen in displayInfo) / len(displayInfo) // UI_RATIO
     )
     average_height = int(
-        sum(
-            max(screen.available, key=lambda mode: mode.height).height
-            for screen in displayInfo
-        )
-        / len(displayInfo)
-        // UI_RATIO
+        sum(max(screen.available, key=lambda mode: mode.height).height for screen in displayInfo) / len(displayInfo) // UI_RATIO
     )
 
     width = max_width + average_width * 2

src/wlr_layout_ui/displaywidget.py

@@ -1,3 +1,5 @@
+"""Screen widgets for the display manager."""
+
 import random
 
 from pyglet.shapes import BorderedRectangle
@@ -11,14 +13,17 @@
 
 
 def limit_size(text):
+    """Limit the size of the text to 15 characters."""
     if len(text) > 15:
         return text[:12] + "..."
     return text
 
 
 class GuiScreen(Widget):
+    """A widget representing a screen."""
+
     def __repr__(self):
-        return "<Screen %s (%s) - %s>" % (self.rect, self.color, self.screen.name)
+        return f"<Screen {self.rect} ({self.color}) - {self.screen.name}>"
 
     __str__ = __repr__
 
@@ -56,7 +61,7 @@ def genColor(self):
                 255,
             )
         else:
-            self.color = list(self.all_colors[self.cur_color]) + [255]
+            self.color = [*list(self.all_colors[self.cur_color]), 255]
             GuiScreen.cur_color += 1
         self.drag_color = list(self.color)
         self.drag_color[-1] = 200

src/wlr_layout_ui/factories.py

@@ -15,5 +15,7 @@ def makeRectangle(x, y, w, h, color):
 
 
 @cache
-def makeLabel(text, x, y, color=[0, 0, 0], **kw):
+def makeLabel(text, x, y, color=None, **kw):
+    if color is None:
+        color = [0, 0, 0]
     return Label(text, x=x, y=y, color=color, **kw)