Switch to uv and ruff

Author: cdgriffith

.github/workflows/test.yaml

@@ -14,8 +14,8 @@ jobs:
       with:
         python-version: "3.12"
 
-    - run: pip install black==24.8.0
-    - run: python -m black --check .
+    - run: pip install ruff==0.12
+    - run: python -m ruff check
 
   test:
     runs-on: ubuntu-24.04

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
     - id: mixed-line-ending
     - id: trailing-whitespace
@@ -22,10 +22,16 @@ repos:
     - id: check-toml
     - id: detect-private-key
     - id: end-of-file-fixer
-  - repo: https://github.com/psf/black
-    rev: 24.8.0
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.12.1
     hooks:
-      - id: black
+      # Run the linter.
+      - id: ruff-check
+        args: [ --fix ]
+      # Run the formatter.
+      - id: ruff-format
+
 #  - repo: https://github.com/pre-commit/mirrors-mypy
 #    rev: 'v0.942'
 #    hooks:

fastflix/__main__.py

@@ -10,7 +10,7 @@ def start_fastflix():
     exit_code = 2
     portable_mode = True
     try:
-        from fastflix import portable
+        from fastflix import portable  # noqa: F401
     except ImportError:
         portable_mode = False
 

fastflix/application.py

@@ -246,7 +246,7 @@ def app_setup(
     try:
         ProgressBar(app, startup_tasks)
     except Exception:
-        logger.exception(f'{t("Could not start FastFlix")}!')
+        logger.exception(f"{t('Could not start FastFlix')}!")
         sys.exit(1)
 
     container = Container(app)

fastflix/encoders/av1_aom/command_builder.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import re
 import secrets
 
 from fastflix.encoders.common.helpers import Command, generate_all, generate_color_details, null
@@ -21,7 +20,7 @@ def build(fastflix: FastFlix):
     )
 
     if settings.row_mt.lower() == "enabled":
-        beginning += f"-row-mt 1 "
+        beginning += "-row-mt 1 "
 
     if settings.bitrate:
         pass_log_file = fastflix.current_video.work_path / f"pass_log_file_{secrets.token_hex(10)}"

fastflix/encoders/av1_aom/main.py

@@ -9,7 +9,7 @@
 video_extensions = [".mkv", ".mp4", ".ts", ".mov", ".webm", ".avi", ".mts", ".m2ts", ".m4v"]
 video_dimension_divisor = 8
 
-ref = importlib.resources.files("fastflix") / f"data/encoders/icon_av1_aom.png"
+ref = importlib.resources.files("fastflix") / "data/encoders/icon_av1_aom.png"
 with importlib.resources.as_file(ref) as icon_file:
     icon = str(icon_file.resolve())
 
@@ -18,5 +18,5 @@
 enable_attachments = True
 enable_concat = True
 
-from fastflix.encoders.av1_aom.command_builder import build
-from fastflix.encoders.av1_aom.settings_panel import AV1 as settings_panel
+from fastflix.encoders.av1_aom.command_builder import build  # noqa: F401,E402
+from fastflix.encoders.av1_aom.settings_panel import AV1 as settings_panel  # noqa: F401,E402

fastflix/encoders/avc_x264/command_builder.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import re
 import secrets
 
 from fastflix.encoders.common.helpers import Command, generate_all, generate_color_details, null
@@ -12,7 +11,7 @@ def build(fastflix: FastFlix):
 
     beginning, ending, output_fps = generate_all(fastflix, "libx264")
 
-    beginning += f'{f"-tune:v {settings.tune}" if settings.tune else ""} {generate_color_details(fastflix)} '
+    beginning += f"{f'-tune:v {settings.tune}' if settings.tune else ''} {generate_color_details(fastflix)} "
 
     if settings.profile and settings.profile != "default":
         beginning += f"-profile:v {settings.profile} "
@@ -38,7 +37,7 @@ def build(fastflix: FastFlix):
             return [Command(command=command, name="Single pass bitrate", exe="ffmpeg")]
 
     elif settings.crf:
-        command = f"{beginning} -crf:v {settings.crf} " f"-preset:v {settings.preset} {settings.extra} {ending}"
+        command = f"{beginning} -crf:v {settings.crf} -preset:v {settings.preset} {settings.extra} {ending}"
         return [Command(command=command, name="Single pass CRF", exe="ffmpeg")]
 
     else:

fastflix/encoders/avc_x264/main.py

@@ -9,7 +9,7 @@
 video_extensions = [".mkv", ".mp4", ".ts", ".mov", ".avi", ".mts", ".m2ts", ".m4v"]
 video_dimension_divisor = 1
 
-ref = importlib.resources.files("fastflix") / f"data/encoders/icon_x264.png"
+ref = importlib.resources.files("fastflix") / "data/encoders/icon_x264.png"
 with importlib.resources.as_file(ref) as icon_file:
     icon = str(icon_file.resolve())
 
@@ -18,5 +18,5 @@
 enable_attachments = True
 enable_concat = True
 
-from fastflix.encoders.avc_x264.command_builder import build
-from fastflix.encoders.avc_x264.settings_panel import AVC as settings_panel
+from fastflix.encoders.avc_x264.command_builder import build  # noqa: F401,E402
+from fastflix.encoders.avc_x264.settings_panel import AVC as settings_panel  # noqa: F401,E402

fastflix/encoders/common/helpers.py

@@ -50,7 +50,7 @@ def generate_ffmpeg_start(
     start_extra: str = "",
     **_,
 ) -> str:
-    time_settings = f'{f"-ss {start_time}" if start_time else ""} {f"-to {end_time}" if end_time else ""}'.strip()
+    time_settings = f"{f'-ss {start_time}' if start_time else ''} {f'-to {end_time}' if end_time else ''}".strip()
     time_one = time_settings if fast_seek else ""
     time_two = time_settings if not fast_seek else ""
     incoming_fps = f"-r {source_fps}" if source_fps else ""
@@ -232,7 +232,7 @@ def generate_filters(
                 f"format=p010,hwupload,tonemap_opencl=tonemap={tone_map}:desat=0:r=tv:p=bt709:t=bt709:m=bt709:format=nv12,hwdownload,format=nv12"
             )
         elif vaapi:
-            filter_list.append(f"tonemap_vaapi=format=nv12:p=bt709:t=bt709:m=bt709")
+            filter_list.append("tonemap_vaapi=format=nv12:p=bt709:t=bt709:m=bt709")
         else:
             filter_list.append(
                 f"zscale=t=linear:npl=100,format=gbrpf32le,zscale=p=bt709,tonemap=tonemap={tone_map}:desat=0,zscale=t=bt709:m=bt709:r=tv,format=yuv420p"

fastflix/encoders/common/setting_panel.py

@@ -269,7 +269,7 @@ def _add_custom(self, title="Custom ffmpeg options", connect="default", disable_
         if connect and connect != "default":
             self.ffmpeg_extras_widget.disconnect()
             if connect == "self":
-                connect = lambda: self.page_update()
+                connect = lambda: self.page_update()  # noqa: E731
             self.ffmpeg_extras_widget.textChanged.connect(connect)
             self.widgets["extra_both_passes"].toggled.connect(connect)
         else: