Refactoring

.github/actions/setup-python-uv/action.yaml

@@ -6,9 +6,9 @@ runs:
   steps:
 
     - name: install uv
-      uses: astral-sh/setup-uv@v3
+      uses: astral-sh/setup-uv@v7
       with:
-        version: "0.4.30"
+        version: "0.9.5"
         enable-cache: true
 
     - uses: actions/setup-python@v6

.github/workflows/cicd.yaml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, macos-14, macos-15, windows-2022, windows-2025, ubuntu-22.04, ubuntu-24.04]
+        os: [macos-14, macos-15, windows-2022, windows-2025, ubuntu-22.04, ubuntu-24.04]
     steps:
       # Setup environment
       - uses: actions/checkout@v5.0.0
@@ -118,7 +118,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, macos-15, windows-2025, ubuntu-24.04]
+        os: [macos-14, macos-15, windows-2025, ubuntu-24.04]
     steps:
       - uses: actions/checkout@v5.0.0
 
@@ -162,7 +162,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, macos-15, windows-2025, ubuntu-24.04]
+        os: [macos-14, macos-15, windows-2025, ubuntu-24.04]
     steps:
       - uses: actions/checkout@v5.0.0
 
@@ -222,14 +222,14 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v5.0.0
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3.30.5
+        uses: github/codeql-action/init@v4.31.0
         with:
           languages: ${{ matrix.language }}
           queries: security-extended
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v3.30.5
+        uses: github/codeql-action/autobuild@v4.31.0
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.30.5
+        uses: github/codeql-action/analyze@v4.31.0
 
   deploy-briefcase:
     name: Briefcase build & draft release
@@ -245,7 +245,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, macos-15, windows-2025, ubuntu-24.04]
+        os: [macos-14, macos-15, windows-2025, ubuntu-24.04]
     steps:
       - uses: actions/checkout@v5.0.0
 

.gitignore

@@ -2,6 +2,7 @@
 # Edit at https://www.gitignore.io/?templates=python
 
 # Own
+*.xdot
 .virtualenvs/
 .vscode/
 .ruff_cache/

.pre-commit-config.yaml

@@ -2,12 +2,12 @@ fail_fast: true
 
 repos:
   - repo: https://github.com/compilerla/conventional-pre-commit
-    rev: v2.4.0
+    rev: v4.3.0
     hooks:
       - id: conventional-pre-commit
         stages: [commit-msg]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-ast
       #- id: check-yaml

CHANGELOG

@@ -2,16 +2,18 @@
 
 # Changelog
 
-## v0.6.1 (upcoming)
+## v0.7.0 (upcoming)
 
 **All systems:**
 - 🗲 Breaking: Drop support for Python 3.9.
