switch to ruff

fdev31 · fdev31 · commit c27644d7730b · 2024-05-15T00:36:48.000+02:00
diff --git a/.pre-commit-config.yaml b/.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
diff --git a/pyproject.toml b/pyproject.toml
@@ -26,3 +26,36 @@ 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"]
+ignore = ["E203", "D107", "D105"]
+select = [
+    # pycodestyle
+    "E",
+    "D",
+    # Pyflakes
+    "F",
+    # pyupgrade
+    "UP",
+    # flake8-bugbear
+    "B",
+    # flake8-simplify
+    "SIM",
+    # isort
+    "I",
+    "W"
+]
+[tool.ruff.format]
+indent-style = "space"
+line-ending = "auto"
+
+[tool.ruff.lint.pydocstyle]
+convention = "google"
diff --git a/src/wlr_layout_ui/__init__.py b/src/wlr_layout_ui/__init__.py
@@ -24,7 +24,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][0] == "-":
             load()
@@ -41,7 +41,7 @@ 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)
             load()
             p_by_id = {p["uid"]: p for p in profile}
@@ -67,35 +67,13 @@ def main():
                 print("Failed applying the layout")
         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
diff --git a/src/wlr_layout_ui/displaywidget.py b/src/wlr_layout_ui/displaywidget.py
@@ -18,7 +18,7 @@ def limit_size(text):
 
 class GuiScreen(Widget):
     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__
 
diff --git a/src/wlr_layout_ui/factories.py b/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)
diff --git a/src/wlr_layout_ui/gui.py b/src/wlr_layout_ui/gui.py
@@ -7,15 +7,7 @@
 from .displaywidget import GuiScreen
 from .profiles import load_profiles, save_profile
 from .screens import displayInfo, load
-from .settings import (
-    ALLOW_DESELECT,
-    FONT,
-    LEGACY,
-    PROG_NAME,
-    UI_RATIO,
-    WINDOW_MARGIN,
-    reload_pre_commands,
-)
+from .settings import ALLOW_DESELECT, FONT, LEGACY, PROG_NAME, UI_RATIO, WINDOW_MARGIN, reload_pre_commands
 from .utils import (
     Rect,
     compute_bounding_box,
@@ -42,11 +34,12 @@ def get_closest_match(float_list, value):
 
 
 def get_size(screen, scale=0):
-    "Get the size of the window based on the screen size and UI_RATIO"
+    """Get the size of the window based on the screen size and UI_RATIO."""
     if not scale:
         scale = UI_RATIO
-    w, h = ((screen.mode.width / scale) / screen.scale), (
-        (screen.mode.height / scale) / screen.scale
+    w, h = (
+        ((screen.mode.width / scale) / screen.scale),
+        ((screen.mode.height / scale) / screen.scale),
     )
     if screen.transform in (1, 3, 5, 7):
         return (h, w)
@@ -63,9 +56,7 @@ def __init__(self, width, height):
         self.text_input: str | None = None
         self.error_message = ""
         self.error_message_duration = 0
-        self.require_selected_item: set[Widget] = (
-            set()
-        )  # Items that can't be displayed without a selection
+        self.require_selected_item: set[Widget] = set()  # Items that can't be displayed without a selection
 
         but_w = 120
         but_h = 28
@@ -217,7 +208,7 @@ def __init__(self, width, height):
         self.set_current_modes_as_ref()
 
     def set_current_modes_as_ref(self):
-        "Set original cmd to allow reverting the selected mode"
+        """Set original cmd to allow reverting the selected mode."""
         self.original_cmd = make_command(
             [s.screen for s in self.gui_screens],
             [s.rect.scaled(UI_RATIO) for s in self.gui_screens],
@@ -234,9 +225,7 @@ def set_error(self, message, duration=200):
 
     def sync_profiles(self):
         self.profiles = load_profiles()
-        self.profile_list.options = [
-            {"name": k, "value": v} for k, v in self.profiles.items()
-        ]
+        self.profile_list.options = [{"name": k, "value": v} for k, v in self.profiles.items()]
 
     def set_text_input(self, action):
         self.validate_text_input = action
@@ -255,10 +244,7 @@ def load_screens(self):
             max_width = max(m.width for m in screen.available)
             max_height = max(m.height for m in screen.available)
 
-            is_rotated = screen.transform in (1, 3, 5, 7)
-
             if screen.mode:
-
                 w, h = get_size(screen)
                 rect = Rect(
                     int(x / UI_RATIO),
@@ -299,9 +285,7 @@ def center_layout(self, immediate=False):
         offY = (win_res[1] // 2) - avg_y
         for screen in self.gui_screens:
             if immediate:
-                screen.set_position(
-                    screen.target_rect.x + offX, screen.target_rect.y + offY
-                )
+                screen.set_position(screen.target_rect.x + offX, screen.target_rect.y + offY)
             else:
                 screen.target_rect.x = screen.target_rect.x + offX
                 screen.target_rect.y = screen.target_rect.y + offY
@@ -358,10 +342,7 @@ def distance(point1: tuple[int, int], point2: tuple[int, int]):
                 closest_match = None
                 for coord in active_screen_coords:
                     for other_screen_coord in other_screen_coords:
-                        if (
-                            min_distance is None
-                            or distance(coord, other_screen_coord) < min_distance
-                        ):
+                        if min_distance is None or distance(coord, other_screen_coord) < min_distance:
                             min_distance = distance(coord, other_screen_coord)
                             closest_match = other_screen_coord, coord
                 assert closest_match is not None
@@ -443,9 +424,7 @@ def on_mouse_drag(self, x, y, dx, dy, buttons, modifiers):
         self.cursor_coords = (x, y)
 
         if self.selected_item and self.selected_item.dragging:
-            self.selected_item.set_position(
-                self.selected_item.rect.x + dx, self.selected_item.rect.y + dy
-            )
+            self.selected_item.set_position(self.selected_item.rect.x + dx, self.selected_item.rect.y + dy)
 
     def on_resize(self, width, height):
         pyglet.window.Window.on_resize(self, width, height)
@@ -505,10 +484,8 @@ def draw_countdown(self):
             lbl2.draw()
 
     def draw_text_input(self):
-        w, h = self.get_size()
-        pyglet.text.Label(
-            "Profile name: ", font_size=24, x=10, y=h // 2 + 40, align="left"
-        ).draw()
+        _w, h = self.get_size()
+        pyglet.text.Label("Profile name: ", font_size=24, x=10, y=h // 2 + 40, align="left").draw()
         text = self.text_input
         if int(time.time() * 1.5) % 2:
             text += "_"
@@ -538,9 +515,7 @@ def draw_screens_and_widgets(self):
     def on_draw(self):
         self.clear()
         # Draw a grey background
-        pyglet.shapes.Rectangle(
-            0, 0, self.width, self.height, color=(50, 50, 50, 255)
-        ).draw()
+        pyglet.shapes.Rectangle(0, 0, self.width, self.height, color=(50, 50, 50, 255)).draw()
 
         # Higher priority modes
         if self.text_input is not None:
@@ -587,26 +562,22 @@ def action_reload(self):
         self.center_layout(immediate=True)
 
     def get_profile_data(self):
-        screens_rect = [
-            screen.target_rect.scaled(UI_RATIO) for screen in self.gui_screens
-        ]
+        screens_rect = [screen.target_rect.scaled(UI_RATIO) for screen in self.gui_screens]
         trim_rects_flip_y(screens_rect)
         ret = []
         for rect, gs in zip(screens_rect, self.gui_screens):
             assert gs.screen.mode
-            ret.append(
-                {
-                    "active": gs.screen.active,
-                    "width": gs.screen.mode.width,
-                    "height": gs.screen.mode.height,
-                    "freq": gs.screen.mode.freq,
-                    "x": rect.x,
-                    "y": rect.y,
-                    "uid": gs.screen.uid,
-                    "scale": gs.screen.scale,
-                    "transform": gs.screen.transform,
-                }
-            )
+            ret.append({
+                "active": gs.screen.active,
+                "width": gs.screen.mode.width,
+                "height": gs.screen.mode.height,
+                "freq": gs.screen.mode.freq,
+                "x": rect.x,
+                "y": rect.y,
+                "uid": gs.screen.uid,
+                "scale": gs.screen.scale,
+                "transform": gs.screen.transform,
+            })
         return ret
 
     def action_save_new_profile(self):
@@ -617,9 +588,7 @@ def action_save_new_profile(self):
 
     def action_save_profile(self):
         if self.profile_list.options:
-            save_profile(
-                self.profile_list.get_selected_option()["name"], self.get_profile_data()
-            )
+            save_profile(self.profile_list.get_selected_option()["name"], self.get_profile_data())
             self.sync_profiles()
         else:
             self.set_error("No profile selected!")
@@ -660,10 +629,7 @@ def action_update_scale(self):
         monitor.target_rect.width, monitor.target_rect.height = get_size(monitor.screen)
 
     def action_update_frequencies(self, screen, mode=None):
-        if mode is None:
-            cur_mode = screen.screen.mode.width, screen.screen.mode.height
-        else:
-            cur_mode = mode
+        cur_mode = (screen.screen.mode.width, screen.screen.mode.height) if mode is None else mode
         freqs = sorted_frequencies(screen.screen.available, cur_mode[0], cur_mode[1])
         self.freqs.options = [{"name": f"{r:.2f} Hz", "value": r} for r in freqs]
         if mode is None:
@@ -688,12 +654,10 @@ def action_toggle_screen_power(self):
             self.selected_item.screen.active = not self.selected_item.screen.active
 
     def action_update_rotation(self):
-        "Update the rotation of the selected screen"
+        """Update the rotation of the selected screen."""
         assert self.selected_item
         self.selected_item.screen.transform = self.rotation.get_value()
-        self.selected_item.target_rect.width, self.selected_item.target_rect.height = (
-            get_size(self.selected_item.screen)
-        )
+        self.selected_item.target_rect.width, self.selected_item.target_rect.height = get_size(self.selected_item.screen)
 
     def action_update_screen_spec(self):
         self.action_update_frequencies(self.selected_item, self.resolutions.get_value())
@@ -703,9 +667,7 @@ def action_update_screen_spec(self):
     def action_update_mode(self):
         assert self.selected_item
         screen = self.selected_item.screen
-        screen.mode = find_matching_mode(
-            screen.available, self.resolutions.get_value(), self.freqs.get_value()
-        )
+        screen.mode = find_matching_mode(screen.available, self.resolutions.get_value(), self.freqs.get_value())
         self.selected_item.target_rect.width = screen.mode.width // UI_RATIO
         self.selected_item.target_rect.height = screen.mode.height // UI_RATIO
 
@@ -719,14 +681,10 @@ def action_select_screen(self, screen):
         cur_mode = screen.screen.mode
         # Update resolution
         res = sorted_resolutions(screen.screen.available)
-        self.resolutions.options = [
-            {"name": f"{r[0]} x {r[1]}", "value": r} for r in res
-        ]
+        self.resolutions.options = [{"name": f"{r[0]} x {r[1]}", "value": r} for r in res]
         self.rotation.selected_index = screen.screen.transform
         values = [o["value"] for o in self.scale_ratio.options]
-        self.scale_ratio.selected_index = values.index(
-            get_closest_match(values, screen.screen.scale)
-        )
+        self.scale_ratio.selected_index = values.index(get_closest_match(values, screen.screen.scale))
         i = -1
         for i, r in enumerate(res):
             if r[0] == cur_mode.width and r[1] == cur_mode.height:
diff --git a/src/wlr_layout_ui/screens.py b/src/wlr_layout_ui/screens.py
diff --git a/src/wlr_layout_ui/utils.py b/src/wlr_layout_ui/utils.py
diff --git a/src/wlr_layout_ui/widgets.py b/src/wlr_layout_ui/widgets.py
