diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c74fa15..065cacb 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -47,7 +47,7 @@ jobs: strategy: matrix: python-version: [3.9] - os: [ubuntu-latest, macos-12, windows-latest] + os: [ubuntu-22.04, macos-13, windows-latest] steps: - uses: actions/checkout@v4 @@ -70,7 +70,7 @@ jobs: - name: Install linux dependencies run: | - sudo apt-get update && sudo apt-get upgrade && sudo apt-get install pkg-config libicu-dev libqt5gui5 libfuse2 + sudo apt-get update && sudo apt-get upgrade && sudo apt-get install pkg-config libicu-dev libqt5gui5 libfuse2 desktop-file-utils if: runner.os == 'Linux' - name: Build and install PyPi packages diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml index 515bccf..9c58756 100644 --- a/.github/workflows/package.yaml +++ b/.github/workflows/package.yaml @@ -16,7 +16,7 @@ jobs: strategy: matrix: python-version: [3.9] - os: [ubuntu-latest, macos-12, windows-latest] + os: [ubuntu-22.04, macos-13, windows-latest] steps: - uses: actions/checkout@v4 @@ -39,7 +39,7 @@ jobs: - name: Install linux dependencies run: | - sudo apt-get update && sudo apt-get upgrade && sudo apt-get install pkg-config libicu-dev libqt5gui5 libfuse2 + sudo apt-get update && sudo apt-get upgrade && sudo apt-get install pkg-config libicu-dev libqt5gui5 libfuse2 desktop-file-utils if: runner.os == 'Linux' - name: Build, Install and Test PyPi packages diff --git a/build-tools/get_appimage.py b/build-tools/get_appimage.py index efc1021..ebf6f08 100644 --- a/build-tools/get_appimage.py +++ b/build-tools/get_appimage.py @@ -27,7 +27,7 @@ if opts.APPIMAGETOOL.exists(): raise SystemExit(0) urlretrieve( - "https://github.com/AppImage/AppImageKit/releases/latest/download/appimagetool-x86_64.AppImage", opts.APPIMAGETOOL + "https://github.com/AppImage/appimagetool/releases/latest/download/appimagetool-x86_64.AppImage", opts.APPIMAGETOOL ) os.chmod(opts.APPIMAGETOOL, 0o0700) diff --git a/comictaggerlib/ctsettings/plugin_finder.py b/comictaggerlib/ctsettings/plugin_finder.py index 70c3b3a..0d3ba6d 100644 --- a/comictaggerlib/ctsettings/plugin_finder.py +++ b/comictaggerlib/ctsettings/plugin_finder.py @@ -135,6 +135,8 @@ def _find_local_plugins(plugin_path: pathlib.Path) -> Generator[Plugin]: def find_plugins(plugin_folder: pathlib.Path) -> Plugins: """Discovers all plugins (but does not load them).""" ret: list[LoadedPlugin] = [] + if not plugin_folder.is_dir(): + return _classify_plugins(ret) zips = [x for x in plugin_folder.iterdir() if x.is_file() and x.suffix in (".zip", ".whl")]