+- Fix unresposive window when selecting larger screen regions.
 
 **Windows**:
 - Fix crash on `NormCap.exe --help`. ([#783](https://github.com/dynobo/normcap/issues/783))
 
 **Linux**:
-- Add notification actions for FlatPak package.
+- Add clickable desktop notifications in FlatPak package.
+- Add a new clipboard-handler `qt_wayland` to improve reliabilty of writing to clipboard on Wayland systems.
 
 ## v0.6.0 (2025-08-31)
 

README.md

@@ -88,6 +88,8 @@ sudo zypper install python3-devel tesseract-ocr tesseract-ocr-devel wl-clipboard
 # Install normcap
 pip install normcap
 
+#TODO: [HIGH] Describe service and desktop file setup
+
 # Run
 ./normcap
 ```

bundle/build.py

@@ -17,15 +17,16 @@
     )
     args = parser.parse_args()
 
-    if sys.platform == "win32":
-        WindowsBriefcase().create()
-        WindowsBriefcaseZip().create()
+    match sys.platform:
+        case "win32":
+            WindowsBriefcase().create()
+            WindowsBriefcaseZip().create()
 
-    elif sys.platform == "darwin":
-        MacBriefcase().create()
+        case "darwin":
+            MacBriefcase().create()
 
-    elif sys.platform == "linux":
-        LinuxBriefcase().create()
+        case "linux":
+            LinuxBriefcase().create()
 
-    else:
-        raise RuntimeError(f"Unknown platform '{sys.platform}'.")
+        case _:
+            raise RuntimeError(f"Unknown platform '{sys.platform}'.")

normcap/__init__.py

@@ -2,9 +2,18 @@
 
 from __future__ import annotations
 
+import os
 from importlib.metadata import PackageNotFoundError, version
 
 try:
     __version__ = version("normcap")
 except PackageNotFoundError:
     __version__ = "unknown"
+
+app_id = "com.github.dynobo.normcap"
+if os.environ.get("NORMCAP_DEV"):
+    # This alternative app id is meant for normcap developers only. It allows to
+    # setup two different NormCap versions (e.g. a stable one mand one for development)
+    # with different .desktop laucherns, which both can ask for permission to talk to
+    # DBus Portal.
+    app_id += "_dev"

normcap/app.py

@@ -1,121 +1,50 @@
 """Start main application logic."""
 
 import logging
-import os
-import signal
 import sys
-from argparse import Namespace
 from pathlib import Path
 from typing import NoReturn
 
-from PySide6 import QtCore, QtWidgets
+from PySide6 import QtWidgets
 
-from normcap import __version__, utils
-from normcap.gui import system_info
-from normcap.gui.tray import SystemTray
+from normcap import argparser, environment
+from normcap import logger_config as logger_
+from normcap.gui.application import NormcapApp
+from normcap.platform import system_info
 
+logger = logging.getLogger(__name__)
 
-def _get_args() -> Namespace:
-    """Parse command line arguments.
 
-    Exit if NormCap was started with --version flag.
+def _init_normcap() -> QtWidgets.QApplication:
+    """Prepares the application.
 
-    Auto-enable tray for "background mode", which starts NormCap in tray without
-    immediately opening the select-region window.
-    """
-    args = utils.create_argparser().parse_args()
-
-    if args.version:
-        print(f"NormCap {__version__}")  # noqa: T201
-        sys.exit(0)
-
-    if args.background_mode:
-        args.tray = True
-
-    return args
-
-
-def _prepare_logging(log_level: str, log_file: Path | None = None) -> None:
-    """Initialize the logger with the given log level.
-
-    This function wraps the QT logger to control the output in the Python logger.
-    For all log levels except DEBUG, an exception hook is used to improve the stack
-    trace output for bug reporting on Github.
-
-    Args:
-        log_level: Valid Python log level (debug, warning, error)
-        log_file: Target for saving log to file
-    """
-    sys.excepthook = utils.hook_exceptions
-
-    utils.init_logger(log_level=log_level.upper(), log_file=log_file)
-    logger = logging.getLogger("normcap")
-    logger.info("Start NormCap v%s", __version__)
-
-    # Wrap QT logging output
-    QtCore.qInstallMessageHandler(utils.qt_log_wrapper)
-
-
-def _prepare_envs() -> None:
-    """Prepare environment variables depending on setup and system.
-
-    Enable exiting via CTRL+C in Terminal.
-    """
-    # Allow closing QT app with CTRL+C in terminal
-    signal.signal(signal.SIGINT, signal.SIG_DFL)
-
-    # Silence opencv warnings
-    os.environ["OPENCV_LOG_LEVEL"] = "OFF"
-
-    if system_info.display_manager_is_wayland():
-        utils.set_environ_for_wayland()
-    if system_info.is_flatpak():
-        utils.set_environ_for_flatpak()
-    if system_info.is_appimage_package():
-        utils.set_environ_for_appimage()
-
-
-def _get_application() -> QtWidgets.QApplication:
-    """Get a QApplication instance that doesn't exit on window close."""
-    app = QtWidgets.QApplication.instance() or QtWidgets.QApplication([])
-    app.setQuitOnLastWindowClosed(False)
-    return app
-
-
-def _prepare() -> tuple[QtWidgets.QApplication, SystemTray]:
-    """Prepares the application and system tray without executing.
+    This does not call app.exec() to simplify testing.
 
     Returns:
-        A tuple containing the QApplication ready for execution
-            and the not yet visible SystemTray.
+        NormcapApp instance.
     """
-    args = _get_args()
+    args = argparser.get_args()
 
-    _prepare_logging(
+    logger_.prepare_logging(
         log_level=str(getattr(args, "verbosity", "ERROR")),
         log_file=getattr(args, "log_file", Path.cwd() / "normcap.log"),
     )
-    _prepare_envs()
+    environment.prepare()
 
-    if system_info.is_prebuilt_package():
+    if system_info.is_packaged():
         tessdata_path = system_info.get_tessdata_path(
             config_directory=system_info.config_directory(),
-            is_briefcase_package=system_info.is_briefcase_package(),
-            is_flatpak_package=system_info.is_flatpak(),
+            is_packaged=system_info.is_packaged(),
         )
-        utils.copy_traineddata_files(target_dir=tessdata_path)
-
-    app = _get_application()
-    tray = SystemTray(app, vars(args))
+        environment.copy_traineddata_files(target_dir=tessdata_path)
 
-    return app, tray
+    logger.debug("System info:\n%s", system_info.to_dict())
+    return NormcapApp(args=vars(args))
 
 
 def run() -> NoReturn:
     """Run the main application."""
-    app, tray = _prepare()
-    tray.show()
-    sys.exit(app.exec())
+    sys.exit(_init_normcap().exec())
 
 
 if __name__ == "__main__":