Translated using Weblate (Cornish)

Currently translated at 100.0% (146 of 146 strings)

Co-authored-by: Flynn <cirilla@tuta.io>
Translate-URL: https://hosted.weblate.org/projects/cartridges/cartridges/kw/
Translation: Cartridges/Cartridges

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: [kra-mo]
+liberapay: kramo

.github/workflows/ci.yml

@@ -1,8 +1,9 @@
+name: CI
 on:
   push:
     branches: [main]
   pull_request:
-name: CI
+
 concurrency:
   group: release-${{ github.sha }}
 jobs:
@@ -10,24 +11,24 @@ jobs:
     name: Flatpak
     runs-on: ubuntu-latest
     container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-44
+      image: bilelmoussaoui/flatpak-github-actions:gnome-47
       options: --privileged
     steps:
-    - name: Checkout
-      uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v4
 
-    - name: Flatpak Builder
-      uses: flatpak/flatpak-github-actions/flatpak-builder@v6.1
-      with:
-        bundle: hu.kramo.Cartridges.Devel.flatpak
-        manifest-path: flatpak/hu.kramo.Cartridges.Devel.json
+      - name: Flatpak Builder
+        uses: flatpak/flatpak-github-actions/flatpak-builder@v6.5
+        with:
+          bundle: page.kramo.Cartridges.Devel.flatpak
+          manifest-path: build-aux/flatpak/page.kramo.Cartridges.Devel.json
 
   windows:
     name: Windows
     runs-on: windows-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup MSYS2
         uses: msys2/setup-msys2@v2
@@ -42,19 +43,57 @@ jobs:
           meson setup _build
           ninja -C _build install
           pacman --noconfirm -Rs mingw-w64-ucrt-x86_64-desktop-file-utils mingw-w64-ucrt-x86_64-meson git
-          find /ucrt64/share/locale/ -type f ! -name "*cartridges.mo" -delete
 
       - name: Test
         shell: msys2 {0}
         run: |
-          set +e  
+          set +e
           timeout 2 cartridges; [ "$?" -eq "124" ]
 
       - name: Inno Setup
-        run: iscc ".\_build\windows\Cartridges.iss"
+        run: iscc ".\_build\build-aux\windows\Cartridges.iss"
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Windows Installer
-          path: _build/windows/Output/Cartridges Setup.exe
+          path: _build/build-aux/windows/Output/Cartridges Windows.exe
+
+  macos:
+    name: macOS
+    runs-on: macos-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Homebrew
+        id: set-up-homebrew
+        uses: Homebrew/actions/setup-homebrew@master
+
+      - name: Install Dependencies
+        run: |
+          brew install meson pygobject3 libadwaita adwaita-icon-theme desktop-file-utils pyinstaller pillow
+          pip3 install --break-system-packages requests PyYAML
+
+      - name: Meson Build
+        run: |
+          meson setup _build -Dtiff_compression=jpeg
+          ninja install -C _build
+
+      - name: PyInstaller
+        env:
+          PYTHONPATH: /opt/homebrew/opt/homebrew/lib/python3.12/site-packages
+        run: |
+          cd build-aux/macos
+          pyinstaller ./cartridges.spec
+
+      - name: Zip
+        run: |
+          cd build-aux/macos/dist
+          zip -yr Cartridges\ macOS.zip Cartridges.app
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          path: build-aux/macos/dist/Cartridges macOS.zip
+          name: macOS Application

.github/workflows/publish-release.yml

@@ -1,20 +1,21 @@
+name: Publish Release
 on:
   push:
-    tags:
-      "*"
-name: Publish Release
+    tags: "*"
+
 concurrency:
   group: release-${{ github.sha }}
+
 jobs:
   publish-release:
     name: Publish Release
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download workflow artifact
-        uses: dawidd6/action-download-artifact@v2.27.0
+        uses: dawidd6/action-download-artifact@v9
         with:
           workflow: ci.yml
           commit: ${{ github.sha }}
@@ -23,7 +24,7 @@ jobs:
         shell: python
         run: |
           import re, textwrap
-          open_file = open("./data/hu.kramo.Cartridges.metainfo.xml.in", "r", encoding="utf-8")
+          open_file = open("./data/page.kramo.Cartridges.metainfo.xml.in", "r", encoding="utf-8")
           string = open_file.read()
           open_file.close()
           string = re.findall("<release.*>\s*<description.*>\n([\s\S]*?)\s*</description>\s*<\/release>", string)[0]
@@ -37,9 +38,11 @@ jobs:
         run: echo tag_name=${GITHUB_REF#refs/tags/} >> $GITHUB_OUTPUT
 
       - name: Publish release
-        uses: softprops/action-gh-release@v0.1.15
+        uses: softprops/action-gh-release@v2.2.2
         with:
-          files: Windows Installer/Cartridges Setup.exe
+          files: |
+            Windows Installer/Cartridges Windows.exe
+            macOS Application/Cartridges macOS.zip
           fail_on_unmatched_files: true
           tag_name: ${{ steps.get_tag_name.outputs.tag_name }}
-          body_path: release_notes
+          body_path: release_notes

.gitignore

@@ -1,4 +1,9 @@
+build-aux/flatpak/page.kramo.Cartridges.json
 /subprojects/blueprint-compiler
+/build-aux/macos/build
+/build-aux/macos/dist
 /.flatpak
 /.flatpak-builder
-/.vscode
+/.vscode
+.DS_Store
+.prettierignore

.pylintrc

@@ -2,8 +2,8 @@
 
 ignore=importers
 
-[MESSAGES CONTROL]
 
+[MESSAGES CONTROL]
 
 disable=raw-checker-failed,
         bad-inline-option,

CODE_OF_CONDUCT.md

@@ -1,3 +1,3 @@
-The project follows the [GNOME Code of Conduct](https://wiki.gnome.org/Foundation/CodeOfConduct).
+The project follows the [GNOME Code of Conduct](https://conduct.gnome.org/).
 
-If you believe that someone is violating the Code of Conduct, or have any other concerns, please contact us via [cartridges-community@kramo.hu](mailto:cartridges-community@kramo.hu).
+If you believe that someone is violating the Code of Conduct, or have any other concerns, please contact us via [cartridges-community@kramo.page](mailto:cartridges-community@kramo.page).

CONTRIBUTING.md

@@ -5,10 +5,10 @@
 Be sure to follow the [code style](#code-style) of the project.
 
 ### Adding a feature
-[Create an issue](https://github.com/kra-mo/cartridges/issues/new) or join the [Discord](https://discord.gg/4KSFh3AmQR)/[Matrix](https://matrix.to/#/#cartridges:matrix.org) to discuss it with the maintainers. We will provide additional guidance.
+[Create an issue](https://git.kramo.page/cartridges/issues/new) or join the [Discord](https://discord.gg/yrJfddyt56) to discuss it with the maintainers. We will provide additional guidance.
 
 ### Fixing a bug
-Fork the repository, make your changes, then create a pull request. Be sure to mention the GitHub issue you're fixing if one was already open.
+Fork the repository, make your changes, then create a pull request. Be sure to mention the issue you're fixing if one was already open.
 
 ## Translations
 ### Weblate
@@ -25,7 +25,7 @@ The project can be translated on [Weblate](https://hosted.weblate.org/engage/car
 
 ## GNOME Builder
 1. Install [GNOME Builder](https://flathub.org/apps/org.gnome.Builder).
-2. Click "Clone Repository" with `https://github.com/kra-mo/cartridges.git` as the URL.
+2. Click "Clone Repository" with `https://git.kramo.page/cartridges.git` as the URL.
 3. Click on the build button (hammer) at the top.
 
 ## For Windows
@@ -33,9 +33,14 @@ The project can be translated on [Weblate](https://hosted.weblate.org/engage/car
 2. From the MSYS2 shell, install the required dependencies listed [here](https://github.com/kra-mo/cartridges/blob/main/.github/workflows/ci.yml).
 3. Build it via Meson.
 
+## For macOS
+1. Install [Homebrew](https://brew.sh/).
+2. Using `brew` and `pip3`, install the required dependencies listed [here](https://github.com/kra-mo/cartridges/blob/main/.github/workflows/ci.yml).
+3. Build it via Meson.
+
 ## Meson
 ```bash
-git clone https://github.com/kra-mo/cartridges.git
+git clone https://git.kramo.page/cartridges.git
 cd cartridges
 meson setup build
 ninja -C build install
@@ -59,4 +64,4 @@ VSCode extensions are available for all of these and you can set them up with th
 "isort.args":["--profile", "black"],
 ```
 
-For other code editors, you can install them via `pip` and invoke them via the command line.
+For other code editors, you can install them via `pip` and invoke them from the command line.

README.md

@@ -1,18 +1,19 @@
-
 [circle-url]: https://circle.gnome.org
 [circle-image]: https://circle.gnome.org/assets/button/badge.svg
 [weblate-url]: https://hosted.weblate.org/engage/cartridges/
 [weblate-image]: https://hosted.weblate.org/widgets/cartridges/-/cartridges/svg-badge.svg
-[discord-url]: https://discord.gg/4KSFh3AmQR
+[discord-url]: https://discord.gg/yrJfddyt56
 [discord-image]: https://img.shields.io/discord/1088155799299313754?color=%235865F2&label=discord&logo=discord&logoColor=%23FFFFFF&style=for-the-badge
-[matrix-url]: https://matrix.to/#/#cartridges:matrix.org
-[matrix-image]: https://img.shields.io/matrix/cartridges:matrix.org?label=Matrix&logo=matrix&color=%230dbd8b&style=for-the-badge
-[flathub-url]: https://flathub.org/apps/hu.kramo.Cartridges
-[flathub-image]: https://img.shields.io/flathub/v/hu.kramo.Cartridges?logo=flathub&style=for-the-badge
-[installs-image]: https://img.shields.io/flathub/downloads/hu.kramo.Cartridges?style=for-the-badge
+[flathub-url]: https://flathub.org/apps/page.kramo.Cartridges
+[flathub-image]: https://img.shields.io/flathub/v/page.kramo.Cartridges?logo=flathub&style=for-the-badge
+[installs-image]: https://img.shields.io/flathub/downloads/page.kramo.Cartridges?style=for-the-badge
+
+> [!IMPORTANT]
+> Please use [Codeberg](https://codeberg.org/kramo/cartridges) for issues and pull requests.
+> The GitHub repository is a [mirror](https://en.wikipedia.org/wiki/Mirror_site).
 
 <div align="center">
-  <img src="data/icons/hicolor/scalable/apps/hu.kramo.Cartridges.svg" width="128" height="128">
+  <img src="data/icons/hicolor/scalable/apps/page.kramo.Cartridges.svg" width="128" height="128">
 
   # Cartridges
 
@@ -23,7 +24,6 @@
 
   [![Flathub][flathub-image]][flathub-url]
   [![Discord][discord-image]][discord-url]
-  [![Matrix][matrix-image]][matrix-url]
   [![Installs][installs-image]][flathub-url]
 
   <img src="data/screenshots/1.png">
@@ -31,7 +31,7 @@
 
 # The Project
 
-Cartridges is a simple game launcher written in Python using GTK4 and Libadwaita.
+Cartridges is an easy-to-use, elegant game launcher written in Python using GTK4 and Libadwaita.
 
 ## Features
 
@@ -43,50 +43,66 @@ Cartridges is a simple game launcher written in Python using GTK4 and Libadwaita
   - Bottles
   - itch
   - Legendary
+  - RetroArch
   - Flatpak
-- Hiding games
+  - Desktop Entries
+- Filtering games by source
 - Searching and sorting by title, date added and last played
+- Hiding games
 - Automatically downloading cover art from [SteamGridDB](https://www.steamgriddb.com/)
 - Searching for games on various databases
 - Animated covers
+- A search provider for GNOME
 
-For updates and questions, join our [Discord server][discord-url] (bridged to [Matrix](https://matrix.to/#/#cartridges:matrix.org))!
+For updates and questions, join our [Discord server][discord-url]!
+
+## Donations
+I accept donations through [GitHub Sponsors](https://github.com/sponsors/kra-mo) and [Liberapay](https://liberapay.com/kramo).
+
+Thank you for your generosity! 💜
 
 # Installation
 
 ## Linux
 
-### Flathub
-
 The app is available on Flathub.
 
-<a href=https://flathub.org/apps/hu.kramo.Cartridges><img width='240' alt='Download on Flathub' src='https://dl.flathub.org/assets/badges/flathub-badge-en.png'/></a>
+<a href=https://flathub.org/apps/page.kramo.Cartridges><img alt='Download on Flathub' src='https://flathub.org/api/badge?svg&locale=en'/></a>
 
 ## Windows
 
 ### From Releases
 
-1. Download the latest release from [Releases](https://github.com/kra-mo/cartridges/releases).
+1. Download the latest release from [GitHub Releases](https://github.com/kra-mo/cartridges/releases).
 2. Run the downloaded installer.
 
 Note: Windows might present you with a warning when trying to install the app. This is expected, just ignore the warning.
 
 ### Winget
 
-Install the latest release with the command: `winget install cartridges`. 
+Install the latest release with the command: `winget install cartridges`.
+
+## macOS
+
+1. Download the latest release from [GitHub Releases](https://github.com/kra-mo/cartridges/releases).
+2. Move the app into your Applications folder.
+
+Note: macOS might tell you that the application could not be checked for malicious software or something similar. In this case, open System Settings > Privacy & Security, scroll down, find the warning about Cartridges and click "Open Anyway". More information can be found [here](https://support.apple.com/en-us/102445).
 
 ## Building manually
 
-See [Building](https://github.com/kra-mo/cartridges/blob/main/CONTRIBUTING.md#building).
+See [Building](https://codeberg.org/kramo/cartridges/src/branch/main/CONTRIBUTING.md#building).
 
 # Contributing
 
-See [CONTRIBUTING.md](https://github.com/kra-mo/cartridges/blob/main/CONTRIBUTING.md).
+See [CONTRIBUTING.md](https://codeberg.org/kramo/cartridges/src/branch/main/CONTRIBUTING.md).
 
 Thanks to [Weblate](https://weblate.org/) for hosting our translations!
 
 # Code of Conduct
 
-The project follows the [GNOME Code of Conduct](https://wiki.gnome.org/Foundation/CodeOfConduct).
+The project follows the [GNOME Code of Conduct](https://conduct.gnome.org/). 
 
-See [CODE_OF_CONDUCT.md](https://github.com/kra-mo/cartridges/blob/main/CODE_OF_CONDUCT.md).
+Cartridges' contributors stand with Palestine, Ukraine and all other victims of imperialism and war, and believe trans rights are human rights. If this bothers you, this is probably not the best project for you to contribute to.
+
+See [CODE_OF_CONDUCT.md](https://codeberg.org/kramo/cartridges/src/branch/main/CODE_OF_CONDUCT.md).

build-aux/flatpak/page.kramo.Cartridges.Devel.json

@@ -0,0 +1,122 @@
+{
+  "id": "page.kramo.Cartridges.Devel",
+  "runtime": "org.gnome.Platform",
+  "runtime-version": "49",
+  "sdk": "org.gnome.Sdk",
+  "command": "cartridges",
+  "finish-args": [
+    "--share=network",
+    "--share=ipc",
+    "--socket=fallback-x11",
+    "--device=dri",
+    "--socket=wayland",
+    "--talk-name=org.freedesktop.Flatpak",
+    "--filesystem=host",
+    "--filesystem=~/.var/app/com.valvesoftware.Steam/data/Steam/:ro",
+    "--filesystem=~/.var/app/net.lutris.Lutris/:ro",
+    "--filesystem=~/.var/app/com.heroicgameslauncher.hgl/config/heroic/:ro",
+    "--filesystem=~/.var/app/com.heroicgameslauncher.hgl/config/legendary/:ro",
+    "--filesystem=~/.var/app/com.usebottles.bottles/data/bottles/:ro",
+    "--filesystem=~/.var/app/io.itch.itch/config/itch/:ro",
+    "--filesystem=~/.var/app/org.libretro.RetroArch/config/retroarch/:ro",
+    "--filesystem=/var/lib/flatpak/app:ro",
+    "--filesystem=/var/lib/flatpak/exports:ro",
+    "--filesystem=xdg-data/flatpak/app:ro",
+    "--filesystem=xdg-data/flatpak/exports:ro"
+  ],
+  "cleanup": [
+    "/include",
+    "/lib/pkgconfig",
+    "/man",
+    "/share/doc",
+    "/share/gtk-doc",
+    "/share/man",
+    "/share/pkgconfig",
+    "*.la",
+    "*.a"
+  ],
+  "modules": [
+    {
+      "name": "python3-modules",
+      "buildsystem": "simple",
+      "build-commands": [],
+      "modules": [
+        {
+          "name": "python3-pyyaml",
+          "buildsystem": "simple",
+          "build-commands": [
+            "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"pyyaml\" --no-build-isolation"
+          ],
+          "sources": [
+            {
+              "type": "file",
+              "url": "https://files.pythonhosted.org/packages/54/ed/79a089b6be93607fa5cdaedf301d7dfb23af5f25c398d5ead2525b063e17/pyyaml-6.0.2.tar.gz",
+              "sha256": "d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e"
+            }
+          ]
+        },
+        {
+          "name": "python3-pillow",
+          "buildsystem": "simple",
+          "build-commands": [
+            "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"pillow\" --no-build-isolation"
+          ],
+          "sources": [
+            {
+              "type": "file",
+              "url": "https://files.pythonhosted.org/packages/f3/0d/d0d6dea55cd152ce3d6767bb38a8fc10e33796ba4ba210cbab9354b6d238/pillow-11.3.0.tar.gz",
+              "sha256": "3828ee7586cd0b2091b6209e5ad53e20d0649bbe87164a459d0676e035e8f523"
+            }
+          ]
+        },
+        {
+          "name": "python3-requests",
+          "buildsystem": "simple",
+          "build-commands": [
+            "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"requests\" --no-build-isolation"
+          ],
+          "sources": [
+            {
+              "type": "file",
+              "url": "https://files.pythonhosted.org/packages/e5/48/1549795ba7742c948d2ad169c1c8cdbae65bc450d6cd753d124b17c8cd32/certifi-2025.8.3-py3-none-any.whl",
+              "sha256": "f6c12493cfb1b06ba2ff328595af9350c65d6644968e5d3a2ffd78699af217a5"
+            },
+            {
+              "type": "file",
+              "url": "https://files.pythonhosted.org/packages/83/2d/5fd176ceb9b2fc619e63405525573493ca23441330fcdaee6bef9460e924/charset_normalizer-3.4.3.tar.gz",
+              "sha256": "6fce4b8500244f6fcb71465d4a4930d132ba9ab8e71a7859e6a5d59851068d14"
+            },
+            {
+              "type": "file",
+              "url": "https://files.pythonhosted.org/packages/76/c6/c88e154df9c4e1a2a66ccf0005a88dfb2650c1dffb6f5ce603dfbd452ce3/idna-3.10-py3-none-any.whl",
+              "sha256": "946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"
+            },
+            {
+              "type": "file",
+              "url": "https://files.pythonhosted.org/packages/1e/db/4254e3eabe8020b458f1a747140d32277ec7a271daf1d235b70dc0b4e6e3/requests-2.32.5-py3-none-any.whl",
+              "sha256": "2462f94637a34fd532264295e186976db0f5d453d1cdd31473c85a6a161affb6"
+            },
+            {
+              "type": "file",
+              "url": "https://files.pythonhosted.org/packages/a7/c2/fe1e52489ae3122415c51f387e221dd0773709bad6c6cdaa599e8a2c5185/urllib3-2.5.0-py3-none-any.whl",
+              "sha256": "e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "cartridges",
+      "builddir": true,
+      "buildsystem": "meson",
+      "run-tests": true,
+      "config-opts": ["-Dprofile=development"],
+      "sources": [
+        {
+          "type": "dir",
+          "path": "../.."
+        }
+      ]
+    }
+  ]
+}

build-aux/macos/cartridges.spec

@@ -0,0 +1,59 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+
+a = Analysis(
+    ["../../_build/cartridges/cartridges"],
+    pathex=[],
+    binaries=[],
+    datas=[("../../_build/data/cartridges.gresource", "Resources")],
+    hiddenimports=[],
+    hookspath=[],
+    hooksconfig={
+        "gi": {
+            "module-versions": {
+                "Gtk": "4.0",
+            },
+        },
+    },
+    runtime_hooks=[],
+    excludes=[],
+    noarchive=False,
+    optimize=0,
+)
+pyz = PYZ(a.pure)
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    [],
+    exclude_binaries=True,
+    name="Cartridges",
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=True,
+    console=False,
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+)
+coll = COLLECT(
+    exe,
+    a.binaries,
+    a.datas,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    name="Cartridges",
+)
+app = BUNDLE(
+    coll,
+    name="Cartridges.app",
+    icon="./icon.icns",
+    bundle_identifier="page.kramo.Cartridges",
+    info_plist={
+        "LSApplicationCategoryType": "public.app-category.games",
+    },
+)

build-aux/windows/Cartridges.iss.in

@@ -1,7 +1,7 @@
 #define MyAppName "Cartridges"
 #define MyAppVersion "@VERSION@"
 #define MyAppPublisher "kramo"
-#define MyAppURL "https://github.com/kra-mo/cartridges"
+#define MyAppURL "https://apps.gnome.org/Cartridges/"
 #define MyAppExeName "pythonw.exe"
 
 [Setup]
@@ -11,14 +11,14 @@ AppVersion={#MyAppVersion}
 AppVerName={#MyAppName} {#MyAppVersion}
 AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
-AppSupportURL=https://github.com/kra-mo/cartridges/issues
+AppSupportURL=https://git.kramo.page/cartridges/issues
 AppUpdatesURL={#MyAppURL}
 DefaultDirName={autopf64}\{#MyAppName}
 DisableProgramGroupPage=yes
-LicenseFile=..\..\LICENSE
+LicenseFile=..\..\..\LICENSE
 PrivilegesRequiredOverridesAllowed=dialog
-OutputBaseFilename=Cartridges Setup
-SetupIconFile=..\..\windows\icon.ico
+OutputBaseFilename=Cartridges Windows
+SetupIconFile=..\..\..\build-aux\windows\icon.ico
 Compression=lzma
 SolidCompression=yes
 WizardStyle=modern
@@ -40,17 +40,16 @@ Source: "D:\a\_temp\msys64\ucrt64\bin\*.dll"; DestDir: "{app}\bin"; Flags: recur
 
 Source: "D:\a\_temp\msys64\ucrt64\etc\ssl\*"; DestDir: "{app}\etc\ssl"; Flags: recursesubdirs ignoreversion
 
-Source: "D:\a\_temp\msys64\ucrt64\lib\gdk-pixbuf-2.0\*"; DestDir: "{app}\lib\gdk-pixbuf-2.0"; Flags: recursesubdirs ignoreversion   
-Source: "D:\a\_temp\msys64\ucrt64\lib\girepository-1.0\*"; DestDir: "{app}\lib\girepository-1.0"; Flags: recursesubdirs ignoreversion 
+Source: "D:\a\_temp\msys64\ucrt64\lib\gdk-pixbuf-2.0\*"; DestDir: "{app}\lib\gdk-pixbuf-2.0"; Flags: recursesubdirs ignoreversion
+Source: "D:\a\_temp\msys64\ucrt64\lib\girepository-1.0\*"; DestDir: "{app}\lib\girepository-1.0"; Flags: recursesubdirs ignoreversion
 Source: "D:\a\_temp\msys64\ucrt64\lib\python@PYTHON_VERSION@\*"; DestDir: "{app}\lib\python@PYTHON_VERSION@"; Excludes: "__pycache__"; Flags: recursesubdirs ignoreversion
 
 Source: "D:\a\_temp\msys64\ucrt64\share\cartridges\*"; DestDir: "{app}\share\cartridges"; Excludes: "__pycache__"; Flags: recursesubdirs ignoreversion
 Source: "D:\a\_temp\msys64\ucrt64\share\icons\*"; DestDir: "{app}\share\icons"; Excludes: "*.png,cursors\*"; Flags: recursesubdirs ignoreversion
 Source: "D:\a\_temp\msys64\ucrt64\share\glib-2.0\*"; DestDir: "{app}\share\glib-2.0"; Flags: recursesubdirs ignoreversion
 Source: "D:\a\_temp\msys64\ucrt64\share\gtk-4.0\*"; DestDir: "{app}\share\gtk-4.0"; Flags: recursesubdirs ignoreversion
-Source: "D:\a\_temp\msys64\ucrt64\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs ignoreversion
 
-Source: "..\..\windows\icon.ico"; DestDir: "{app}"; Flags: recursesubdirs ignoreversion
+Source: "..\..\..\build-aux\windows\icon.ico"; DestDir: "{app}"; Flags: recursesubdirs ignoreversion
 
 [Icons]
 Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\bin\{#MyAppExeName}"; Parameters: """{app}\bin\cartridges"""; IconFilename: "{app}\icon.ico"

build-aux/windows/meson.build

@@ -3,5 +3,5 @@ configure_file(
   output: 'Cartridges.iss',
   configuration: conf,
   install: true,
-  install_dir: '.'
-)
+  install_dir: '.',
+)

cartridges.doap

@@ -11,9 +11,9 @@
 Cartridges is a simple game launcher for all of your games. It has support for importing games from Steam, Lutris, Heroic and more with no login necessary. You can sort and hide games or download cover art from SteamGridDB.
   </description>
 
-  <homepage rdf:resource="https://github.com/kra-mo/cartridges" />
-  <download-page rdf:resource="https://github.com/kra-mo/cartridges" />
-  <bug-database rdf:resource="https://github.com/kra-mo/cartridges/issues" />
+  <homepage rdf:resource="https://git.kramo.page/cartridges" />
+  <download-page rdf:resource="https://git.kramo.page/cartridges" />
+  <bug-database rdf:resource="https://git.kramo.page/cartridges/issues" />
 
   <programming-language>Python</programming-language>
   <platform>GTK 4</platform>
@@ -22,7 +22,7 @@ Cartridges is a simple game launcher for all of your games. It has support for i
   <maintainer>
     <foaf:Person>
       <foaf:name>kramo</foaf:name>
-      <foaf:mbox rdf:resource="mailto:contact@kramo.hu" />
+      <foaf:mbox rdf:resource="mailto:contact@kramo.page" />
       <foaf:account>
         <foaf:OnlineAccount>
           <foaf:accountServiceHomepage rdf:resource="https://github.com"/>
@@ -37,23 +37,5 @@ Cartridges is a simple game launcher for all of your games. It has support for i
       </foaf:account>
     </foaf:Person>
   </maintainer>
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Geoffrey Coulaud</foaf:name>
-      <foaf:mbox rdf:resource="mailto:geoffrey.coulaud@gmail.com" />
-      <foaf:account>
-        <foaf:OnlineAccount>
-          <foaf:accountServiceHomepage rdf:resource="https://github.com"/>
-          <foaf:accountName>GeoffreyCoulaud</foaf:accountName>
-        </foaf:OnlineAccount>
-      </foaf:account>
-      <foaf:account>
-        <foaf:OnlineAccount>
-          <foaf:accountServiceHomepage rdf:resource="https://gitlab.gnome.org"/>
-          <foaf:accountName>GeoffreyCoulaud</foaf:accountName>
-        </foaf:OnlineAccount>
-      </foaf:account>
-    </foaf:Person>
-  </maintainer>
 
-</Project>
+</Project>

cartridges/cartridges.in

@@ -2,7 +2,7 @@
 
 # cartridges.in
 #
-# Copyright 2022-2023 kramo
+# Copyright 2022-2024 kramo
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,42 +19,44 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-import os
-import sys
-import signal
-import locale
 import gettext
+import locale
+import os
+import signal
+import sys
+from pathlib import Path
+from platform import system
 
 VERSION = "@VERSION@"
+
 if os.name == "nt":
-    from ctypes import windll
-
-    os.environ["LANGUAGE"] = locale.windows_locale[
-        windll.kernel32.GetUserDefaultUILanguage()
-    ]
-    pkgdatadir = os.path.join(os.path.dirname(__file__), "..", "share", "cartridges")
-    localedir = os.path.join(os.path.dirname(__file__), "..", "share", "locale")
+    PKGDATADIR = os.path.join(os.path.dirname(__file__), "..", "share", "cartridges")
 else:
-    pkgdatadir = "@pkgdatadir@"
-    localedir = "@localedir@"
+    PKGDATADIR = "@pkgdatadir@"
+    LOCALEDIR = "@localedir@"
 
-sys.path.insert(1, pkgdatadir)
+sys.path.insert(1, PKGDATADIR)
 signal.signal(signal.SIGINT, signal.SIG_DFL)
 
-if os.name != "nt":
-    locale.bindtextdomain("cartridges", localedir)
+if system() == "Linux":
+    locale.bindtextdomain("cartridges", LOCALEDIR)
     locale.textdomain("cartridges")
-
-gettext.install("cartridges", localedir)
+    gettext.install("cartridges", LOCALEDIR, names=['ngettext'])
+else:
+    gettext.install("cartridges", names=['ngettext'])
 
 if __name__ == "__main__":
-    import gi
+    from gi.repository import Gio, GLib
 
-    from gi.repository import Gio
+    try:
+        # For a macOS application bundle
+        resource = Gio.Resource.load(
+            str(Path(__file__).parent / "Resources" / "cartridges.gresource")
+        )
+    except GLib.GError:
+        resource = Gio.Resource.load(os.path.join(PKGDATADIR, "cartridges.gresource"))
+    resource._register()  # pylint: disable=protected-access
 
-    resource = Gio.Resource.load(os.path.join(pkgdatadir, "cartridges.gresource"))
-    resource._register()
-
-    from src import main
+    from cartridges import main
 
     sys.exit(main.main(VERSION))

cartridges/details_dialog.py

@@ -1,6 +1,6 @@
-# details_window.py
+# details_dialog.py
 #
-# Copyright 2022-2023 kramo
+# Copyright 2022-2024 kramo
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,54 +17,64 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-import os
+# pyright: reportAssignmentType=none
+
+import shlex
+from pathlib import Path
+from sys import platform
 from time import time
+from typing import Any, Optional
 
 from gi.repository import Adw, Gio, GLib, Gtk
-from PIL import Image
+from PIL import Image, UnidentifiedImageError
 
-from src import shared
-from src.errors.friendly_error import FriendlyError
-from src.game import Game
-from src.game_cover import GameCover
-from src.store.managers.sgdb_manager import SGDBManager
-from src.utils.create_dialog import create_dialog
-from src.utils.save_cover import resize_cover, save_cover
+from cartridges import shared
+from cartridges.errors.friendly_error import FriendlyError
+from cartridges.game import Game
+from cartridges.game_cover import GameCover
+from cartridges.store.managers.cover_manager import CoverManager
+from cartridges.store.managers.sgdb_manager import SgdbManager
+from cartridges.utils.create_dialog import create_dialog
+from cartridges.utils.save_cover import convert_cover, save_cover
 
 
-@Gtk.Template(resource_path=shared.PREFIX + "/gtk/details-window.ui")
-class DetailsWindow(Adw.Window):
-    __gtype_name__ = "DetailsWindow"
+@Gtk.Template(resource_path=shared.PREFIX + "/gtk/details-dialog.ui")
+class DetailsDialog(Adw.Dialog):
+    __gtype_name__ = "DetailsDialog"
 
-    cover_overlay = Gtk.Template.Child()
-    cover = Gtk.Template.Child()
-    cover_button_edit = Gtk.Template.Child()
-    cover_button_delete_revealer = Gtk.Template.Child()
-    cover_button_delete = Gtk.Template.Child()
-    spinner = Gtk.Template.Child()
+    cover_overlay: Gtk.Overlay = Gtk.Template.Child()
+    cover: Gtk.Picture = Gtk.Template.Child()
+    cover_button_edit: Gtk.Button = Gtk.Template.Child()
+    cover_button_delete_revealer: Gtk.Revealer = Gtk.Template.Child()
+    cover_button_delete: Gtk.Button = Gtk.Template.Child()
+    spinner: Adw.Spinner = Gtk.Template.Child()
 
-    name = Gtk.Template.Child()
-    developer = Gtk.Template.Child()
-    executable = Gtk.Template.Child()
+    name: Adw.EntryRow = Gtk.Template.Child()
+    developer: Adw.EntryRow = Gtk.Template.Child()
+    executable: Adw.EntryRow = Gtk.Template.Child()
 
-    exec_info_label = Gtk.Template.Child()
-    exec_info_popover = Gtk.Template.Child()
+    exec_info_label: Gtk.Label = Gtk.Template.Child()
+    exec_info_popover: Gtk.Popover = Gtk.Template.Child()
+    file_chooser_button: Gtk.Button = Gtk.Template.Child()
 
-    apply_button = Gtk.Template.Child()
+    apply_button: Gtk.Button = Gtk.Template.Child()
 
-    cover_changed = False
+    cover_changed: bool = False
 
-    def __init__(self, game=None, **kwargs):
+    is_open: bool = False
+
+    def __init__(self, game: Optional[Game] = None, **kwargs: Any):
         super().__init__(**kwargs)
 
-        self.win = shared.win
-        self.game = game
-        self.game_cover = GameCover({self.cover})
+        # Make it so only one dialog can be open at a time
+        self.__class__.is_open = True
+        self.connect("closed", lambda *_: self.set_is_open(False))
 
-        self.set_transient_for(self.win)
+        self.game: Optional[Game] = game
+        self.game_cover: GameCover = GameCover({self.cover})
 
         if self.game:
-            self.set_title(_("Edit Game Details"))
+            self.set_title(_("Game Details"))
             self.name.set_text(self.game.name)
             if self.game.developer:
                 self.developer.set_text(self.game.developer)
@@ -76,24 +86,39 @@ class DetailsWindow(Adw.Window):
                 self.cover_button_delete_revealer.set_reveal_child(True)
         else:
             self.set_title(_("Add New Game"))
-            self.apply_button.set_label(_("Confirm"))
+            self.apply_button.set_label(_("Add"))
 
         image_filter = Gtk.FileFilter(name=_("Images"))
-        for extension in Image.registered_extensions():
-            image_filter.add_suffix(extension[1:])
-            image_filter.add_suffix("svg")  # Gdk.Texture supports .svg but PIL doesn't
 
-        file_filters = Gio.ListStore.new(Gtk.FileFilter)
-        file_filters.append(image_filter)
-        self.file_dialog = Gtk.FileDialog()
-        self.file_dialog.set_filters(file_filters)
+        # .palm and .pdf are write-only
+        for extension in set(Image.registered_extensions()) - {".palm", ".pdf"}:
+            image_filter.add_suffix(extension[1:])
+
+        image_filter.add_suffix("svg")  # Gdk.Texture supports .svg but PIL doesn't
+
+        image_filters = Gio.ListStore.new(Gtk.FileFilter)
+        image_filters.append(image_filter)
+
+        exec_filter = Gtk.FileFilter(name=_("Executables"))
+        exec_filter.add_mime_type("application/x-executable")
+
+        exec_filters = Gio.ListStore.new(Gtk.FileFilter)
+        exec_filters.append(exec_filter)
+
+        self.image_file_dialog = Gtk.FileDialog()
+        self.image_file_dialog.set_filters(image_filters)
+        self.image_file_dialog.set_default_filter(image_filter)
+
+        self.exec_file_dialog = Gtk.FileDialog()
+        self.exec_file_dialog.set_filters(exec_filters)
+        self.exec_file_dialog.set_default_filter(exec_filter)
 
         # Translate this string as you would translate "file"
         file_name = _("file.txt")
         # As in software
         exe_name = _("program")
 
-        if os.name == "nt":
+        if platform == "win32":
             exe_name += ".exe"
             # Translate this string as you would translate "path to {}"
             exe_path = _("C:\\path\\to\\{}").format(exe_name)
@@ -105,7 +130,7 @@ class DetailsWindow(Adw.Window):
             exe_path = _("/path/to/{}").format(exe_name)
             # Translate this string as you would translate "path to {}"
             file_path = _("/path/to/{}").format(file_name)
-            command = "xdg-open"
+            command = "open" if platform == "darwin" else "xdg-open"
 
         # pylint: disable=line-too-long
         exec_info_text = _(
@@ -114,29 +139,36 @@ class DetailsWindow(Adw.Window):
 
         self.exec_info_label.set_label(exec_info_text)
 
-        def clear_info_selection(*_args):
-            self.exec_info_label.select_region(-1, -1)
+        self.exec_info_popover.update_property(
+            (Gtk.AccessibleProperty.LABEL,),
+            (
+                exec_info_text.replace("<tt>", "").replace("</tt>", ""),
+            ),  # Remove formatting, else the screen reader reads it
+        )
 
-        self.exec_info_popover.connect("show", clear_info_selection)
+        def set_exec_info_a11y_label(*_args: Any) -> None:
+            self.set_focus(self.exec_info_popover)
+
+        self.exec_info_popover.connect("show", set_exec_info_a11y_label)
 
         self.cover_button_delete.connect("clicked", self.delete_pixbuf)
         self.cover_button_edit.connect("clicked", self.choose_cover)
+        self.file_chooser_button.connect("clicked", self.choose_executable)
         self.apply_button.connect("clicked", self.apply_preferences)
 
-        self.name.connect("activate", self.focus_executable)
-        self.developer.connect("activate", self.focus_executable)
-        self.executable.connect("activate", self.apply_preferences)
+        self.name.connect("entry-activated", self.focus_executable)
+        self.developer.connect("entry-activated", self.focus_executable)
+        self.executable.connect("entry-activated", self.apply_preferences)
 
         self.set_focus(self.name)
-        self.present()
 
-    def delete_pixbuf(self, *_args):
+    def delete_pixbuf(self, *_args: Any) -> None:
         self.game_cover.new_cover()
 
         self.cover_button_delete_revealer.set_reveal_child(False)
         self.cover_changed = True
 
-    def apply_preferences(self, *_args):
+    def apply_preferences(self, *_args: Any) -> None:
         final_name = self.name.get_text()
         final_developer = self.developer.get_text()
         final_executable = self.executable.get_text()
@@ -175,6 +207,12 @@ class DetailsWindow(Adw.Window):
                 }
             )
 
+            if shared.win.sidebar.get_selected_row().get_child() not in (
+                shared.win.all_games_row_box,
+                shared.win.added_row_box,
+            ):
+                shared.win.sidebar.select_row(shared.win.added_row_box.get_parent())
+
         else:
             if final_name == "":
                 create_dialog(
@@ -196,10 +234,10 @@ class DetailsWindow(Adw.Window):
         self.game.developer = final_developer or None
         self.game.executable = final_executable
 
-        if self.game.game_id in self.win.game_covers.keys():
-            self.win.game_covers[self.game.game_id].animation = None
+        if self.game.game_id in shared.win.game_covers.keys():
+            shared.win.game_covers[self.game.game_id].animation = None
 
-        self.win.game_covers[self.game.game_id] = self.game_cover
+        shared.win.game_covers[self.game.game_id] = self.game_cover
 
         if self.cover_changed:
             save_cover(
@@ -215,16 +253,16 @@ class DetailsWindow(Adw.Window):
         # Get a cover from SGDB if none is present
         if not self.game_cover.get_texture():
             self.game.set_loading(1)
-            sgdb_manager: SGDBManager = shared.store.managers[SGDBManager]
+            sgdb_manager = shared.store.managers[SgdbManager]
             sgdb_manager.reset_cancellable()
             sgdb_manager.process_game(self.game, {}, self.update_cover_callback)
 
         self.game_cover.pictures.remove(self.cover)
 
         self.close()
-        self.win.show_details_view(self.game)
+        shared.win.show_details_page(self.game)
 
-    def update_cover_callback(self, manager: SGDBManager):
+    def update_cover_callback(self, manager: SgdbManager) -> None:
         # Set the game as not loading
         self.game.set_loading(-1)
         self.game.update()
@@ -241,33 +279,64 @@ class DetailsWindow(Adw.Window):
                     _("Preferences"),
                 ).connect("response", self.update_cover_error_response)
 
-    def update_cover_error_response(self, _widget, response):
+    def update_cover_error_response(self, _widget: Any, response: str) -> None:
         if response == "open_preferences":
             shared.win.get_application().on_preferences_action(page_name="sgdb")
 
-    def focus_executable(self, *_args):
+    def focus_executable(self, *_args: Any) -> None:
         self.set_focus(self.executable)
 
-    def toggle_loading(self):
+    def toggle_loading(self) -> None:
         self.apply_button.set_sensitive(not self.apply_button.get_sensitive())
-        self.spinner.set_spinning(not self.spinner.get_spinning())
+        self.spinner.set_visible(not self.spinner.get_visible())
         self.cover_overlay.set_opacity(not self.cover_overlay.get_opacity())
 
-    def set_cover(self, _source, result, *_args):
+    def set_cover(self, _source: Any, result: Gio.Task, *_args: Any) -> None:
         try:
-            path = self.file_dialog.open_finish(result).get_path()
-        except GLib.GError:
+            path = self.image_file_dialog.open_finish(result).get_path()
+        except GLib.Error:
             return
 
-        def resize():
-            if cover := resize_cover(path):
-                self.game_cover.new_cover(cover)
+        def thread_func() -> None:
+            new_path = None
+
+            try:
+                with Image.open(path) as image:
+                    if getattr(image, "is_animated", False):
+                        new_path = convert_cover(path)
+            except UnidentifiedImageError:
+                pass
+
+            if not new_path:
+                new_path = convert_cover(
+                    pixbuf=shared.store.managers[CoverManager].composite_cover(
+                        Path(path)
+                    )
+                )
+
+            if new_path:
+                self.game_cover.new_cover(new_path)
                 self.cover_button_delete_revealer.set_reveal_child(True)
                 self.cover_changed = True
+
             self.toggle_loading()
 
         self.toggle_loading()
-        GLib.Thread.new(None, resize)
+        GLib.Thread.new(None, thread_func)
 
-    def choose_cover(self, *_args):
-        self.file_dialog.open(self, None, self.set_cover)
+    def set_executable(self, _source: Any, result: Gio.Task, *_args: Any) -> None:
+        try:
+            path = self.exec_file_dialog.open_finish(result).get_path()
+        except GLib.Error:
+            return
+
+        self.executable.set_text(shlex.quote(path))
+
+    def choose_executable(self, *_args: Any) -> None:
+        self.exec_file_dialog.open(self.get_root(), None, self.set_executable)
+
+    def choose_cover(self, *_args: Any) -> None:
+        self.image_file_dialog.open(self.get_root(), None, self.set_cover)
+
+    def set_is_open(self, is_open: bool) -> None:
+        self.__class__.is_open = is_open

cartridges/errors/error_producer.py

@@ -8,14 +8,14 @@ class ErrorProducer:
     Specifies the report_error and collect_errors methods in a thread-safe manner.
     """
 
-    errors: list[Exception] = None
-    errors_lock: Lock = None
+    errors: list[Exception]
+    errors_lock: Lock
 
     def __init__(self) -> None:
         self.errors = []
         self.errors_lock = Lock()
 
-    def report_error(self, error: Exception):
+    def report_error(self, error: Exception) -> None:
         """Report an error"""
         with self.errors_lock:
             self.errors.append(error)

cartridges/errors/friendly_error.py

@@ -1,4 +1,4 @@
-from typing import Iterable
+from typing import Iterable, Optional
 
 
 class FriendlyError(Exception):
@@ -27,8 +27,8 @@ class FriendlyError(Exception):
         self,
         title: str,
         subtitle: str,
-        title_args: Iterable[str] = None,
-        subtitle_args: Iterable[str] = None,
+        title_args: Optional[Iterable[str]] = None,
+        subtitle_args: Optional[Iterable[str]] = None,
     ) -> None:
         """Create a friendly error
 

cartridges/game.py

@@ -17,16 +17,16 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-import logging
-import os
 import shlex
-import subprocess
 from pathlib import Path
 from time import time
+from typing import Any, Optional
 
-from gi.repository import Adw, GLib, GObject, Gtk
+from gi.repository import Adw, GObject, Gtk
 
-from src import shared
+from cartridges import shared
+from cartridges.game_cover import GameCover
+from cartridges.utils.run_executable import run_executable
 
 
 # pylint: disable=too-many-instance-attributes
@@ -45,30 +45,30 @@ class Game(Gtk.Box):
     game_options = Gtk.Template.Child()
     hidden_game_options = Gtk.Template.Child()
 
-    loading = 0
-    filtered = False
+    loading: int = 0
+    filtered: bool = False
 
-    added = None
-    executable = None
-    game_id = None
-    source = None
-    hidden = False
-    last_played = 0
-    name = None
-    developer = None
-    removed = False
-    blacklisted = False
-    game_cover = None
-    version = 0
+    added: int
+    executable: str
+    game_id: str
+    source: str
+    hidden: bool = False
+    last_played: int = 0
+    name: str
+    developer: Optional[str] = None
+    removed: bool = False
+    blacklisted: bool = False
+    game_cover: GameCover = None
+    version: int = 0
 
-    def __init__(self, data, **kwargs):
+    def __init__(self, data: dict[str, Any], **kwargs: Any) -> None:
         super().__init__(**kwargs)
 
-        self.win = shared.win
-        self.app = self.win.get_application()
+        self.app = shared.win.get_application()
         self.version = shared.SPEC_VERSION
 
         self.update_values(data)
+        self.base_source = self.source.split("_")[0]
 
         self.set_play_icon()
 
@@ -81,55 +81,42 @@ class Game(Gtk.Box):
 
         shared.schema.connect("changed", self.schema_changed)
 
-    def update_values(self, data):
+    def update_values(self, data: dict[str, Any]) -> None:
         for key, value in data.items():
             # Convert executables to strings
             if key == "executable" and isinstance(value, list):
                 value = shlex.join(value)
             setattr(self, key, value)
 
-    def update(self):
+    def update(self) -> None:
         self.emit("update-ready", {})
 
-    def save(self):
+    def save(self) -> None:
         self.emit("save-ready", {})
 
-    def create_toast(self, title, action=None):
+    def create_toast(self, title: str, action: Optional[str] = None) -> None:
         toast = Adw.Toast.new(title.format(self.name))
         toast.set_priority(Adw.ToastPriority.HIGH)
+        toast.set_use_markup(False)
 
         if action:
             toast.set_button_label(_("Undo"))
-            toast.connect("button-clicked", self.win.on_undo_action, self, action)
+            toast.connect("button-clicked", shared.win.on_undo_action, self, action)
 
-            if (self, action) in self.win.toasts.keys():
+            if (self, action) in shared.win.toasts.keys():
                 # Dismiss the toast if there already is one
-                self.win.toasts[(self, action)].dismiss()
+                shared.win.toasts[(self, action)].dismiss()
 
-            self.win.toasts[(self, action)] = toast
+            shared.win.toasts[(self, action)] = toast
 
-        self.win.toast_overlay.add_toast(toast)
+        shared.win.toast_overlay.add_toast(toast)
 
-    def launch(self):
+    def launch(self) -> None:
         self.last_played = int(time())
         self.save()
         self.update()
 
-        args = (
-            "flatpak-spawn --host /bin/sh -c " + shlex.quote(self.executable)  # Flatpak
-            if os.getenv("FLATPAK_ID") == shared.APP_ID
-            else self.executable  # Others
-        )
-
-        logging.info("Starting %s: %s", self.name, str(args))
-        # pylint: disable=consider-using-with
-        subprocess.Popen(
-            args,
-            cwd=Path.home(),
-            shell=True,
-            start_new_session=True,
-            creationflags=subprocess.CREATE_NEW_PROCESS_GROUP if os.name == "nt" else 0,
-        )
+        run_executable(self.executable)
 
         if shared.schema.get_boolean("exit-after-launch"):
             self.app.quit()
@@ -137,82 +124,80 @@ class Game(Gtk.Box):
         # The variable is the title of the game
         self.create_toast(_("{} launched"))
 
-    def toggle_hidden(self, toast=True):
+    def toggle_hidden(self, toast: bool = True) -> None:
         self.hidden = not self.hidden
         self.save()
 
-        if self.win.stack.get_visible_child() == self.win.details_view:
-            self.win.on_go_back_action()
+        if shared.win.navigation_view.get_visible_page() == shared.win.details_page:
+            shared.win.navigation_view.pop()
 
         self.update()
 
         if toast:
             self.create_toast(
                 # The variable is the title of the game
-                (_("{} hidden") if self.hidden else _("{} unhidden")).format(
-                    GLib.markup_escape_text(self.name)
-                ),
+                (_("{} hidden") if self.hidden else _("{} unhidden")).format(self.name),
                 "hide",
             )
 
-    def remove_game(self):
+    def remove_game(self) -> None:
         # Add "removed=True" to the game properties so it can be deleted on next init
         self.removed = True
         self.save()
         self.update()
 
-        if self.win.stack.get_visible_child() == self.win.details_view:
-            self.win.on_go_back_action()
+        if shared.win.navigation_view.get_visible_page() == shared.win.details_page:
+            shared.win.navigation_view.pop()
 
         # The variable is the title of the game
-        self.create_toast(
-            _("{} removed").format(GLib.markup_escape_text(self.name)), "remove"
-        )
+        self.create_toast(_("{} removed").format(self.name), "remove")
 
-    def set_loading(self, state):
+    def set_loading(self, state: int) -> None:
         self.loading += state
         loading = self.loading > 0
 
         self.cover.set_opacity(int(not loading))
-        self.spinner.set_spinning(loading)
+        self.spinner.set_visible(loading)
 
-    def get_cover_path(self):
+    def get_cover_path(self) -> Optional[Path]:
         cover_path = shared.covers_dir / f"{self.game_id}.gif"
         if cover_path.is_file():
-            return cover_path
+            return cover_path  # type: ignore
 
         cover_path = shared.covers_dir / f"{self.game_id}.tiff"
         if cover_path.is_file():
-            return cover_path
+            return cover_path  # type: ignore
 
         return None
 
-    def toggle_play(self, _widget, _prop1, _prop2, state=True):
+    def toggle_play(
+        self, _widget: Any, _prop1: Any, _prop2: Any, state: bool = True
+    ) -> None:
         if not self.menu_button.get_active():
             self.play_revealer.set_reveal_child(not state)
             self.menu_revealer.set_reveal_child(not state)
 
-    def main_button_clicked(self, _widget, button):
+    def main_button_clicked(self, _widget: Any, button: bool) -> None:
         if shared.schema.get_boolean("cover-launches-game") ^ button:
             self.launch()
         else:
-            self.win.show_details_view(self)
+            shared.win.show_details_page(self)
 
-    def set_play_icon(self):
+    def set_play_icon(self) -> None:
         self.play_button.set_icon_name(
             "help-about-symbolic"
             if shared.schema.get_boolean("cover-launches-game")
             else "media-playback-start-symbolic"
         )
 
-    def schema_changed(self, _settings, key):
+    def schema_changed(self, _settings: Any, key: str) -> None:
         if key == "cover-launches-game":
             self.set_play_icon()
 
     @GObject.Signal(name="update-ready", arg_types=[object])
-    def update_ready(self, _additional_data) -> None:
+    def update_ready(self, _additional_data):  # type: ignore
         """Signal emitted when the game needs updating"""
 
     @GObject.Signal(name="save-ready", arg_types=[object])
-    def save_ready(self, _additional_data) -> None:
+    def save_ready(self, _additional_data):  # type: ignore
         """Signal emitted when the game needs saving"""

cartridges/game_cover.py

@@ -17,19 +17,23 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from gi.repository import Gdk, GdkPixbuf, Gio, GLib
+from io import BytesIO
+from pathlib import Path
+from typing import Optional
+
+from gi.repository import Gdk, GdkPixbuf, Gio, GLib, Gtk
 from PIL import Image, ImageFilter, ImageStat
 
-from src import shared
+from cartridges import shared
 
 
 class GameCover:
-    texture = None
-    blurred = None
-    luminance = None
-    path = None
-    animation = None
-    anim_iter = None
+    texture: Optional[Gdk.Texture]
+    blurred: Optional[Gdk.Texture]
+    luminance: Optional[tuple[float, float]]
+    path: Optional[Path]
+    animation: Optional[GdkPixbuf.PixbufAnimation]
+    anim_iter: Optional[GdkPixbuf.PixbufAnimationIter]
 
     placeholder = Gdk.Texture.new_from_resource(
         shared.PREFIX + "/library_placeholder.svg"
@@ -38,21 +42,11 @@ class GameCover:
         shared.PREFIX + "/library_placeholder_small.svg"
     )
 
-    def __init__(self, pictures, path=None):
+    def __init__(self, pictures: set[Gtk.Picture], path: Optional[Path] = None) -> None:
         self.pictures = pictures
         self.new_cover(path)
 
-    # Wrap the function in another one as Gio.Task.run_in_thread does not allow for passing args
-    def create_func(self, path):
-        self.animation = GdkPixbuf.PixbufAnimation.new_from_file(str(path))
-        self.anim_iter = self.animation.get_iter()
-
-        def wrapper(task, *_args):
-            self.update_animation((task, self.animation))
-
-        return wrapper
-
-    def new_cover(self, path=None):
+    def new_cover(self, path: Optional[Path] = None) -> None:
         self.animation = None
         self.texture = None
         self.blurred = None
@@ -61,22 +55,26 @@ class GameCover:
 
         if path:
             if path.suffix == ".gif":
+                self.animation = GdkPixbuf.PixbufAnimation.new_from_file(str(path))
+                self.anim_iter = self.animation.get_iter()
                 self.task = Gio.Task.new()
-                self.task.run_in_thread(self.create_func(self.path))
+                self.task.run_in_thread(
+                    lambda *_: self.update_animation((self.task, self.animation))
+                )
             else:
                 self.texture = Gdk.Texture.new_from_filename(str(path))
 
         if not self.animation:
             self.set_texture(self.texture)
 
-    def get_texture(self):
+    def get_texture(self) -> Gdk.Texture:
         return (
             Gdk.Texture.new_for_pixbuf(self.animation.get_static_image())
             if self.animation
             else self.texture
         )
 
-    def get_blurred(self):
+    def get_blurred(self) -> Gdk.Texture:
         if not self.blurred:
             if self.path:
                 with Image.open(self.path) as image:
@@ -86,32 +84,33 @@ class GameCover:
                         .filter(ImageFilter.GaussianBlur(20))
                     )
 
-                    tmp_path = Gio.File.new_tmp(None)[0].get_path()
-                    image.save(tmp_path, "tiff", compression=None)
+                    buffer = BytesIO()
+                    image.save(buffer, "tiff", compression=None)
+                    gbytes = GLib.Bytes.new(buffer.getvalue())
 
-                    self.blurred = Gdk.Texture.new_from_filename(tmp_path)
+                    self.blurred = Gdk.Texture.new_from_bytes(gbytes)
 
                     stat = ImageStat.Stat(image.convert("L"))
 
                     # Luminance values for light and dark mode
-                    self.luminance = [
+                    self.luminance = (
                         min((stat.mean[0] + stat.extrema[0][0]) / 510, 0.7),
                         max((stat.mean[0] + stat.extrema[0][1]) / 510, 0.3),
-                    ]
+                    )
             else:
                 self.blurred = self.placeholder_small
                 self.luminance = (0.3, 0.5)
 
         return self.blurred
 
-    def add_picture(self, picture):
+    def add_picture(self, picture: Gtk.Picture) -> None:
         self.pictures.add(picture)
         if not self.animation:
             self.set_texture(self.texture)
         else:
             self.update_animation((self.task, self.animation))
 
-    def set_texture(self, texture):
+    def set_texture(self, texture: Gdk.Texture) -> None:
         self.pictures.discard(
             picture for picture in self.pictures if not picture.is_visible()
         )
@@ -120,14 +119,15 @@ class GameCover:
         else:
             for picture in self.pictures:
                 picture.set_paintable(texture or self.placeholder)
+                picture.queue_draw()
 
-    def update_animation(self, data):
+    def update_animation(self, data: GdkPixbuf.PixbufAnimation) -> None:
         if self.animation == data[1]:
-            self.anim_iter.advance()
+            self.anim_iter.advance()  # type: ignore
 
-            self.set_texture(Gdk.Texture.new_for_pixbuf(self.anim_iter.get_pixbuf()))
+            self.set_texture(Gdk.Texture.new_for_pixbuf(self.anim_iter.get_pixbuf()))  # type: ignore
 
-            delay_time = self.anim_iter.get_delay_time()
+            delay_time = self.anim_iter.get_delay_time()  # type: ignore
             GLib.timeout_add(
                 20 if delay_time < 20 else delay_time,
                 self.update_animation,

cartridges/importer/bottles_source.py

@@ -19,14 +19,14 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from pathlib import Path
-from time import time
+from typing import NamedTuple
 
 import yaml
 
-from src import shared
-from src.game import Game
-from src.importer.sources.location import Location
-from src.importer.sources.source import SourceIterable, URLExecutableSource
+from cartridges import shared
+from cartridges.game import Game
+from cartridges.importer.location import Location, LocationSubPath
+from cartridges.importer.source import SourceIterable, URLExecutableSource
 
 
 class BottlesSourceIterable(SourceIterable):
@@ -35,19 +35,19 @@ class BottlesSourceIterable(SourceIterable):
     def __iter__(self):
         """Generator method producing games"""
 
-        data = self.source.data_location["library.yml"].read_text("utf-8")
+        data = self.source.locations.data["library.yml"].read_text("utf-8")
         library: dict = yaml.safe_load(data)
-        added_time = int(time())
 
         for entry in library.values():
             # Build game
             values = {
-                "source": self.source.id,
-                "added": added_time,
+                "source": self.source.source_id,
+                "added": shared.import_time,
                 "name": entry["name"],
                 "game_id": self.source.game_id_format.format(game_id=entry["id"]),
-                "executable": self.source.executable_format.format(
-                    bottle_name=entry["bottle"]["name"], game_name=entry["name"]
+                "executable": self.source.make_executable(
+                    bottle_name=entry["bottle"]["name"],
+                    game_name=entry["name"],
                 ),
             }
             game = Game(values)
@@ -58,11 +58,11 @@ class BottlesSourceIterable(SourceIterable):
                 # as Cartridges can't access directories picked via Bottles' file picker portal
                 bottles_location = Path(
                     yaml.safe_load(
-                        self.source.data_location["data.yml"].read_text("utf-8")
+                        self.source.locations.data["data.yml"].read_text("utf-8")
                     )["custom_bottles_path"]
                 )
             except (FileNotFoundError, KeyError):
-                bottles_location = self.source.data_location.root / "bottles"
+                bottles_location = self.source.locations.data.root / "bottles"
 
             bottle_path = entry["bottle"]["path"]
 
@@ -72,27 +72,38 @@ class BottlesSourceIterable(SourceIterable):
                 image_path = bottles_location / bottle_path / "grids" / image_name
                 additional_data = {"local_image_path": image_path}
 
-            # Produce game
             yield (game, additional_data)
 
 
+class BottlesLocations(NamedTuple):
+    data: Location
+
+
 class BottlesSource(URLExecutableSource):
     """Generic Bottles source"""
 
+    source_id = "bottles"
     name = _("Bottles")
     iterable_class = BottlesSourceIterable
     url_format = 'bottles:run/"{bottle_name}"/"{game_name}"'
     available_on = {"linux"}
 
-    data_location = Location(
-        schema_key="bottles-location",
-        candidates=(
-            shared.flatpak_dir / "com.usebottles.bottles" / "data" / "bottles",
-            shared.data_dir / "bottles/",
-            shared.home / ".local" / "share" / "bottles",
-        ),
-        paths={
-            "library.yml": (False, "library.yml"),
-            "data.yml": (False, "data.yml"),
-        },
-    )
+    locations: BottlesLocations
+
+    def __init__(self) -> None:
+        super().__init__()
+        self.locations = BottlesLocations(
+            Location(
+                schema_key="bottles-location",
+                candidates=(
+                    shared.flatpak_dir / "com.usebottles.bottles" / "data" / "bottles",
+                    shared.data_dir / "bottles/",
+                    shared.host_data_dir / "bottles",
+                ),
+                paths={
+                    "library.yml": LocationSubPath("library.yml"),
+                    "data.yml": LocationSubPath("data.yml"),
+                },
+                invalid_subtitle=Location.DATA_INVALID_SUBTITLE,
+            )
+        )

cartridges/importer/desktop_source.py

@@ -0,0 +1,223 @@
+# desktop_source.py
+#
+# Copyright 2023 kramo
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import os
+import shlex
+import subprocess
+from pathlib import Path
+from typing import NamedTuple
+
+from gi.repository import GLib, Gtk
+
+from cartridges import shared
+from cartridges.game import Game
+from cartridges.importer.source import Source, SourceIterable
+
+
+class DesktopSourceIterable(SourceIterable):
+    source: "DesktopSource"
+
+    def __iter__(self):
+        """Generator method producing games"""
+
+        icon_theme = Gtk.IconTheme.new()
+
+        search_paths = [
+            shared.host_data_dir,
+            "/run/host/usr/local/share",
+            "/run/host/usr/share",
+            "/run/host/usr/share/pixmaps",
+            "/usr/share/pixmaps",
+        ] + GLib.get_system_data_dirs()
+
+        for search_path in search_paths:
+            path = Path(search_path)
+
+            if not str(search_path).endswith("/pixmaps"):
+                path = path / "icons"
+
+            if not path.is_dir():
+                continue
+
+            if str(path).startswith("/app/"):
+                continue
+
+            icon_theme.add_search_path(str(path))
+
+        launch_command, full_path = self.check_launch_commands()
+
+        for path in search_paths:
+            if str(path).startswith("/app/"):
+                continue
+
+            path = Path(path) / "applications"
+
+            if not path.is_dir():
+                continue
+
+            for entry in path.iterdir():
+                if entry.suffix != ".desktop":
+                    continue
+
+                # Skip Lutris games
+                if str(entry.name).startswith("net.lutris."):
+                    continue
+
+                keyfile = GLib.KeyFile.new()
+
+                try:
+                    keyfile.load_from_file(str(entry), 0)
+
+                    if "Game" not in keyfile.get_string_list(
+                        "Desktop Entry", "Categories"
+                    ):
+                        continue
+
+                    name = keyfile.get_string("Desktop Entry", "Name")
+                    executable = keyfile.get_string("Desktop Entry", "Exec").split(
+                        " %"
+                    )[0]
+                except GLib.Error:
+                    continue
+
+                try:
+                    try_exec = "which " + keyfile.get_string("Desktop Entry", "TryExec")
+                    if not self.check_command(try_exec):
+                        continue
+
+                except GLib.Error:
+                    pass
+
+                # Skip Steam games
+                if "steam://rungameid/" in executable:
+                    continue
+
+                # Skip Heroic games
+                if "heroic://launch/" in executable:
+                    continue
+
+                # Skip Bottles games
+                if "bottles-cli " in executable:
+                    continue
+
+                try:
+                    if keyfile.get_boolean("Desktop Entry", "NoDisplay"):
+                        continue
+                except GLib.Error:
+                    pass
+
+                try:
+                    if keyfile.get_boolean("Desktop Entry", "Hidden"):
+                        continue
+                except GLib.Error:
+                    pass
+
+                # Strip /run/host from Flatpak paths
+                if entry.is_relative_to(prefix := "/run/host"):
+                    entry = Path("/") / entry.relative_to(prefix)
+
+                launch_arg = shlex.quote(str(entry if full_path else entry.stem))
+
+                values = {
+                    "source": self.source.source_id,
+                    "added": shared.import_time,
+                    "name": name,
+                    "game_id": f"desktop_{entry.stem}",
+                    "executable": f"{launch_command} {launch_arg}",
+                }
+                game = Game(values)
+
+                additional_data = {}
+
+                try:
+                    icon_str = keyfile.get_string("Desktop Entry", "Icon")
+                except GLib.Error:
+                    yield game
+                    continue
+                else:
+                    if "/" in icon_str:
+                        additional_data = {"local_icon_path": Path(icon_str)}
+                        yield (game, additional_data)
+                        continue
+
+                try:
+                    if (
+                        icon_path := icon_theme.lookup_icon(
+                            icon_str,
+                            None,
+                            512,
+                            1,
+                            shared.win.get_direction(),
+                            0,
+                        )
+                        .get_file()
+                        .get_path()
+                    ):
+                        additional_data = {"local_icon_path": Path(icon_path)}
+                except GLib.Error:
+                    pass
+
+                yield (game, additional_data)
+
+    def check_command(self, command) -> bool:
+        flatpak_str = "flatpak-spawn --host /bin/sh -c "
+
+        if os.getenv("FLATPAK_ID") == shared.APP_ID:
+            command = flatpak_str + shlex.quote(command)
+
+        try:
+            subprocess.run(command, shell=True, check=True)
+        except subprocess.CalledProcessError:
+            return False
+
+        return True
+
+    def check_launch_commands(self) -> (str, bool):
+        """Check whether `gio launch` `gtk4-launch` or `gtk-launch` are available on the system"""
+        commands = (("gio launch", True), ("gtk4-launch", False), ("gtk-launch", False))
+
+        for command, full_path in commands:
+            # Even if `gio` is available, `gio launch` is only available on GLib >= 2.67.2
+            command_to_check = (
+                "gio help launch" if command == "gio launch" else f"which {command}"
+            )
+
+            if self.check_command(command_to_check):
+                return command, full_path
+
+        return commands[2]
+
+
+class DesktopLocations(NamedTuple):
+    pass
+
+
+class DesktopSource(Source):
+    """Generic Flatpak source"""
+
+    source_id = "desktop"
+    name = _("Desktop Entries")
+    iterable_class = DesktopSourceIterable
+    available_on = {"linux"}
+
+    locations: DesktopLocations
+
+    def __init__(self) -> None:
+        super().__init__()
+        self.locations = DesktopLocations()

cartridges/importer/flatpak_source.py

@@ -17,15 +17,16 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+from itertools import chain
 from pathlib import Path
-from time import time
+from typing import NamedTuple
 
 from gi.repository import GLib, Gtk
 
-from src import shared
-from src.game import Game
-from src.importer.sources.location import Location
-from src.importer.sources.source import Source, SourceIterable
+from cartridges import shared
+from cartridges.game import Game
+from cartridges.importer.location import Location, LocationSubPath
+from cartridges.importer.source import ExecutableFormatSource, SourceIterable
 
 
 class FlatpakSourceIterable(SourceIterable):
@@ -34,26 +35,48 @@ class FlatpakSourceIterable(SourceIterable):
     def __iter__(self):
         """Generator method producing games"""
 
-        added_time = int(time())
-
         icon_theme = Gtk.IconTheme.new()
-        icon_theme.add_search_path(str(self.source.data_location["icons"]))
+        if user_data := self.source.locations.user_data["icons"]:
+            icon_theme.add_search_path(str(user_data))
+
+        if system_data := self.source.locations.system_data["icons"]:
+            icon_theme.add_search_path(str(system_data))
+
+        if not (system_data or user_data):
+            return
 
         blacklist = (
-            {"hu.kramo.Cartridges", "hu.kramo.Cartridges.Devel"}
+            {
+                "hu.kramo.Cartridges",
+                "hu.kramo.Cartridges.Devel",
+                "page.kramo.Cartridges",
+                "page.kramo.Cartridges.Devel",
+            }
             if shared.schema.get_boolean("flatpak-import-launchers")
             else {
                 "hu.kramo.Cartridges",
                 "hu.kramo.Cartridges.Devel",
+                "page.kramo.Cartridges",
+                "page.kramo.Cartridges.Devel",
                 "com.valvesoftware.Steam",
                 "net.lutris.Lutris",
                 "com.heroicgameslauncher.hgl",
                 "com.usebottles.Bottles",
                 "io.itch.itch",
+                "org.libretro.RetroArch",
             }
         )
 
-        for entry in (self.source.data_location["applications"]).iterdir():
+        generators = set(
+            location.iterdir()
+            for location in (
+                self.source.locations.user_data["applications"],
+                self.source.locations.system_data["applications"],
+            )
+            if location
+        )
+
+        for entry in chain(*generators):
             if entry.suffix != ".desktop":
                 continue
 
@@ -72,17 +95,15 @@ class FlatpakSourceIterable(SourceIterable):
 
                 name = keyfile.get_string("Desktop Entry", "Name")
 
-            except GLib.GError:
+            except GLib.Error:
                 continue
 
             values = {
-                "source": self.source.id,
-                "added": added_time,
+                "source": self.source.source_id,
+                "added": shared.import_time,
                 "name": name,
                 "game_id": self.source.game_id_format.format(game_id=flatpak_id),
-                "executable": self.source.executable_format.format(
-                    flatpak_id=flatpak_id
-                ),
+                "executable": self.source.make_executable(flatpak_id=flatpak_id),
             }
             game = Game(values)
 
@@ -104,29 +125,49 @@ class FlatpakSourceIterable(SourceIterable):
                     additional_data = {"local_icon_path": Path(icon_path)}
                 else:
                     pass
-            except GLib.GError:
+            except GLib.Error:
                 pass
 
-            # Produce game
             yield (game, additional_data)
 
 
-class FlatpakSource(Source):
+class FlatpakLocations(NamedTuple):
+    system_data: Location
+    user_data: Location
+
+
+class FlatpakSource(ExecutableFormatSource):
     """Generic Flatpak source"""
 
+    source_id = "flatpak"
     name = _("Flatpak")
     iterable_class = FlatpakSourceIterable
     executable_format = "flatpak run {flatpak_id}"
     available_on = {"linux"}
 
-    data_location = Location(
-        schema_key="flatpak-location",
-        candidates=(
-            "/var/lib/flatpak/",
-            shared.data_dir / "flatpak",
-        ),
-        paths={
-            "applications": (True, "exports/share/applications"),
-            "icons": (True, "exports/share/icons"),
-        },
-    )
+    locations: FlatpakLocations
+
+    def __init__(self) -> None:
+        super().__init__()
+        self.locations = FlatpakLocations(
+            Location(
+                schema_key="flatpak-system-location",
+                candidates=("/var/lib/flatpak/",),
+                paths={
+                    "applications": LocationSubPath("exports/share/applications", True),
+                    "icons": LocationSubPath("exports/share/icons", True),
+                },
+                invalid_subtitle=Location.DATA_INVALID_SUBTITLE,
+                optional=True,
+            ),
+            Location(
+                schema_key="flatpak-user-location",
+                candidates=(shared.data_dir / "flatpak",),
+                paths={
+                    "applications": LocationSubPath("exports/share/applications", True),
+                    "icons": LocationSubPath("exports/share/icons", True),
+                },
+                invalid_subtitle=Location.DATA_INVALID_SUBTITLE,
+                optional=True,
+            ),
+        )

cartridges/importer/heroic_source.py

@@ -21,17 +21,16 @@
 import json
 import logging
 from abc import abstractmethod
+from functools import cached_property
 from hashlib import sha256
 from json import JSONDecodeError
 from pathlib import Path
-from time import time
-from typing import Iterable, Optional, TypedDict
-from functools import cached_property
+from typing import Iterable, NamedTuple, Optional, TypedDict
 
-from src import shared
-from src.game import Game
-from src.importer.sources.location import Location
-from src.importer.sources.source import (
+from cartridges import shared
+from cartridges.game import Game
+from cartridges.importer.location import Location, LocationSubPath
+from cartridges.importer.source import (
     SourceIterable,
     SourceIterationResult,
     URLExecutableSource,
@@ -87,36 +86,35 @@ class SubSourceIterable(Iterable):
 
     @cached_property
     def library_path(self) -> Path:
-        path = self.source.config_location.root / self.relative_library_path
+        path = self.source.locations.config.root / self.relative_library_path
         logging.debug("Using Heroic %s library.json path %s", self.name, path)
         return path
 
-    def process_library_entry(
-        self, entry: HeroicLibraryEntry, added_time: int
-    ) -> SourceIterationResult:
+    def process_library_entry(self, entry: HeroicLibraryEntry) -> SourceIterationResult:
         """Build a Game from a Heroic library entry"""
 
         app_name = entry["app_name"]
+        runner = entry["runner"]
 
         # Build game
         values = {
-            "source": f"{self.source.id}_{self.service}",
-            "added": added_time,
+            "source": f"{self.source.source_id}_{self.service}",
+            "added": shared.import_time,
             "name": entry["title"],
             "developer": entry.get("developer", None),
             "game_id": self.source.game_id_format.format(
                 service=self.service, game_id=app_name
             ),
-            "executable": self.source.executable_format.format(app_name=app_name),
+            "executable": self.source.make_executable(runner=runner, app_name=app_name),
             "hidden": self.source_iterable.is_hidden(app_name),
         }
         game = Game(values)
 
-        # Get the image path from the heroic cache
-        # Filenames are derived from the URL that heroic used to get the file
+        # Get the image path from the Heroic cache
+        # Filenames are derived from the URL that Heroic used to get the file
         uri: str = entry["art_square"] + self.image_uri_params
         digest = sha256(uri.encode()).hexdigest()
-        image_path = self.source.config_location.root / "images-cache" / digest
+        image_path = self.source.locations.config.root / "images-cache" / digest
         additional_data = {"local_image_path": image_path}
 
         return (game, additional_data)
@@ -126,7 +124,7 @@ class SubSourceIterable(Iterable):
         Iterate through the games with a generator
         :raises InvalidLibraryFileError: on initial call if the library file is bad
         """
-        added_time = int(time())
+
         try:
             iterator = iter(
                 path_json_load(self.library_path)[self.library_json_entries_key]
@@ -137,7 +135,7 @@ class SubSourceIterable(Iterable):
             ) from error
         for entry in iterator:
             try:
-                yield self.process_library_entry(entry, added_time)
+                yield self.process_library_entry(entry)
             except KeyError as error:
                 logging.warning(
                     "Skipped invalid %s game %s",
@@ -159,7 +157,7 @@ class StoreSubSourceIterable(SubSourceIterable):
 
     @cached_property
     def installed_path(self) -> Path:
-        path = self.source.config_location.root / self.relative_installed_path
+        path = self.source.locations.config.root / self.relative_installed_path
         logging.debug("Using Heroic %s installed.json path %s", self.name, path)
         return path
 
@@ -175,7 +173,7 @@ class StoreSubSourceIterable(SubSourceIterable):
     def is_installed(self, app_name: str) -> bool:
         return app_name in self.installed_app_names
 
-    def process_library_entry(self, entry, added_time):
+    def process_library_entry(self, entry):
         # Skip games that are not installed
         app_name = entry["app_name"]
         if not self.is_installed(app_name):
@@ -187,7 +185,7 @@ class StoreSubSourceIterable(SubSourceIterable):
             )
             return None
         # Process entry as normal
-        return super().process_library_entry(entry, added_time)
+        return super().process_library_entry(entry)
 
     def __iter__(self):
         """
@@ -218,15 +216,12 @@ class LegendaryIterable(StoreSubSourceIterable):
 
     @cached_property
     def installed_path(self) -> Path:
-        """
-        Get the right path depending on the Heroic version
+        """Get the right path depending on the Heroic version"""
+        # TODO after Heroic 2.9 has been out for a while
+        # We should use the commented out relative_installed_path
+        # and remove this property override.
 
-        TODO after heroic 2.9 has been out for a while
-        We should use the commented out relative_installed_path
-        and remove this property override.
-        """
-
-        heroic_config_path = self.source.config_location.root
+        heroic_config_path = self.source.locations.config.root
         # Heroic >= 2.9
         if (path := heroic_config_path / "legendaryConfig").is_dir():
             logging.debug("Using Heroic >= 2.9 legendary file")
@@ -238,7 +233,7 @@ class LegendaryIterable(StoreSubSourceIterable):
         else:
             # Heroic native
             logging.debug("Using Heroic native <= 2.8 legendary file")
-            path = Path.home() / ".config"
+            path = shared.host_config_dir
 
         path = path / "legendary" / "installed.json"
         logging.debug("Using Heroic %s installed.json path %s", self.name, path)
@@ -308,7 +303,7 @@ class HeroicSourceIterable(SourceIterable):
         """
 
         try:
-            store = path_json_load(self.source.config_location["store_config.json"])
+            store = path_json_load(self.source.locations.config["store_config.json"])
             self.hidden_app_names = {
                 app_name
                 for game in store["games"]["hidden"]
@@ -349,29 +344,45 @@ class HeroicSourceIterable(SourceIterable):
                 continue
 
 
+class HeroicLocations(NamedTuple):
+    config: Location
+
+
 class HeroicSource(URLExecutableSource):
     """Generic Heroic Games Launcher source"""
 
+    source_id = "heroic"
     name = _("Heroic")
     iterable_class = HeroicSourceIterable
-    url_format = "heroic://launch/{app_name}"
-    available_on = {"linux", "win32"}
+    url_format = "heroic://launch/{runner}/{app_name}"
+    available_on = {"linux", "win32", "darwin"}
 
-    config_location = Location(
-        schema_key="heroic-location",
-        candidates=(
-            shared.config_dir / "heroic",
-            shared.home / ".config" / "heroic",
-            shared.flatpak_dir / "com.heroicgameslauncher.hgl" / "config" / "heroic",
-            shared.appdata_dir / "heroic",
-        ),
-        paths={
-            "config.json": (False, "config.json"),
-            "store_config.json": (False, Path("store") / "config.json"),
-        },
-    )
+    locations: HeroicLocations
 
     @property
     def game_id_format(self) -> str:
         """The string format used to construct game IDs"""
-        return self.id + "_{service}_{game_id}"
+        return self.source_id + "_{service}_{game_id}"
+
+    def __init__(self) -> None:
+        super().__init__()
+        self.locations = HeroicLocations(
+            Location(
+                schema_key="heroic-location",
+                candidates=(
+                    shared.config_dir / "heroic",
+                    shared.host_config_dir / "heroic",
+                    shared.flatpak_dir
+                    / "com.heroicgameslauncher.hgl"
+                    / "config"
+                    / "heroic",
+                    shared.appdata_dir / "heroic",
+                    shared.app_support_dir / "heroic",
+                ),
+                paths={
+                    "config.json": LocationSubPath("config.json"),
+                    "store_config.json": LocationSubPath("store/config.json"),
+                },
+                invalid_subtitle=Location.CONFIG_INVALID_SUBTITLE,
+            )
+        )

cartridges/importer/importer.py

@@ -0,0 +1,445 @@
+# importer.py
+#
+# Copyright 2022-2023 kramo
+# Copyright 2023 Geoffrey Coulaud
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import logging
+from time import time
+from typing import Any, Optional
+
+from gi.repository import Adw, Gio, GLib, Gtk
+
+from cartridges import shared
+from cartridges.errors.error_producer import ErrorProducer
+from cartridges.errors.friendly_error import FriendlyError
+from cartridges.game import Game
+from cartridges.importer.location import UnresolvableLocationError
+from cartridges.importer.source import Source
+from cartridges.store.managers.async_manager import AsyncManager
+from cartridges.store.pipeline import Pipeline
+
+
+# pylint: disable=too-many-instance-attributes
+class Importer(ErrorProducer):
+    """A class in charge of scanning sources for games"""
+
+    progressbar: Gtk.ProgressBar
+    import_statuspage: Adw.StatusPage
+    import_dialog: Adw.AlertDialog
+    summary_toast: Optional[Adw.Toast] = None
+
+    sources: set[Source]
+
+    n_source_tasks_created: int = 0
+    n_source_tasks_done: int = 0
+    n_pipelines_done: int = 0
+    game_pipelines: set[Pipeline]
+
+    removed_game_ids: set[str]
+    imported_game_ids: set[str]
+
+    close_attempt_id: int
+
+    def __init__(self) -> None:
+        super().__init__()
+
+        shared.import_time = int(time())
+
+        # TODO: make this stateful
+        shared.store.new_game_ids = set()
+        shared.store.duplicate_game_ids = set()
+
+        self.removed_game_ids = set()
+        self.imported_game_ids = set()
+
+        self.game_pipelines = set()
+        self.sources = set()
+
+    @property
+    def n_games_added(self) -> int:
+        return sum(
+            1 if not (pipeline.game.blacklisted or pipeline.game.removed) else 0
+            for pipeline in self.game_pipelines
+        )
+
+    @property
+    def pipelines_progress(self) -> float:
+        progress = sum(pipeline.progress for pipeline in self.game_pipelines)
+        try:
+            progress = progress / len(self.game_pipelines)
+        except ZeroDivisionError:
+            progress = 0
+        return progress  # type: ignore
+
+    @property
+    def sources_progress(self) -> float:
+        try:
+            progress = self.n_source_tasks_done / self.n_source_tasks_created
+        except ZeroDivisionError:
+            progress = 0
+        return progress
+
+    @property
+    def finished(self) -> bool:
+        return (
+            self.n_source_tasks_created == self.n_source_tasks_done
+            and len(self.game_pipelines) == self.n_pipelines_done
+        )
+
+    def add_source(self, source: Source) -> None:
+        self.sources.add(source)
+
+    def run(self) -> None:
+        """Use several Gio.Task to import games from added sources"""
+        shared.win.get_application().state = shared.AppState.IMPORT
+
+        if self.__class__.summary_toast:
+            self.__class__.summary_toast.dismiss()
+
+        shared.win.get_application().lookup_action("import").set_enabled(False)
+        shared.win.get_application().lookup_action("add_game").set_enabled(False)
+        shared.win.get_application().lookup_action("preferences").set_enabled(False)
+
+        self.n_pipelines_done = 0
+        self.n_source_tasks_done = 0
+
+        self.create_dialog()
+        GLib.timeout_add(100, self.monitor_import)
+        GLib.timeout_add(100, self.__watchdog)
+
+        # Collect all errors and reset the cancellables for the managers
+        # - Only one importer exists at any given time
+        # - Every import starts fresh
+        self.collect_errors()
+        for manager in shared.store.managers.values():
+            manager.collect_errors()
+            if isinstance(manager, AsyncManager):
+                manager.reset_cancellable()
+
+        for source in self.sources:
+            logging.debug("Importing games from source %s", source.source_id)
+            task = Gio.Task.new(None, None, self.source_callback, (source,))
+            self.n_source_tasks_created += 1
+            task.run_in_thread(
+                lambda _task,
+                _obj,
+                _data,
+                _cancellable,
+                src=source: self.source_task_thread_func((src,))
+            )
+
+    # Workaround: Adw bug: Dialog won't close if closed too soon after opening
+    def __watchdog(self) -> bool:
+        """Make sure import dialog closes when import is finished"""
+        if not self.finished:
+            return True
+
+        self.import_dialog.force_close()
+        return shared.win.get_visible_dialog() == self.import_dialog
+
+    def monitor_import(self) -> bool:
+        """Monitor import progress to update dialog and to trigger import cleanup
+        once the work has finished"""
+        if not self.finished:
+            self.update_progressbar()
+            return True
+
+        self.finish_import()
+        return False
+
+    def finish_import(self) -> None:
+        """Callback called when importing has finished"""
+        logging.info("Import done")
+        self.remove_games()
+        self.imported_game_ids = shared.store.new_game_ids
+        shared.store.new_game_ids = set()
+        shared.store.duplicate_game_ids = set()
+        # Disconnect the close-attempt signal that closes the main window
+        self.import_dialog.disconnect(self.close_attempt_id)
+        # Workaround: Dialog won't close if closed too soon after opening.
+        self.import_dialog.force_close()
+        self.__class__.summary_toast = self.create_summary_toast()
+        self.create_error_dialog()
+        shared.win.get_application().lookup_action("import").set_enabled(True)
+        shared.win.get_application().lookup_action("add_game").set_enabled(True)
+        shared.win.get_application().lookup_action("preferences").set_enabled(True)
+        shared.win.get_application().state = shared.AppState.DEFAULT
+        shared.win.create_source_rows()
+
+    def remove_games(self) -> None:
+        """Set removed to True for missing games"""
+        if not shared.schema.get_boolean("remove-missing"):
+            return
+
+        keys = shared.schema.list_keys()
+
+        for game in shared.store:
+            if game.removed:
+                continue
+            if game.source == "imported":
+                continue
+            if (game.base_source in keys) and (
+                not shared.schema.get_boolean(game.base_source)
+            ):
+                continue
+            if game.game_id in shared.store.duplicate_game_ids:
+                continue
+            if game.game_id in shared.store.new_game_ids:
+                continue
+
+            logging.debug("Removing missing game %s (%s)", game.name, game.game_id)
+
+            game.removed = True
+            game.save()
+            game.update()
+            self.removed_game_ids.add(game.game_id)
+
+    """Import Actions — Threaded; None of this should touch GUI"""
+
+    def source_task_thread_func(self, data: tuple) -> None:
+        """Source import task code"""
+
+        source: Source
+        source, *_rest = data
+
+        # Early exit if not available or not installed
+        if not source.is_available:
+            logging.info("Source %s skipped, not available", source.source_id)
+            return
+        try:
+            iterator = iter(source)
+        except UnresolvableLocationError:
+            logging.info("Source %s skipped, bad location", source.source_id)
+            return
+
+        # Get games from source
+        logging.info("Scanning source %s", source.source_id)
+        while True:
+            # Handle exceptions raised when iterating
+            try:
+                iteration_result = next(iterator)
+            except StopIteration:
+                break
+            except Exception as error:  # pylint: disable=broad-exception-caught
+                logging.exception("%s in %s", type(error).__name__, source.source_id)
+                self.report_error(error)
+                continue
+
+            # Handle the result depending on its type
+            if isinstance(iteration_result, Game):
+                game = iteration_result
+                additional_data = {}
+            elif isinstance(iteration_result, tuple):
+                game, additional_data = iteration_result
+            elif iteration_result is None:
+                continue
+            else:
+                # Warn source implementers that an invalid type was produced
+                # Should not happen on production code
+                logging.warning(
+                    "%s produced an invalid iteration return type %s",
+                    source.source_id,
+                    type(iteration_result),
+                )
+                continue
+
+            # Register game
+            pipeline: Pipeline = shared.store.add_game(game, additional_data)
+            if pipeline is not None:
+                logging.info("Imported %s (%s)", game.name, game.game_id)
+                pipeline.connect(
+                    "advanced",
+                    self.pipeline_advanced_callback,
+                )
+                self.game_pipelines.add(pipeline)
+
+    def source_callback(self, _obj: Any, _result: Any, data: tuple) -> None:
+        """Callback executed when a source is fully scanned"""
+        source, *_rest = data
+        logging.debug("Import done for source %s", source.source_id)
+        self.n_source_tasks_done += 1
+
+    def pipeline_advanced_callback(self, pipeline: Pipeline) -> None:
+        """Callback called when a pipeline for a game has advanced"""
+        if pipeline.is_done:
+            self.n_pipelines_done += 1
+
+    """GUI Actions"""
+
+    def create_dialog(self) -> None:
+        """Create the import dialog"""
+        self.progressbar = Gtk.ProgressBar(margin_start=12, margin_end=12)
+        self.import_statuspage = Adw.StatusPage(
+            title=_("Importing Games…"),
+            child=self.progressbar,
+        )
+        self.import_dialog = Adw.Dialog(
+            child=self.import_statuspage,
+            content_width=350,
+            can_close=False,
+        )
+
+        self.close_attempt_id = self.import_dialog.connect(
+            "close-attempt", lambda *_: shared.win.close()
+        )
+
+        self.import_dialog.present(shared.win)
+
+    def update_progressbar(self) -> None:
+        """Update the progressbar to show the overall import progress"""
+        # Reserve 10% for the sources discovery, the rest is the pipelines
+        self.progressbar.set_fraction(
+            (0.1 * self.sources_progress) + (0.9 * self.pipelines_progress)
+        )
+
+    def create_error_dialog(self) -> None:
+        """Dialog containing all errors raised by importers"""
+
+        # Collect all errors that happened in the importer and the managers
+        errors = []
+        errors.extend(self.collect_errors())
+        for manager in shared.store.managers.values():
+            errors.extend(manager.collect_errors())
+
+        # Filter out non friendly errors
+        errors = set(
+            tuple(
+                (error.title, error.subtitle)
+                for error in (
+                    filter(lambda error: isinstance(error, FriendlyError), errors)
+                )
+            )
+        )
+
+        # No error to display
+        if not errors:
+            self.timeout_toast()
+            return
+
+        # Create error dialog
+        dialog = Adw.AlertDialog()
+        dialog.set_heading(_("Warning"))
+        dialog.add_response("close", _("Dismiss"))
+        dialog.add_response("open_preferences_import", _("Preferences"))
+        dialog.set_default_response("open_preferences_import")
+        dialog.connect("response", self.dialog_response_callback)
+
+        if len(errors) == 1:
+            dialog.set_heading((error := next(iter(errors)))[0])
+            dialog.set_body(error[1])
+        else:
+            # Display the errors in a list
+            list_box = Gtk.ListBox()
+            list_box.set_selection_mode(Gtk.SelectionMode.NONE)
+            list_box.set_css_classes(["boxed-list"])
+            list_box.set_margin_top(9)
+            for error in errors:
+                row = Adw.ActionRow.new()
+                row.set_title(error[0])
+                row.set_subtitle(error[1])
+                list_box.append(row)
+            dialog.set_body(_("The following errors occured during import:"))
+            dialog.set_extra_child(list_box)
+
+        dialog.present(shared.win)
+
+    def undo_import(self, *_args: Any) -> None:
+        for game_id in self.imported_game_ids:
+            shared.store[game_id].removed = True
+            shared.store[game_id].update()
+            shared.store[game_id].save()
+
+        for game_id in self.removed_game_ids:
+            shared.store[game_id].removed = False
+            shared.store[game_id].update()
+            shared.store[game_id].save()
+
+        self.imported_game_ids = set()
+        self.removed_game_ids = set()
+        if self.__class__.summary_toast:
+            self.__class__.summary_toast.dismiss()
+
+        logging.info("Import undone")
+
+    def create_summary_toast(self) -> Adw.Toast:
+        """N games imported, removed toast"""
+
+        toast = Adw.Toast(timeout=0, priority=Adw.ToastPriority.HIGH)
+
+        if not self.n_games_added:
+            toast_title = _("No new games found")
+
+            if not self.removed_game_ids:
+                toast.set_button_label(_("Preferences"))
+                toast.connect(
+                    "button-clicked",
+                    self.dialog_response_callback,
+                    "open_preferences",
+                    "import",
+                )
+
+        elif self.n_games_added >= 1:
+            # The variable is the number of games.
+            toast_title = ngettext(
+                "{} game imported", "{} games imported", self.n_games_added
+            ).format(self.n_games_added)
+
+        if (removed_length := len(self.removed_game_ids)) >= 1:
+            # The variable is the number of games. This text comes after "{0} games imported".
+            toast_title += ngettext(
+                ", {} removed", ", {} removed", removed_length
+            ).format(removed_length)
+
+        if self.n_games_added or self.removed_game_ids:
+            toast.set_button_label(_("Undo"))
+            toast.connect("button-clicked", self.undo_import)
+
+        toast.set_title(toast_title)
+
+        if not (
+            self.n_games_added == 0
+            and removed_length == 0
+            and shared.schema.get_boolean("auto-import")
+        ):
+            shared.win.toast_overlay.add_toast(toast)
+
+        return toast
+
+    def open_preferences(
+        self,
+        page_name: Optional[str] = None,
+        expander_row: Optional[Adw.ExpanderRow] = None,
+    ) -> Adw.PreferencesDialog:
+        return shared.win.get_application().on_preferences_action(
+            page_name=page_name, expander_row=expander_row
+        )
+
+    def timeout_toast(self, *_args: Any) -> None:
+        """Manually timeout the toast after the user has dismissed all warnings"""
+        if self.__class__.summary_toast:
+            GLib.timeout_add_seconds(5, self.__class__.summary_toast.dismiss)
+
+    def dialog_response_callback(self, _widget: Any, response: str, *args: Any) -> None:
+        """Handle after-import dialogs callback"""
+        logging.debug("After-import dialog response: %s (%s)", response, str(args))
+        if response == "open_preferences":
+            self.open_preferences(*args)
+        elif response == "open_preferences_import":
+            self.open_preferences(*args).connect("close-request", self.timeout_toast)
+        else:
+            self.timeout_toast()

cartridges/importer/itch_source.py

@@ -20,13 +20,13 @@
 
 from shutil import rmtree
 from sqlite3 import connect
-from time import time
+from typing import NamedTuple
 
-from src import shared
-from src.game import Game
-from src.importer.sources.location import Location
-from src.importer.sources.source import SourceIterable, URLExecutableSource
-from src.utils.sqlite import copy_db
+from cartridges import shared
+from cartridges.game import Game
+from cartridges.importer.location import Location, LocationSubPath
+from cartridges.importer.source import SourceIterable, URLExecutableSource
+from cartridges.utils.sqlite import copy_db
 
 
 class ItchSourceIterable(SourceIterable):
@@ -51,20 +51,18 @@ class ItchSourceIterable(SourceIterable):
             caves.game_id = games.id
         ;
         """
-        db_path = copy_db(self.source.config_location["butler.db"])
+        db_path = copy_db(self.source.locations.config["butler.db"])
         connection = connect(db_path)
         cursor = connection.execute(db_request)
 
-        added_time = int(time())
-
         # Create games from the db results
         for row in cursor:
             values = {
-                "added": added_time,
-                "source": self.source.id,
+                "added": shared.import_time,
+                "source": self.source.source_id,
                 "name": row[1],
                 "game_id": self.source.game_id_format.format(game_id=row[0]),
-                "executable": self.source.executable_format.format(cave_id=row[4]),
+                "executable": self.source.make_executable(cave_id=row[4]),
             }
             additional_data = {"online_cover_url": row[3] or row[2]}
             game = Game(values)
@@ -74,19 +72,34 @@ class ItchSourceIterable(SourceIterable):
         rmtree(str(db_path.parent))
 
 
+class ItchLocations(NamedTuple):
+    config: Location
+
+
 class ItchSource(URLExecutableSource):
+    source_id = "itch"
     name = _("itch")
     iterable_class = ItchSourceIterable
     url_format = "itch://caves/{cave_id}/launch"
-    available_on = {"linux", "win32"}
+    available_on = {"linux", "win32", "darwin"}
 
-    config_location = Location(
-        schema_key="itch-location",
-        candidates=(
-            shared.flatpak_dir / "io.itch.itch" / "config" / "itch",
-            shared.config_dir / "itch",
-            shared.home / ".config" / "itch",
-            shared.appdata_dir / "itch",
-        ),
-        paths={"butler.db": (False, "db/butler.db")},
-    )
+    locations: ItchLocations
+
+    def __init__(self) -> None:
+        super().__init__()
+        self.locations = ItchLocations(
+            Location(
+                schema_key="itch-location",
+                candidates=(
+                    shared.flatpak_dir / "io.itch.itch" / "config" / "itch",
+                    shared.config_dir / "itch",
+                    shared.host_config_dir / "itch",
+                    shared.appdata_dir / "itch",
+                    shared.app_support_dir / "itch",
+                ),
+                paths={
+                    "butler.db": LocationSubPath("db/butler.db"),
+                },
+                invalid_subtitle=Location.CONFIG_INVALID_SUBTITLE,
+            )
+        )

cartridges/importer/legendary_source.py

@@ -20,20 +20,22 @@
 import json
 import logging
 from json import JSONDecodeError
-from time import time
+from typing import NamedTuple
 
-from src import shared
-from src.game import Game
-from src.importer.sources.location import Location
-from src.importer.sources.source import Source, SourceIterationResult, SourceIterable
+from cartridges import shared
+from cartridges.game import Game
+from cartridges.importer.location import Location, LocationSubPath
+from cartridges.importer.source import (
+    ExecutableFormatSource,
+    SourceIterable,
+    SourceIterationResult,
+)
 
 
 class LegendarySourceIterable(SourceIterable):
     source: "LegendarySource"
 
-    def game_from_library_entry(
-        self, entry: dict, added_time: int
-    ) -> SourceIterationResult:
+    def game_from_library_entry(self, entry: dict) -> SourceIterationResult:
         # Skip non-games
         if entry["is_dlc"]:
             return None
@@ -41,16 +43,16 @@ class LegendarySourceIterable(SourceIterable):
         # Build game
         app_name = entry["app_name"]
         values = {
-            "added": added_time,
-            "source": self.source.id,
+            "added": shared.import_time,
+            "source": self.source.source_id,
             "name": entry["title"],
             "game_id": self.source.game_id_format.format(game_id=app_name),
-            "executable": self.source.executable_format.format(app_name=app_name),
+            "executable": self.source.make_executable(app_name=app_name),
         }
         data = {}
 
         # Get additional metadata from file (optional)
-        metadata_file = self.source.config_location["metadata"] / f"{app_name}.json"
+        metadata_file = self.source.locations.config["metadata"] / f"{app_name}.json"
         try:
             metadata = json.load(metadata_file.open())
             values["developer"] = metadata["metadata"]["developer"]
@@ -66,19 +68,17 @@ class LegendarySourceIterable(SourceIterable):
 
     def __iter__(self):
         # Open library
-        file = self.source.config_location["installed.json"]
+        file = self.source.locations.config["installed.json"]
         try:
             library: dict = json.load(file.open())
         except (JSONDecodeError, OSError):
             logging.warning("Couldn't open Legendary file: %s", str(file))
             return
 
-        added_time = int(time())
-
         # Generate games from library
         for entry in library.values():
             try:
-                result = self.game_from_library_entry(entry, added_time)
+                result = self.game_from_library_entry(entry)
             except KeyError as error:
                 # Skip invalid games
                 logging.warning(
@@ -88,20 +88,32 @@ class LegendarySourceIterable(SourceIterable):
             yield result
 
 
-class LegendarySource(Source):
+class LegendaryLocations(NamedTuple):
+    config: Location
+
+
+class LegendarySource(ExecutableFormatSource):
+    source_id = "legendary"
     name = _("Legendary")
     executable_format = "legendary launch {app_name}"
     available_on = {"linux"}
-
     iterable_class = LegendarySourceIterable
-    config_location: Location = Location(
-        schema_key="legendary-location",
-        candidates=(
-            shared.config_dir / "legendary",
-            shared.home / ".config" / "legendary",
-        ),
-        paths={
-            "installed.json": (False, "installed.json"),
-            "metadata": (True, "metadata"),
-        },
-    )
+
+    locations: LegendaryLocations
+
+    def __init__(self) -> None:
+        super().__init__()
+        self.locations = LegendaryLocations(
+            Location(
+                schema_key="legendary-location",
+                candidates=(
+                    shared.config_dir / "legendary",
+                    shared.host_config_dir / "legendary",
+                ),
+                paths={
+                    "installed.json": LocationSubPath("installed.json"),
+                    "metadata": LocationSubPath("metadata", True),
+                },
+                invalid_subtitle=Location.CONFIG_INVALID_SUBTITLE,
+            )
+        )

cartridges/importer/location.py

@@ -1,17 +1,23 @@
 import logging
-from pathlib import Path
-from typing import Callable, Mapping, Iterable
 from os import PathLike
+from pathlib import Path
+from typing import Iterable, Mapping, NamedTuple, Optional
 
-from src import shared
+from cartridges import shared
 
 PathSegment = str | PathLike | Path
 PathSegments = Iterable[PathSegment]
-Candidate = PathSegments | Callable[[], PathSegments]
+Candidate = PathSegments
+
+
+class LocationSubPath(NamedTuple):
+    segment: PathSegment
+    is_directory: bool = False
 
 
 class UnresolvableLocationError(Exception):
-    pass
+    def __init__(self, optional: Optional[bool] = False):
+        self.optional = optional
 
 
 class Location:
@@ -24,37 +30,50 @@ class Location:
     * When resolved, the schema is updated with the picked chosen
     """
 
+    # The variable is the name of the source
+    CACHE_INVALID_SUBTITLE = _("Select the {} cache directory.")
+    # The variable is the name of the source
+    CONFIG_INVALID_SUBTITLE = _("Select the {} configuration directory.")
+    # The variable is the name of the source
+    DATA_INVALID_SUBTITLE = _("Select the {} data directory.")
+
     schema_key: str
     candidates: Iterable[Candidate]
-    paths: Mapping[str, tuple[bool, PathSegments]]
-    root: Path = None
+    paths: Mapping[str, LocationSubPath]
+    invalid_subtitle: str
+
+    root: Optional[Path] = None
 
     def __init__(
         self,
         schema_key: str,
         candidates: Iterable[Candidate],
-        paths: Mapping[str, tuple[bool, PathSegments]],
+        paths: Mapping[str, LocationSubPath],
+        invalid_subtitle: str,
+        optional: Optional[bool] = False,
     ) -> None:
         super().__init__()
         self.schema_key = schema_key
         self.candidates = candidates
         self.paths = paths
+        self.invalid_subtitle = invalid_subtitle
+        self.optional = optional
 
     def check_candidate(self, candidate: Path) -> bool:
         """Check if a candidate root has the necessary files and directories"""
-        for type_is_dir, subpath in self.paths.values():
-            subpath = Path(candidate) / Path(subpath)
-            if type_is_dir:
-                if not subpath.is_dir():
+        for segment, is_directory in self.paths.values():
+            path = Path(candidate) / segment
+            if is_directory:
+                if not path.is_dir():
                     return False
             else:
-                if not subpath.is_file():
+                if not path.is_file():
                     return False
         return True
 
     def resolve(self) -> None:
         """Choose a root path from the candidates for the location.
-        If none fits, raise a UnresolvableLocationError"""
+        If none fits, raise an UnresolvableLocationError"""
 
         if self.root is not None:
             return
@@ -71,14 +90,22 @@ class Location:
             break
         else:
             # No good candidate found
-            raise UnresolvableLocationError()
+            raise UnresolvableLocationError(self.optional)
 
         # Update the schema with the found candidate
         value = str(candidate)
         shared.schema.set_string(self.schema_key, value)
         logging.debug("Resolved value for schema key %s: %s", self.schema_key, value)
 
-    def __getitem__(self, key: str):
+    def __getitem__(self, key: str) -> Optional[Path]:
         """Get the computed path from its key for the location"""
-        self.resolve()
-        return self.root / self.paths[key][1]
+        try:
+            self.resolve()
+        except UnresolvableLocationError as error:
+            if error.optional:
+                return None
+            raise UnresolvableLocationError from error
+
+        if self.root:
+            return self.root / self.paths[key].segment
+        return None

cartridges/importer/lutris_source.py

@@ -0,0 +1,133 @@
+# lutris_source.py
+#
+# Copyright 2022-2024 kramo
+# Copyright 2023 Geoffrey Coulaud
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+from shutil import rmtree
+from sqlite3 import connect
+from typing import NamedTuple
+
+from cartridges import shared
+from cartridges.game import Game
+from cartridges.importer.location import Location, LocationSubPath
+from cartridges.importer.source import SourceIterable, URLExecutableSource
+from cartridges.utils.sqlite import copy_db
+
+
+class LutrisSourceIterable(SourceIterable):
+    source: "LutrisSource"
+
+    def __iter__(self):
+        """Generator method producing games"""
+
+        # Query the database
+        request = """
+            SELECT
+                games.id,
+                games.name,
+                games.slug,
+                games.runner,
+                categories.name = ".hidden" as hidden
+            FROM
+                games
+            LEFT JOIN
+                games_categories ON games_categories.game_id = games.id
+            FULL JOIN
+                categories ON games_categories.category_id = categories.id
+            WHERE
+                games.name IS NOT NULL
+                AND games.slug IS NOT NULL
+                AND games.configPath IS NOT NULL
+                AND games.installed
+                AND (games.runner IS NOT "steam" OR :import_steam)
+                AND (games.runner IS NOT "flatpak" OR :import_flatpak)
+            ;
+        """
+
+        params = {
+            "import_steam": shared.schema.get_boolean("lutris-import-steam"),
+            "import_flatpak": shared.schema.get_boolean("lutris-import-flatpak"),
+        }
+        db_path = copy_db(self.source.locations.data["pga.db"])
+        connection = connect(db_path)
+        cursor = connection.execute(request, params)
+        coverart_is_dir = (
+            coverart_path := self.source.locations.data.root / "coverart"
+        ).is_dir()
+
+        # Create games from the DB results
+        for row in cursor:
+            # Create game
+            values = {
+                "added": shared.import_time,
+                "hidden": row[4],
+                "name": row[1],
+                "source": f"{self.source.source_id}_{row[3]}",
+                "game_id": self.source.game_id_format.format(
+                    runner=row[3], game_id=row[0]
+                ),
+                "executable": self.source.make_executable(game_id=row[0]),
+            }
+            game = Game(values)
+            additional_data = {}
+
+            # Get official image path
+            if coverart_is_dir:
+                image_path = coverart_path / f"{row[2]}.jpg"
+                additional_data["local_image_path"] = image_path
+
+            yield (game, additional_data)
+
+        # Cleanup
+        rmtree(str(db_path.parent))
+
+
+class LutrisLocations(NamedTuple):
+    data: Location
+
+
+class LutrisSource(URLExecutableSource):
+    """Generic Lutris source"""
+
+    source_id = "lutris"
+    name = _("Lutris")
+    iterable_class = LutrisSourceIterable
+    url_format = "lutris:rungameid/{game_id}"
+    available_on = {"linux"}
+
+    locations: LutrisLocations
+
+    @property
+    def game_id_format(self):
+        return self.source_id + "_{runner}_{game_id}"
+
+    def __init__(self) -> None:
+        super().__init__()
+        self.locations = LutrisLocations(
+            Location(
+                schema_key="lutris-location",
+                candidates=(
+                    shared.flatpak_dir / "net.lutris.Lutris" / "data" / "lutris",
+                    shared.data_dir / "lutris",
+                    shared.host_data_dir / "lutris",
+                ),
+                paths={
+                    "pga.db": LocationSubPath("pga.db"),
+                },
+                invalid_subtitle=Location.DATA_INVALID_SUBTITLE,
+            )
+        )

cartridges/importer/retroarch_source.py

@@ -0,0 +1,255 @@
+# retroarch_source.py
+#
+# Copyright 2023 Rilic
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import json
+import logging
+import re
+from hashlib import md5
+from json import JSONDecodeError
+from pathlib import Path
+from shlex import quote as shell_quote
+from typing import NamedTuple
+
+from cartridges import shared
+from cartridges.errors.friendly_error import FriendlyError
+from cartridges.game import Game
+from cartridges.importer.location import (
+    Location,
+    LocationSubPath,
+    UnresolvableLocationError,
+)
+from cartridges.importer.source import Source, SourceIterable
+from cartridges.importer.steam_source import SteamSource
+
+
+class RetroarchSourceIterable(SourceIterable):
+    source: "RetroarchSource"
+
+    def get_config_value(self, key: str, config_data: str):
+        for item in re.findall(f'{key}\\s*=\\s*"(.*)"\n', config_data, re.IGNORECASE):
+            if item.startswith(":"):
+                item = item.replace(":", str(self.source.locations.config.root))
+
+            logging.debug(str(item))
+            return item
+
+        raise KeyError(f"Key not found in RetroArch config: {key}")
+
+    def __iter__(self):
+        bad_playlists = set()
+
+        config_file = self.source.locations.config["retroarch.cfg"]
+        with config_file.open(encoding="utf-8") as open_file:
+            config_data = open_file.read()
+
+        playlist_folder = Path(
+            self.get_config_value("playlist_directory", config_data)
+        ).expanduser()
+        thumbnail_folder = Path(
+            self.get_config_value("thumbnails_directory", config_data)
+        ).expanduser()
+
+        # Get all playlist files, ending in .lpl
+        playlist_files = playlist_folder.glob("*.lpl")
+
+        for playlist_file in playlist_files:
+            logging.debug(playlist_file)
+            try:
+                with playlist_file.open(
+                    encoding="utf-8",
+                ) as open_file:
+                    playlist_json = json.load(open_file)
+            except (JSONDecodeError, OSError):
+                logging.warning("Cannot read playlist file: %s", str(playlist_file))
+                continue
+
+            for item in playlist_json["items"]:
+                # Select the core.
+                # Try the content's core first, then the playlist's default core.
+                # If none can be used, warn the user and continue.
+                for core_path in (
+                    item["core_path"],
+                    playlist_json["default_core_path"],
+                ):
+                    if core_path not in ("DETECT", ""):
+                        break
+                else:
+                    logging.warning("Cannot find core for: %s", str(item["path"]))
+                    bad_playlists.add(playlist_file.stem)
+                    continue
+
+                # Build game
+                game_id = md5(item["path"].encode("utf-8")).hexdigest()
+
+                values = {
+                    "source": self.source.source_id,
+                    "added": shared.import_time,
+                    "name": item["label"],
+                    "game_id": self.source.game_id_format.format(game_id=game_id),
+                    "executable": self.source.make_executable(
+                        core_path=core_path,
+                        rom_path=item["path"],
+                    ),
+                }
+
+                game = Game(values)
+
+                # Get boxart
+                boxart_image_name = item["label"] + ".png"
+                boxart_image_name = re.sub(r"[&\*\/:`<>\?\\\|]", "_", boxart_image_name)
+                boxart_folder_name = playlist_file.stem
+                image_path = (
+                    thumbnail_folder
+                    / boxart_folder_name
+                    / "Named_Boxarts"
+                    / boxart_image_name
+                )
+                additional_data = {"local_image_path": image_path}
+
+                yield (game, additional_data)
+
+        if bad_playlists:
+            raise FriendlyError(
+                _("No RetroArch Core Selected"),
+                # The variable is a newline separated list of playlists
+                _("The following playlists have no default core:")
+                + "\n\n{}\n\n".format("\n".join(bad_playlists))
+                + _("Games with no core selected were not imported"),
+            )
+
+
+class RetroarchLocations(NamedTuple):
+    config: Location
+
+
+class RetroarchSource(Source):
+    name = _("RetroArch")
+    source_id = "retroarch"
+    available_on = {"linux"}
+    iterable_class = RetroarchSourceIterable
+
+    locations: RetroarchLocations
+
+    def __init__(self) -> None:
+        super().__init__()
+        self.locations = RetroarchLocations(
+            Location(
+                schema_key="retroarch-location",
+                candidates=[
+                    shared.flatpak_dir
+                    / "org.libretro.RetroArch"
+                    / "config"
+                    / "retroarch",
+                    shared.config_dir / "retroarch",
+                    shared.host_config_dir / "retroarch",
+                    # TODO: Windows support, waiting for executable path setting improvement
+                    # Path("C:\\RetroArch-Win64"),
+                    # Path("C:\\RetroArch-Win32"),
+                    # TODO: UWP support (URL handler - https://github.com/libretro/RetroArch/pull/13563)
+                    # shared.local_appdata_dir
+                    # / "Packages"
+                    # / "1e4cf179-f3c2-404f-b9f3-cb2070a5aad8_8ngdn9a6dx1ma"
+                    # / "LocalState",
+                ],
+                paths={
+                    "retroarch.cfg": LocationSubPath("retroarch.cfg"),
+                },
+                invalid_subtitle=Location.CONFIG_INVALID_SUBTITLE,
+            )
+        )
+        # TODO enable when we get the Steam RetroArch games working
+        # self.add_steam_location_candidate()
+
+    def add_steam_location_candidate(self) -> None:
+        """Add the Steam RetroAcrh location to the config candidates"""
+        try:
+            self.locations.config.candidates.append(self.get_steam_location())
+        except (OSError, KeyError, UnresolvableLocationError):
+            logging.debug("Steam isn't installed")
+        except ValueError as error:
+            logging.debug("RetroArch Steam location candiate not found", exc_info=error)
+
+    def get_steam_location(self) -> str:
+        """
+        Get the RetroArch installed via Steam location
+
+        :raise UnresolvableLocationError: if Steam isn't installed
+        :raise KeyError: if there is no libraryfolders.vdf subpath
+        :raise OSError: if libraryfolders.vdf can't be opened
+        :raise ValueError: if RetroArch isn't installed through Steam
+        """
+
+        # Find Steam location
+        libraryfolders = SteamSource().locations.data["libraryfolders.vdf"]
+        parse_apps = False
+        with open(libraryfolders, "r", encoding="utf-8") as open_file:
+            # Search each line for a library path and store it each time a new one is found.
+            for line in open_file:
+                if '"path"' in line:
+                    library_path = re.findall(
+                        '"path"\\s+"(.*)"\n', line, re.IGNORECASE
+                    )[0]
+                elif '"apps"' in line:
+                    parse_apps = True
+                elif parse_apps and "}" in line:
+                    parse_apps = False
+                # Stop searching, as the library path directly above the appid has been found.
+                elif parse_apps and '"1118310"' in line:
+                    return Path(f"{library_path}/steamapps/common/RetroArch")
+        # Not found
+        raise ValueError("RetroArch not found in Steam library")
+
+    def make_executable(self, core_path: Path, rom_path: Path) -> str:
+        """
+        Generate an executable command from the rom path and core path,
+        depending on the source's location.
+
+        The format depends on RetroArch's installation method,
+        detected from the source config location
+
+        :param Path rom_path: the game's rom path
+        :param Path core_path: the game's core path
+        :return str: an executable command
+        """
+
+        self.locations.config.resolve()
+        args = ("-L", core_path, rom_path)
+
+        # Steam RetroArch
+        # (Must check before Flatpak, because Steam itself can be installed as one)
+        # TODO enable when we get Steam RetroArch executable to work
+        # if self.locations.config.root.parent.parent.name == "steamapps":
+        #     # steam://run exepects args to be url-encoded and separated by spaces.
+        #     args = map(lambda s: url_quote(str(s), safe=""), args)
+        #     args_str = " ".join(args)
+        #     uri = f"steam://run/1118310//{args_str}/"
+        #     return f"xdg-open {shell_quote(uri)}"
+
+        # Flatpak RetroArch
+        args = map(lambda s: shell_quote(str(s)), args)
+        args_str = " ".join(args)
+        if self.locations.config.root.is_relative_to(shared.flatpak_dir):
+            return f"flatpak run org.libretro.RetroArch {args_str}"
+
+        # TODO executable override for non-sandboxed sources
+
+        # Linux native RetroArch
+        return f"retroarch {args_str}"
+
+        # TODO implement for windows (needs override)

cartridges/importer/source.py

@@ -19,20 +19,20 @@
 
 import sys
 from abc import abstractmethod
-from collections.abc import Iterable, Iterator
-from typing import Any, Generator, Optional
+from collections.abc import Iterable
+from typing import Any, Collection, Generator, Optional
 
-from src.game import Game
-from src.importer.sources.location import Location
+from cartridges.game import Game
+from cartridges.importer.location import Location, UnresolvableLocationError
 
 # Type of the data returned by iterating on a Source
-SourceIterationResult = None | Game | tuple[Game, tuple[Any]]
+SourceIterationResult = Optional[Game | tuple[Game, tuple[Any]]]
 
 
 class SourceIterable(Iterable):
     """Data producer for a source of games"""
 
-    source: "Source" = None
+    source: "Source"
 
     def __init__(self, source: "Source") -> None:
         self.source = source
@@ -51,71 +51,84 @@ class SourceIterable(Iterable):
 class Source(Iterable):
     """Source of games. E.g an installed app with a config file that lists game directories"""
 
+    source_id: str
     name: str
-    variant: str = None
+    variant: Optional[str] = None
     available_on: set[str] = set()
-    data_location: Optional[Location] = None
-    cache_location: Optional[Location] = None
-    config_location: Optional[Location] = None
     iterable_class: type[SourceIterable]
 
+    # NOTE: Locations must be set at __init__ time, not in the class definition.
+    # They must not be shared between source instances.
+    locations: Collection[Location]
+
     @property
     def full_name(self) -> str:
         """The source's full name"""
         full_name_ = self.name
-        if self.variant is not None:
+        if self.variant:
             full_name_ += f" ({self.variant})"
         return full_name_
 
-    @property
-    def id(self) -> str:  # pylint: disable=invalid-name
-        """The source's identifier"""
-        id_ = self.name.lower()
-        if self.variant is not None:
-            id_ += f"_{self.variant.lower()}"
-        return id_
-
     @property
     def game_id_format(self) -> str:
         """The string format used to construct game IDs"""
-        return self.id + "_{game_id}"
+        return self.source_id + "_{game_id}"
 
     @property
-    def is_available(self):
-        return sys.platform in self.available_on
+    def is_available(self) -> bool:
+        return any(sys.platform.startswith(platform) for platform in self.available_on)
+
+    def make_executable(self, *args, **kwargs) -> str:
+        """
+        Create a game executable command.
+        Should be implemented by child classes.
+        """
+
+    def __iter__(self) -> Generator[SourceIterationResult, None, None]:
+        """
+        Get an iterator for the source
+        :raises UnresolvableLocationError: Not iterable
+        if any of the mandatory locations are unresolvable
+        """
+        for location in self.locations:
+            try:
+                location.resolve()
+            except UnresolvableLocationError as error:
+                if not error.optional:
+                    raise UnresolvableLocationError from error
+        return iter(self.iterable_class(self))
+
+
+class ExecutableFormatSource(Source):
+    """Source class that uses a simple executable format to start games"""
 
     @property
     @abstractmethod
     def executable_format(self) -> str:
         """The executable format used to construct game executables"""
 
-    def __iter__(self) -> Generator[SourceIterationResult, None, None]:
-        """
-        Get an iterator for the source
-        :raises UnresolvableLocationError: Not iterable if any of the locations are unresolvable
-        """
-        for location_name in ("data", "cache", "config"):
-            location = getattr(self, f"{location_name}_location", None)
-            if location is None:
-                continue
-            location.resolve()
-        return iter(self.iterable_class(self))
+    def make_executable(self, *args, **kwargs) -> str:
+        """Use the executable format to"""
+        return self.executable_format.format(*args, **kwargs)
 
 
 # pylint: disable=abstract-method
-class URLExecutableSource(Source):
+class URLExecutableSource(ExecutableFormatSource):
     """Source class that use custom URLs to start games"""
 
     url_format: str
 
     @property
     def executable_format(self) -> str:
-        match sys.platform:
-            case "win32":
-                return "start " + self.url_format
-            case "linux":
-                return "xdg-open " + self.url_format
-            case other:
-                raise NotImplementedError(
-                    f"No URL handler command available for {other}"
-                )
+        if sys.platform.startswith("win32"):
+            return f"start {self.url_format}"
+
+        if sys.platform.startswith("linux"):
+            return f"xdg-open {self.url_format}"
+
+        if sys.platform.startswith("darwin"):
+            return f"open {self.url_format}"
+
+        raise NotImplementedError(
+            f"No URL handler command available for {sys.platform}"
+        )

cartridges/importer/steam_source.py

@@ -21,22 +21,21 @@
 import logging
 import re
 from pathlib import Path
-from time import time
-from typing import Iterable
+from typing import Iterable, NamedTuple
 
-from src import shared
-from src.game import Game
-from src.importer.sources.location import Location
-from src.importer.sources.source import SourceIterable, URLExecutableSource
-from src.utils.steam import SteamFileHelper, SteamInvalidManifestError
+from cartridges import shared
+from cartridges.game import Game
+from cartridges.importer.location import Location, LocationSubPath
+from cartridges.importer.source import SourceIterable, URLExecutableSource
+from cartridges.utils.steam import SteamFileHelper, SteamInvalidManifestError
 
 
 class SteamSourceIterable(SourceIterable):
     source: "SteamSource"
 
     def get_manifest_dirs(self) -> Iterable[Path]:
-        """Get dirs that contain steam app manifests"""
-        libraryfolders_path = self.source.data_location["libraryfolders.vdf"]
+        """Get dirs that contain Steam app manifests"""
+        libraryfolders_path = self.source.locations.data["libraryfolders.vdf"]
         with open(libraryfolders_path, "r", encoding="utf-8") as file:
             contents = file.read()
         return [
@@ -64,8 +63,6 @@ class SteamSourceIterable(SourceIterable):
         appid_cache = set()
         manifests = self.get_manifests()
 
-        added_time = int(time())
-
         for manifest in manifests:
             # Get metadata from manifest
             steam = SteamFileHelper()
@@ -90,41 +87,56 @@ class SteamSourceIterable(SourceIterable):
 
             # Build game from local data
             values = {
-                "added": added_time,
+                "added": shared.import_time,
                 "name": local_data["name"],
-                "source": self.source.id,
+                "source": self.source.source_id,
                 "game_id": self.source.game_id_format.format(game_id=appid),
-                "executable": self.source.executable_format.format(game_id=appid),
+                "executable": self.source.make_executable(game_id=appid),
             }
             game = Game(values)
 
             # Add official cover image
             image_path = (
-                self.source.data_location["librarycache"]
-                / f"{appid}_library_600x900.jpg"
+                self.source.locations.data["librarycache"]
+                / appid
+                / "library_600x900.jpg"
             )
             additional_data = {"local_image_path": image_path, "steam_appid": appid}
 
-            # Produce game
             yield (game, additional_data)
 
 
+class SteamLocations(NamedTuple):
+    data: Location
+
+
 class SteamSource(URLExecutableSource):
+    source_id = "steam"
     name = _("Steam")
-    available_on = {"linux", "win32"}
+    available_on = {"linux", "win32", "darwin"}
     iterable_class = SteamSourceIterable
     url_format = "steam://rungameid/{game_id}"
 
-    data_location = Location(
-        schema_key="steam-location",
-        candidates=(
-            shared.home / ".steam" / "steam",
-            shared.data_dir / "Steam",
-            shared.flatpak_dir / "com.valvesoftware.Steam" / "data" / "Steam",
-            shared.programfiles32_dir / "Steam",
-        ),
-        paths={
-            "libraryfolders.vdf": (False, "steamapps/libraryfolders.vdf"),
-            "librarycache": (True, "appcache/librarycache"),
-        },
-    )
+    locations: SteamLocations
+
+    def __init__(self) -> None:
+        super().__init__()
+        self.locations = SteamLocations(
+            Location(
+                schema_key="steam-location",
+                candidates=(
+                    shared.home / ".steam" / "steam",
+                    shared.data_dir / "Steam",
+                    shared.flatpak_dir / "com.valvesoftware.Steam" / "data" / "Steam",
+                    shared.programfiles32_dir / "Steam",
+                    shared.app_support_dir / "Steam",
+                ),
+                paths={
+                    "libraryfolders.vdf": LocationSubPath(
+                        "steamapps/libraryfolders.vdf"
+                    ),
+                    "librarycache": LocationSubPath("appcache/librarycache", True),
+                },
+                invalid_subtitle=Location.DATA_INVALID_SUBTITLE,
+            )
+        )

cartridges/logging/color_log_formatter.py

@@ -29,7 +29,7 @@ class ColorLogFormatter(Formatter):
     RED = "\033[31m"
     YELLOW = "\033[33m"
 
-    def format(self, record: LogRecord):
+    def format(self, record: LogRecord) -> str:
         super_format = super().format(record)
         match record.levelname:
             case "CRITICAL":

cartridges/logging/session_file_handler.py

@@ -18,13 +18,14 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import lzma
-from io import StringIO
+from io import TextIOWrapper
 from logging import StreamHandler
 from lzma import FORMAT_XZ, PRESET_DEFAULT
 from os import PathLike
 from pathlib import Path
+from typing import Optional
 
-from src import shared
+from cartridges import shared
 
 
 class SessionFileHandler(StreamHandler):
@@ -37,7 +38,7 @@ class SessionFileHandler(StreamHandler):
 
     backup_count: int
     filename: Path
-    log_file: StringIO = None
+    log_file: Optional[TextIOWrapper] = None
 
     def create_dir(self) -> None:
         """Create the log dir if needed"""
@@ -83,23 +84,29 @@ class SessionFileHandler(StreamHandler):
         logfiles.sort(key=self.file_sort_key, reverse=True)
         return logfiles
 
-    def rotate_file(self, path: Path):
+    def rotate_file(self, path: Path) -> None:
         """Rotate a file's number suffix and remove it if it's too old"""
 
         # If uncompressed, compress
         if not path.name.endswith(".xz"):
+            try:
+                with open(path, "r", encoding="utf-8") as original_file:
+                    original_data = original_file.read()
+            except UnicodeDecodeError:
+                # If the file is corrupted, throw it away
+                path.unlink()
+                return
+
+            # Compress the file
             compressed_path = path.with_suffix(path.suffix + ".xz")
-            with (
-                lzma.open(
-                    compressed_path,
-                    "wt",
-                    format=FORMAT_XZ,
-                    preset=PRESET_DEFAULT,
-                    encoding="utf-8",
-                ) as lzma_file,
-                open(path, "r", encoding="utf-8") as original_file,
-            ):
-                lzma_file.write(original_file.read())
+            with lzma.open(
+                compressed_path,
+                "wt",
+                format=FORMAT_XZ,
+                preset=PRESET_DEFAULT,
+                encoding="utf-8",
+            ) as lzma_file:
+                lzma_file.write(original_data)
             path.unlink()
             path = compressed_path
 
@@ -128,5 +135,6 @@ class SessionFileHandler(StreamHandler):
         super().__init__(self.log_file)
 
     def close(self) -> None:
-        self.log_file.close()
+        if self.log_file:
+            self.log_file.close()
         super().close()

cartridges/logging/setup.py

@@ -24,10 +24,10 @@ import platform
 import subprocess
 import sys
 
-from src import shared
+from cartridges import shared
 
 
-def setup_logging():
+def setup_logging() -> None:
     """Intitate the app's logging"""
 
     is_dev = shared.PROFILE == "development"
@@ -47,12 +47,12 @@ def setup_logging():
             },
             "console_formatter": {
                 "format": "%(name)s %(levelname)s - %(message)s",
-                "class": "src.logging.color_log_formatter.ColorLogFormatter",
+                "class": "cartridges.logging.color_log_formatter.ColorLogFormatter",
             },
         },
         "handlers": {
             "file_handler": {
-                "class": "src.logging.session_file_handler.SessionFileHandler",
+                "class": "cartridges.logging.session_file_handler.SessionFileHandler",
                 "formatter": "file_formatter",
                 "level": "DEBUG",
                 "filename": log_filename,
@@ -89,7 +89,7 @@ def setup_logging():
     logging_dot_config.dictConfig(config)
 
 
-def log_system_info():
+def log_system_info() -> None:
     """Log system debug information"""
 
     logging.debug("Starting %s v%s (%s)", shared.APP_ID, shared.VERSION, shared.PROFILE)

cartridges/main.py

@@ -0,0 +1,408 @@
+# main.py
+#
+# Copyright 2022-2024 kramo
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import json
+import lzma
+import shlex
+import sys
+from time import time
+from typing import Any, Optional
+from urllib.parse import quote
+
+import gi
+
+gi.require_version("Gtk", "4.0")
+gi.require_version("Adw", "1")
+
+# pylint: disable=wrong-import-position
+from gi.repository import Adw, Gio, GLib, Gtk
+
+from cartridges import shared
+from cartridges.details_dialog import DetailsDialog
+from cartridges.game import Game
+from cartridges.importer.bottles_source import BottlesSource
+from cartridges.importer.desktop_source import DesktopSource
+from cartridges.importer.flatpak_source import FlatpakSource
+from cartridges.importer.heroic_source import HeroicSource
+from cartridges.importer.importer import Importer  # yo dawg
+from cartridges.importer.itch_source import ItchSource
+from cartridges.importer.legendary_source import LegendarySource
+from cartridges.importer.lutris_source import LutrisSource
+from cartridges.importer.retroarch_source import RetroarchSource
+from cartridges.importer.steam_source import SteamSource
+from cartridges.logging.setup import log_system_info, setup_logging
+from cartridges.preferences import CartridgesPreferences
+from cartridges.store.managers.cover_manager import CoverManager
+from cartridges.store.managers.display_manager import DisplayManager
+from cartridges.store.managers.file_manager import FileManager
+from cartridges.store.managers.sgdb_manager import SgdbManager
+from cartridges.store.managers.steam_api_manager import SteamAPIManager
+from cartridges.store.store import Store
+from cartridges.utils.run_executable import run_executable
+from cartridges.window import CartridgesWindow
+
+
+class CartridgesApplication(Adw.Application):
+    state = shared.AppState.DEFAULT
+    win: CartridgesWindow
+    init_search_term: Optional[str] = None
+
+    def __init__(self) -> None:
+        shared.store = Store()
+        super().__init__(application_id=shared.APP_ID)
+
+        search = GLib.OptionEntry()
+        search.long_name = "search"
+        search.short_name = ord("s")
+        search.flags = 0
+        search.arg = int(GLib.OptionArg.STRING)
+        search.arg_data = None
+        search.description = "Open the app with this term in the search entry"
+        search.arg_description = "TERM"
+
+        launch = GLib.OptionEntry()
+        launch.long_name = "launch"
+        launch.short_name = ord("l")
+        launch.flags = int(GLib.OptionFlags.NONE)
+        launch.arg = int(GLib.OptionArg.STRING)
+        launch.arg_data = None
+        launch.description = "Run a game with the given game_id"
+        launch.arg_description = "GAME_ID"
+
+        self.add_main_option_entries((search, launch))
+
+        if sys.platform.startswith("darwin"):
+            if settings := Gtk.Settings.get_default():
+                settings.props.gtk_decoration_layout = "close,minimize,maximize:"
+
+    def do_activate(self) -> None:  # pylint: disable=arguments-differ
+        """Called on app creation"""
+        try:
+            setup_logging()
+        except ValueError:
+            pass
+
+        log_system_info()
+
+        # Create the main window
+        win = self.props.active_window  # pylint: disable=no-member
+        if not win:
+            shared.win = win = CartridgesWindow(application=self)
+
+        # Save window geometry
+        shared.state_schema.bind(
+            "width", shared.win, "default-width", Gio.SettingsBindFlags.DEFAULT
+        )
+        shared.state_schema.bind(
+            "height", shared.win, "default-height", Gio.SettingsBindFlags.DEFAULT
+        )
+        shared.state_schema.bind(
+            "is-maximized", shared.win, "maximized", Gio.SettingsBindFlags.DEFAULT
+        )
+
+        # Load games from disk
+        shared.store.add_manager(FileManager(), False)
+        shared.store.add_manager(DisplayManager())
+        self.state = shared.AppState.LOAD_FROM_DISK
+        self.load_games_from_disk()
+        self.state = shared.AppState.DEFAULT
+        shared.win.create_source_rows()
+
+        # Add rest of the managers for game imports
+        shared.store.add_manager(CoverManager())
+        shared.store.add_manager(SteamAPIManager())
+        shared.store.add_manager(SgdbManager())
+        shared.store.toggle_manager_in_pipelines(FileManager, True)
+
+        # Create actions
+        self.create_actions(
+            {
+                ("quit", ("<primary>q",)),
+                ("about",),
+                ("preferences", ("<primary>comma",)),
+                ("launch_game",),
+                ("hide_game",),
+                ("edit_game",),
+                ("add_game", ("<primary>n",)),
+                ("import", ("<primary>i",)),
+                ("remove_game_details_view", ("Delete",)),
+                ("remove_game",),
+                ("igdb_search",),
+                ("sgdb_search",),
+                ("protondb_search",),
+                ("pcgw_search",),
+                ("lutris_search",),
+                ("hltb_search",),
+                ("show_sidebar", ("F9",), shared.win),
+                ("show_hidden", ("<primary>h",), shared.win),
+                ("go_to_parent", ("<alt>Up",), shared.win),
+                ("go_home", ("<alt>Home",), shared.win),
+                ("toggle_search", ("<primary>f",), shared.win),
+                ("undo", ("<primary>z",), shared.win),
+                ("open_menu", ("F10",), shared.win),
+                ("close", ("<primary>w",), shared.win),
+            }
+        )
+
+        sort_action = Gio.SimpleAction.new_stateful(
+            "sort_by",
+            GLib.VariantType.new("s"),
+            sort_mode := GLib.Variant("s", shared.state_schema.get_string("sort-mode")),
+        )
+        sort_action.connect("activate", shared.win.on_sort_action)
+        shared.win.add_action(sort_action)
+        shared.win.on_sort_action(sort_action, sort_mode)
+
+        if self.init_search_term:  # For command line activation
+            shared.win.search_bar.set_search_mode(True)
+            shared.win.search_entry.set_text(self.init_search_term)
+            shared.win.search_entry.set_position(-1)
+
+        shared.win.present()
+
+        if shared.schema.get_boolean("auto-import"):
+            self.on_import_action()
+
+    def do_handle_local_options(self, options: GLib.VariantDict) -> int:
+        if search := options.lookup_value("search"):
+            self.init_search_term = search.get_string()
+        elif game_id := options.lookup_value("launch"):
+            try:
+                data = json.load(
+                    (path := shared.games_dir / (game_id.get_string() + ".json")).open(
+                        "r", encoding="utf-8"
+                    )
+                )
+                executable = (
+                    shlex.join(data["executable"])
+                    if isinstance(data["executable"], list)
+                    else data["executable"]
+                )
+                name = data["name"]
+
+                run_executable(executable)
+
+                data["last_played"] = int(time())
+                json.dump(data, path.open("w", encoding="utf-8"))
+
+            except (IndexError, KeyError, OSError, json.decoder.JSONDecodeError):
+                return 1
+
+            self.register()
+            self.send_notification(
+                "launch", Gio.Notification.new(_("{} launched").format(name))
+            )
+
+            # Sleep for 6 seconds before withdrawing the notification
+            # The amount a notification stays up is ~5, so leave an extra second for the animation
+            GLib.usleep(6000000)
+            self.withdraw_notification("launch")
+
+            return 0
+        return -1
+
+    def load_games_from_disk(self) -> None:
+        if shared.games_dir.is_dir():
+            for game_file in shared.games_dir.iterdir():
+                try:
+                    data = json.load(game_file.open())
+                except (OSError, json.decoder.JSONDecodeError):
+                    continue
+                game = Game(data)
+                shared.store.add_game(game, {"skip_save": True})
+
+    def get_source_name(self, source_id: str) -> Any:
+        if source_id == "all":
+            name = _("All Games")
+        elif source_id == "imported":
+            name = _("Added")
+        else:
+            try:
+                name = globals()[f"{source_id.split('_')[0].title()}Source"].name
+            except KeyError:
+                return source_id
+        return name
+
+    def on_about_action(self, *_args: Any) -> None:
+        # Get the debug info from the log files
+        debug_str = ""
+        for index, path in enumerate(shared.log_files):
+            # Add a horizontal line between runs
+            if index > 0:
+                debug_str += "─" * 37 + "\n"
+            # Add the run's logs
+            log_file = (
+                lzma.open(path, "rt", encoding="utf-8")
+                if path.name.endswith(".xz")
+                else open(path, "r", encoding="utf-8")
+            )
+            debug_str += log_file.read()
+            log_file.close()
+
+        about = Adw.AboutDialog.new_from_appdata(
+            shared.PREFIX + "/" + shared.APP_ID + ".metainfo.xml", shared.VERSION
+        )
+        about.set_developers(
+            (
+                "kramo https://kramo.page",
+                "Geoffrey Coulaud https://geoffrey-coulaud.fr",
+                "Rilic https://rilic.red",
+                "Arcitec https://github.com/Arcitec",
+                "Paweł Lidwin https://github.com/imLinguin",
+                "Domenico https://github.com/Domefemia",
+                "Rafael Mardojai CM https://mardojai.com",
+                "Clara Hobbs https://github.com/Ratfink",
+                "Sabri Ünal https://github.com/sabriunal",
+            )
+        )
+        about.set_designers(("kramo https://kramo.page",))
+        about.set_copyright("© 2022-2024 kramo")
+        # Translators: Replace this with Your Name, Your Name <your.email@example.com>, or Your Name https://your-site.com for it to show up in the About dialog.
+        about.set_translator_credits(_("translator-credits"))
+        about.set_debug_info(debug_str)
+        about.set_debug_info_filename("cartridges.log")
+        about.add_legal_section(
+            "Steam Branding",
+            "© 2023 Valve Corporation",
+            Gtk.License.CUSTOM,
+            "Steam and the Steam logo are trademarks and/or registered trademarks of Valve Corporation in the U.S. and/or other countries.",  # pylint: disable=line-too-long
+        )
+        about.present(shared.win)
+
+    def on_preferences_action(
+        self,
+        _action: Any = None,
+        _parameter: Any = None,
+        page_name: Optional[str] = None,
+        expander_row: Optional[str] = None,
+    ) -> Optional[CartridgesPreferences]:
+        if CartridgesPreferences.is_open:
+            return
+
+        win = CartridgesPreferences()
+        if page_name:
+            win.set_visible_page_name(page_name)
+        if expander_row:
+            getattr(win, expander_row).set_expanded(True)
+        win.present(shared.win)
+
+        return win
+
+    def on_launch_game_action(self, *_args: Any) -> None:
+        shared.win.active_game.launch()
+
+    def on_hide_game_action(self, *_args: Any) -> None:
+        shared.win.active_game.toggle_hidden()
+
+    def on_edit_game_action(self, *_args: Any) -> None:
+        DetailsDialog(shared.win.active_game).present(shared.win)
+
+    def on_add_game_action(self, *_args: Any) -> None:
+        if DetailsDialog.is_open:
+            return
+
+        DetailsDialog().present(shared.win)
+
+    def on_import_action(self, *_args: Any) -> None:
+        shared.importer = Importer()
+
+        if shared.schema.get_boolean("lutris"):
+            shared.importer.add_source(LutrisSource())
+
+        if shared.schema.get_boolean("steam"):
+            shared.importer.add_source(SteamSource())
+
+        if shared.schema.get_boolean("heroic"):
+            shared.importer.add_source(HeroicSource())
+
+        if shared.schema.get_boolean("bottles"):
+            shared.importer.add_source(BottlesSource())
+
+        if shared.schema.get_boolean("flatpak"):
+            shared.importer.add_source(FlatpakSource())
+
+        if shared.schema.get_boolean("desktop"):
+            shared.importer.add_source(DesktopSource())
+
+        if shared.schema.get_boolean("itch"):
+            shared.importer.add_source(ItchSource())
+
+        if shared.schema.get_boolean("legendary"):
+            shared.importer.add_source(LegendarySource())
+
+        if shared.schema.get_boolean("retroarch"):
+            shared.importer.add_source(RetroarchSource())
+
+        shared.importer.run()
+
+    def on_remove_game_action(self, *_args: Any) -> None:
+        shared.win.active_game.remove_game()
+
+    def on_remove_game_details_view_action(self, *_args: Any) -> None:
+        if shared.win.navigation_view.get_visible_page() == shared.win.details_page:
+            self.on_remove_game_action()
+
+    def search(self, uri: str) -> None:
+        Gio.AppInfo.launch_default_for_uri(f"{uri}{quote(shared.win.active_game.name)}")
+
+    def on_igdb_search_action(self, *_args: Any) -> None:
+        self.search("https://www.igdb.com/search?type=1&q=")
+
+    def on_sgdb_search_action(self, *_args: Any) -> None:
+        self.search("https://www.steamgriddb.com/search/grids?term=")
+
+    def on_protondb_search_action(self, *_args: Any) -> None:
+        self.search("https://www.protondb.com/search?q=")
+
+    def on_pcgw_search_action(self, *_args: Any) -> None:
+        self.search("https://www.pcgamingwiki.com/w/index.php?search=")
+
+    def on_lutris_search_action(self, *_args: Any) -> None:
+        self.search("https://lutris.net/games?q=")
+
+    def on_hltb_search_action(self, *_args: Any) -> None:
+        self.search("https://howlongtobeat.com/?q=")
+
+    def on_quit_action(self, *_args: Any) -> None:
+        self.quit()
+
+    def create_actions(self, actions: set) -> None:
+        for action in actions:
+            simple_action = Gio.SimpleAction.new(action[0], None)
+
+            scope = action[2] if action[2:3] else self
+            simple_action.connect("activate", getattr(scope, f"on_{action[0]}_action"))
+
+            if action[1:2]:
+                self.set_accels_for_action(
+                    f"app.{action[0]}" if scope == self else f"win.{action[0]}",
+                    (
+                        tuple(s.replace("<primary>", "<meta>") for s in action[1])
+                        if sys.platform.startswith("darwin")
+                        else action[1]
+                    ),
+                )
+
+            scope.add_action(simple_action)
+
+
+def main(_version: int) -> Any:
+    """App entry point"""
+    app = CartridgesApplication()
+    return app.run(sys.argv)

cartridges/meson.build

@@ -1,11 +1,11 @@
-moduledir = join_paths(pkgdatadir, 'src')
+moduledir = python_dir / 'cartridges'
 
 configure_file(
   input: 'cartridges.in',
   output: 'cartridges',
   configuration: conf,
   install: true,
-  install_dir: get_option('bindir')
+  install_dir: get_option('bindir'),
 )
 
 install_subdir('importer', install_dir: moduledir)
@@ -18,14 +18,10 @@ install_data(
     'main.py',
     'window.py',
     'preferences.py',
-    'details_window.py',
+    'details_dialog.py',
     'game.py',
     'game_cover.py',
-    configure_file(
-      input: 'shared.py.in',
-      output: 'shared.py',
-      configuration: conf
-    )
+    configure_file(input: 'shared.py.in', output: 'shared.py', configuration: conf),
   ],
-  install_dir: moduledir
-)
+  install_dir: moduledir,
+)

cartridges/preferences.py

@@ -0,0 +1,475 @@
+# preferences.py
+#
+# Copyright 2022-2023 kramo
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# pyright: reportAssignmentType=none
+
+import logging
+import re
+from pathlib import Path
+from shutil import rmtree
+from sys import platform
+from typing import Any, Callable, Optional
+
+from gi.repository import Adw, Gio, GLib, Gtk
+
+from cartridges import shared
+from cartridges.errors.friendly_error import FriendlyError
+from cartridges.game import Game
+from cartridges.importer.bottles_source import BottlesSource
+from cartridges.importer.desktop_source import DesktopSource
+from cartridges.importer.flatpak_source import FlatpakSource
+from cartridges.importer.heroic_source import HeroicSource
+from cartridges.importer.itch_source import ItchSource
+from cartridges.importer.legendary_source import LegendarySource
+from cartridges.importer.location import UnresolvableLocationError
+from cartridges.importer.lutris_source import LutrisSource
+from cartridges.importer.retroarch_source import RetroarchSource
+from cartridges.importer.source import Source
+from cartridges.importer.steam_source import SteamSource
+from cartridges.store.managers.sgdb_manager import SgdbManager
+from cartridges.utils.create_dialog import create_dialog
+
+
+@Gtk.Template(resource_path=shared.PREFIX + "/gtk/preferences.ui")
+class CartridgesPreferences(Adw.PreferencesDialog):
+    __gtype_name__ = "CartridgesPreferences"
+
+    general_page: Adw.PreferencesPage = Gtk.Template.Child()
+    import_page: Adw.PreferencesPage = Gtk.Template.Child()
+    sgdb_page: Adw.PreferencesPage = Gtk.Template.Child()
+
+    sources_group: Adw.PreferencesGroup = Gtk.Template.Child()
+
+    exit_after_launch_switch: Adw.SwitchRow = Gtk.Template.Child()
+    cover_launches_game_switch: Adw.SwitchRow = Gtk.Template.Child()
+    high_quality_images_switch: Adw.SwitchRow = Gtk.Template.Child()
+
+    auto_import_switch: Adw.SwitchRow = Gtk.Template.Child()
+    remove_missing_switch: Adw.SwitchRow = Gtk.Template.Child()
+
+    steam_expander_row: Adw.ExpanderRow = Gtk.Template.Child()
+    steam_data_action_row: Adw.ActionRow = Gtk.Template.Child()
+    steam_data_file_chooser_button: Gtk.Button = Gtk.Template.Child()
+
+    lutris_expander_row: Adw.ExpanderRowClass = Gtk.Template.Child()
+    lutris_data_action_row: Adw.ActionRow = Gtk.Template.Child()
+    lutris_data_file_chooser_button: Gtk.Button = Gtk.Template.Child()
+    lutris_import_steam_switch: Adw.SwitchRow = Gtk.Template.Child()
+    lutris_import_flatpak_switch: Adw.SwitchRow = Gtk.Template.Child()
+
+    heroic_expander_row: Adw.ExpanderRow = Gtk.Template.Child()
+    heroic_config_action_row: Adw.ActionRow = Gtk.Template.Child()
+    heroic_config_file_chooser_button: Gtk.Button = Gtk.Template.Child()
+    heroic_import_epic_switch: Adw.SwitchRow = Gtk.Template.Child()
+    heroic_import_gog_switch: Adw.SwitchRow = Gtk.Template.Child()
+    heroic_import_amazon_switch: Adw.SwitchRow = Gtk.Template.Child()
+    heroic_import_sideload_switch: Adw.SwitchRow = Gtk.Template.Child()
+
+    bottles_expander_row: Adw.ExpanderRow = Gtk.Template.Child()
+    bottles_data_action_row: Adw.ActionRow = Gtk.Template.Child()
+    bottles_data_file_chooser_button: Gtk.Button = Gtk.Template.Child()
+
+    itch_expander_row: Adw.ExpanderRow = Gtk.Template.Child()
+    itch_config_action_row: Adw.ActionRow = Gtk.Template.Child()
+    itch_config_file_chooser_button: Gtk.Button = Gtk.Template.Child()
+
+    legendary_expander_row: Adw.ExpanderRow = Gtk.Template.Child()
+    legendary_config_action_row: Adw.ActionRow = Gtk.Template.Child()
+    legendary_config_file_chooser_button: Gtk.Button = Gtk.Template.Child()
+
+    retroarch_expander_row: Adw.ExpanderRow = Gtk.Template.Child()
+    retroarch_config_action_row: Adw.ActionRow = Gtk.Template.Child()
+    retroarch_config_file_chooser_button: Gtk.Button = Gtk.Template.Child()
+
+    flatpak_expander_row: Adw.ExpanderRow = Gtk.Template.Child()
+    flatpak_system_data_action_row: Adw.ActionRow = Gtk.Template.Child()
+    flatpak_system_data_file_chooser_button: Gtk.Button = Gtk.Template.Child()
+    flatpak_user_data_action_row: Adw.ActionRow = Gtk.Template.Child()
+    flatpak_user_data_file_chooser_button: Gtk.Button = Gtk.Template.Child()
+    flatpak_import_launchers_switch: Adw.SwitchRow = Gtk.Template.Child()
+
+    desktop_switch: Adw.SwitchRow = Gtk.Template.Child()
+
+    sgdb_key_group: Adw.PreferencesGroup = Gtk.Template.Child()
+    sgdb_key_entry_row: Adw.EntryRow = Gtk.Template.Child()
+    sgdb_switch: Adw.SwitchRow = Gtk.Template.Child()
+    sgdb_prefer_switch: Adw.SwitchRow = Gtk.Template.Child()
+    sgdb_animated_switch: Adw.SwitchRow = Gtk.Template.Child()
+    sgdb_fetch_button: Gtk.Button = Gtk.Template.Child()
+    sgdb_stack: Gtk.Stack = Gtk.Template.Child()
+    sgdb_spinner: Adw.Spinner = Gtk.Template.Child()
+
+    danger_zone_group = Gtk.Template.Child()
+    remove_all_games_button_row = Gtk.Template.Child()
+    reset_button_row = Gtk.Template.Child()
+
+    removed_games: set[Game] = set()
+    warning_menu_buttons: dict = {}
+
+    is_open = False
+
+    def __init__(self, **kwargs: Any) -> None:
+        super().__init__(**kwargs)
+
+        # Make it so only one dialog can be open at a time
+        self.__class__.is_open = True
+        self.connect("closed", lambda *_: self.set_is_open(False))
+
+        self.file_chooser = Gtk.FileDialog()
+
+        self.toast = Adw.Toast.new(_("All games removed"))
+        self.toast.set_button_label(_("Undo"))
+        self.toast.connect("button-clicked", self.undo_remove_all, None)
+        self.toast.set_priority(Adw.ToastPriority.HIGH)
+
+        (shortcut_controller := Gtk.ShortcutController()).add_shortcut(
+            Gtk.Shortcut.new(
+                Gtk.ShortcutTrigger.parse_string("<primary>z"),
+                Gtk.CallbackAction.new(self.undo_remove_all),
+            )
+        )
+        self.add_controller(shortcut_controller)
+
+        # General
+        self.remove_all_games_button_row.connect("activated", self.remove_all_games)
+
+        # Debug
+        if shared.PROFILE == "development":
+            self.reset_button_row.set_visible(True)
+            self.reset_button_row.connect("activated", self.reset_app)
+
+        # Sources settings
+        for source_class in (
+            BottlesSource,
+            FlatpakSource,
+            HeroicSource,
+            ItchSource,
+            LegendarySource,
+            LutrisSource,
+            RetroarchSource,
+            SteamSource,
+        ):
+            source = source_class()
+            if not source.is_available:
+                expander_row = getattr(self, f"{source.source_id}_expander_row")
+                expander_row.set_visible(False)
+            else:
+                self.init_source_row(source)
+
+        # Special case for the desktop source
+        if not DesktopSource().is_available:
+            self.desktop_switch.set_visible(False)
+
+        # SteamGridDB
+        def sgdb_key_changed(*_args: Any) -> None:
+            shared.schema.set_string("sgdb-key", self.sgdb_key_entry_row.get_text())
+
+        self.sgdb_key_entry_row.set_text(shared.schema.get_string("sgdb-key"))
+        self.sgdb_key_entry_row.connect("changed", sgdb_key_changed)
+
+        self.sgdb_key_group.set_description(
+            _(
+                "An API key is required to use SteamGridDB. You can generate one {}here{}."
+            ).format(
+                '<a href="https://www.steamgriddb.com/profile/preferences/api">', "</a>"
+            )
+        )
+
+        def update_sgdb(*_args: Any) -> None:
+            counter = 0
+            games_len = len(shared.store)
+            sgdb_manager = shared.store.managers[SgdbManager]
+            sgdb_manager.reset_cancellable()
+
+            self.sgdb_spinner.set_visible(True)
+            self.sgdb_stack.set_visible_child(self.sgdb_spinner)
+
+            self.add_toast(download_toast := Adw.Toast.new(_("Downloading covers…")))
+
+            def update_cover_callback(manager: SgdbManager) -> None:
+                nonlocal counter
+                nonlocal games_len
+                nonlocal download_toast
+
+                counter += 1
+                if counter != games_len:
+                    return
+
+                for error in manager.collect_errors():
+                    if isinstance(error, FriendlyError):
+                        create_dialog(self, error.title, error.subtitle)
+                        break
+
+                for game in shared.store:
+                    game.update()
+
+                toast = Adw.Toast.new(_("Covers updated"))
+                toast.set_priority(Adw.ToastPriority.HIGH)
+                download_toast.dismiss()
+                self.add_toast(toast)
+
+                self.sgdb_spinner.set_visible(False)
+                self.sgdb_stack.set_visible_child(self.sgdb_fetch_button)
+
+            for game in shared.store:
+                sgdb_manager.process_game(game, {}, update_cover_callback)
+
+        self.sgdb_fetch_button.connect("clicked", update_sgdb)
+
+        # Switches
+        self.bind_switches(
+            {
+                "exit-after-launch",
+                "cover-launches-game",
+                "high-quality-images",
+                "auto-import",
+                "remove-missing",
+                "lutris-import-steam",
+                "lutris-import-flatpak",
+                "heroic-import-epic",
+                "heroic-import-gog",
+                "heroic-import-amazon",
+                "heroic-import-sideload",
+                "flatpak-import-launchers",
+                "sgdb",
+                "sgdb-prefer",
+                "sgdb-animated",
+                "desktop",
+            }
+        )
+
+        def set_sgdb_sensitive(widget: Adw.EntryRow) -> None:
+            if not widget.get_text():
+                shared.schema.set_boolean("sgdb", False)
+
+            self.sgdb_switch.set_sensitive(widget.get_text())
+
+        self.sgdb_key_entry_row.connect("changed", set_sgdb_sensitive)
+        set_sgdb_sensitive(self.sgdb_key_entry_row)
+
+    def set_is_open(self, is_open: bool) -> None:
+        self.__class__.is_open = is_open
+
+    def get_switch(self, setting: str) -> Any:
+        return getattr(self, f'{setting.replace("-", "_")}_switch')
+
+    def bind_switches(self, settings: set[str]) -> None:
+        for setting in settings:
+            shared.schema.bind(
+                setting,
+                self.get_switch(setting),
+                "active",
+                Gio.SettingsBindFlags.DEFAULT,
+            )
+
+    def choose_folder(
+        self, _widget: Any, callback: Callable, callback_data: Optional[str] = None
+    ) -> None:
+        self.file_chooser.select_folder(shared.win, None, callback, callback_data)
+
+    def undo_remove_all(self, *_args: Any) -> bool:
+        shared.win.get_application().state = shared.AppState.UNDO_REMOVE_ALL_GAMES
+        for game in self.removed_games:
+            game.removed = False
+            game.save()
+            game.update()
+
+        self.removed_games = set()
+        self.toast.dismiss()
+        shared.win.get_application().state = shared.AppState.DEFAULT
+        shared.win.create_source_rows()
+
+        return True
+
+    def remove_all_games(self, *_args: Any) -> None:
+        shared.win.get_application().state = shared.AppState.REMOVE_ALL_GAMES
+        shared.win.row_selected(None, shared.win.all_games_row_box.get_parent())
+        for game in shared.store:
+            if not game.removed:
+                self.removed_games.add(game)
+                game.removed = True
+                game.save()
+                game.update()
+
+        if shared.win.navigation_view.get_visible_page() == shared.win.details_page:
+            shared.win.navigation_view.pop()
+
+        self.add_toast(self.toast)
+        shared.win.get_application().state = shared.AppState.DEFAULT
+        shared.win.create_source_rows()
+
+    def reset_app(self, *_args: Any) -> None:
+        rmtree(shared.data_dir / "cartridges", True)
+        rmtree(shared.config_dir / "cartridges", True)
+        rmtree(shared.cache_dir / "cartridges", True)
+
+        for key in (
+            (settings_schema_source := Gio.SettingsSchemaSource.get_default())
+            .lookup(shared.APP_ID, True)
+            .list_keys()
+        ):
+            shared.schema.reset(key)
+        for key in settings_schema_source.lookup(
+            shared.APP_ID + ".State", True
+        ).list_keys():
+            shared.state_schema.reset(key)
+
+        shared.win.get_application().quit()
+
+    def update_source_action_row_paths(self, source: Source) -> None:
+        """Set the dir subtitle for a source's action rows"""
+        for location_name, location in source.locations._asdict().items():
+            # Get the action row to subtitle
+            action_row = getattr(
+                self, f"{source.source_id}_{location_name}_action_row", None
+            )
+            if not action_row:
+                continue
+
+            subtitle = str(Path(shared.schema.get_string(location.schema_key)))
+
+            if platform == "linux":
+                # Remove the path prefix if picked via Flatpak portal
+                subtitle = re.sub("/run/user/\\d*/doc/.*/", "", subtitle)
+
+                # Replace the home directory with "~"
+                subtitle = re.sub(f"^{str(shared.home)}", "~", subtitle)
+
+            action_row.set_subtitle(subtitle)
+
+    def resolve_locations(self, source: Source) -> None:
+        """Resolve locations and add a warning if location cannot be found"""
+
+        for location_name, location in source.locations._asdict().items():
+            action_row = getattr(
+                self, f"{source.source_id}_{location_name}_action_row", None
+            )
+            if not action_row:
+                continue
+
+            try:
+                location.resolve()
+
+            except UnresolvableLocationError:
+                title = _("Installation Not Found")
+                description = _("Select a valid directory")
+                format_start = '<span rise="12pt"><b><big>'
+                format_end = "</big></b></span>\n"
+
+                popover = Gtk.Popover(
+                    focusable=True,
+                    child=(
+                        Gtk.Label(
+                            label=format_start + title + format_end + description,
+                            use_markup=True,
+                            wrap=True,
+                            max_width_chars=50,
+                            halign=Gtk.Align.CENTER,
+                            valign=Gtk.Align.CENTER,
+                            justify=Gtk.Justification.CENTER,
+                            margin_top=9,
+                            margin_bottom=9,
+                            margin_start=12,
+                            margin_end=12,
+                        )
+                    ),
+                )
+
+                popover.update_property(
+                    (Gtk.AccessibleProperty.LABEL,), (title + description,)
+                )
+
+                def set_a11y_label(widget: Gtk.Popover) -> None:
+                    self.set_focus(widget)
+
+                popover.connect("show", set_a11y_label)
+
+                menu_button = Gtk.MenuButton(
+                    icon_name="dialog-warning-symbolic",
+                    valign=Gtk.Align.CENTER,
+                    popover=popover,
+                    tooltip_text=_("Warning"),
+                )
+                menu_button.add_css_class("warning")
+
+                action_row.add_prefix(menu_button)
+                self.warning_menu_buttons[source.source_id] = menu_button
+
+    def init_source_row(self, source: Source) -> None:
+        """Initialize a preference row for a source class"""
+
+        def set_dir(_widget: Any, result: Gio.Task, location_name: str) -> None:
+            """Callback called when a dir picker button is clicked"""
+            try:
+                path = Path(self.file_chooser.select_folder_finish(result).get_path())
+            except GLib.Error:
+                return
+
+            # Good picked location
+            location = source.locations._asdict()[location_name]
+            if location.check_candidate(path):
+                shared.schema.set_string(location.schema_key, str(path))
+                self.update_source_action_row_paths(source)
+                if self.warning_menu_buttons.get(source.source_id):
+                    action_row = getattr(
+                        self, f"{source.source_id}_{location_name}_action_row", None
+                    )
+                    action_row.remove(  # type: ignore
+                        self.warning_menu_buttons[source.source_id]
+                    )
+                    self.warning_menu_buttons.pop(source.source_id)
+                logging.debug("User-set value for %s is %s", location.schema_key, path)
+
+            # Bad picked location, inform user
+            else:
+                title = _("Invalid Directory")
+                dialog = create_dialog(
+                    self,
+                    title,
+                    location.invalid_subtitle.format(source.name),
+                    "choose_folder",
+                    _("Set Location"),
+                )
+
+                def on_response(widget: Any, response: str) -> None:
+                    if response == "choose_folder":
+                        self.choose_folder(widget, set_dir, location_name)
+
+                dialog.connect("response", on_response)
+
+        # Bind expander row activation to source being enabled
+        expander_row = getattr(self, f"{source.source_id}_expander_row")
+        shared.schema.bind(
+            source.source_id,
+            expander_row,
+            "enable-expansion",
+            Gio.SettingsBindFlags.DEFAULT,
+        )
+
+        # Connect dir picker buttons
+        for location_name in source.locations._asdict():
+            button = getattr(
+                self, f"{source.source_id}_{location_name}_file_chooser_button", None
+            )
+            if button is not None:
+                button.connect("clicked", self.choose_folder, set_dir, location_name)
+
+        # Set the source row subtitles
+        self.resolve_locations(source)
+        self.update_source_action_row_paths(source)

cartridges/shared.py.in

@@ -17,39 +17,68 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-import os
+from enum import IntEnum, auto
+from os import getenv
 from pathlib import Path
 
 from gi.repository import Gdk, Gio, GLib
 
+
+class AppState(IntEnum):
+    DEFAULT = auto()
+    LOAD_FROM_DISK = auto()
+    IMPORT = auto()
+    REMOVE_ALL_GAMES = auto()
+    UNDO_REMOVE_ALL_GAMES = auto()
+
+
 APP_ID = "@APP_ID@"
 VERSION = "@VERSION@"
 PREFIX = "@PREFIX@"
 PROFILE = "@PROFILE@"
+TIFF_COMPRESSION = "@TIFF_COMPRESSION@"
 SPEC_VERSION = 1.5  # The version of the game_id.json spec
 
 schema = Gio.Settings.new(APP_ID)
 state_schema = Gio.Settings.new(APP_ID + ".State")
 
 home = Path.home()
+
 data_dir = Path(GLib.get_user_data_dir())
+host_data_dir = Path(getenv("HOST_XDG_DATA_HOME", Path.home() / ".local" / "share"))
+
 config_dir = Path(GLib.get_user_config_dir())
+host_config_dir = Path(getenv("HOST_XDG_CONFIG_HOME", Path.home() / ".config"))
+
 cache_dir = Path(GLib.get_user_cache_dir())
+host_cache_dir = Path(getenv("HOST_XDG_CACHE_HOME", Path.home() / ".cache"))
+
 flatpak_dir = home / ".var" / "app"
 
 games_dir = data_dir / "cartridges" / "games"
 covers_dir = data_dir / "cartridges" / "covers"
 
-appdata_dir = Path(os.getenv("appdata") or "C:\\Users\\Default\\AppData\\Roaming")
-programfiles32_dir = Path(os.getenv("programfiles(x86)") or "C:\\Program Files (x86)")
-
-scale_factor = max(
-    monitor.get_scale_factor() for monitor in Gdk.Display.get_default().get_monitors()
+appdata_dir = Path(getenv("appdata") or r"C:\Users\Default\AppData\Roaming")
+local_appdata_dir = Path(
+    getenv("csidl_local_appdata") or r"C:\Users\Default\AppData\Local"
 )
-image_size = (200 * scale_factor, 300 * scale_factor)
+programfiles32_dir = Path(getenv("programfiles(x86)") or r"C:\Program Files (x86)")
+
+app_support_dir = home / "Library" / "Application Support"
+
+try:
+    scale_factor = max(
+        monitor.get_scale_factor()
+        for monitor in Gdk.Display.get_default().get_monitors()
+    )
+except AttributeError:  # If shared.py is imported by the search provider
+    pass
+else:
+    image_size = (200 * scale_factor, 300 * scale_factor)
 
 # pylint: disable=invalid-name
 win = None
 importer = None
+import_time = None
 store = None
-log_files = None
+log_files = []

cartridges/shared.pyi

@@ -0,0 +1,78 @@
+# shared.pyi
+#
+# Copyright 2024 kramo
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from pathlib import Path
+from typing import Optional
+
+from gi.repository import Gio
+
+from cartridges.importer.importer import Importer
+from cartridges.store.store import Store
+from cartridges.window import CartridgesWindow
+
+
+class AppState:
+    DEFAULT: int
+    LOAD_FROM_DISK: int
+    IMPORT: int
+    REMOVE_ALL_GAMES: int
+    UNDO_REMOVE_ALL_GAMES: int
+
+
+APP_ID: str
+VERSION: str
+PREFIX: str
+PROFILE: str
+TIFF_COMPRESSION: str
+SPEC_VERSION: float
+
+schema: Gio.Settings
+state_schema: Gio.Settings
+
+home: Path
+
+data_dir: Path
+host_data_dir: Path
+
+config_dir: Path
+host_config_dir: Path
+
+cache_dir: Path
+host_cache_dir: Path
+
+flatpak_dir: Path
+
+games_dir: Path
+covers_dir: Path
+
+appdata_dir: Path
+local_appdata_dir: Path
+programfiles32_dir: Path
+
+app_support_dir: Path
+
+
+scale_factor: int
+image_size: int
+
+win: Optional[CartridgesWindow]
+importer: Optional[Importer]
+import_time: Optional[int]
+store = Optional[Store]
+log_files: list[Path]

cartridges/store/managers/async_manager.py

@@ -17,13 +17,12 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from typing import Callable, Any
+from typing import Any, Callable
 
 from gi.repository import Gio
 
-from src.game import Game
-from src.store.managers.manager import Manager
-from src.utils.task import Task
+from cartridges.game import Game
+from cartridges.store.managers.manager import Manager
 
 
 class AsyncManager(Manager):
@@ -49,14 +48,13 @@ class AsyncManager(Manager):
         self, game: Game, additional_data: dict, callback: Callable[["Manager"], Any]
     ) -> None:
         """Create a task to process the game in a separate thread"""
-        task = Task.new(None, self.cancellable, self._task_callback, (callback,))
-        task.set_task_data((game, additional_data))
-        task.run_in_thread(self._task_thread_func)
+        task = Gio.Task.new(None, self.cancellable, self._task_callback, (callback,))
+        task.run_in_thread(lambda *_: self._task_thread_func((game, additional_data)))
 
-    def _task_thread_func(self, _task, _source_object, data, _cancellable):
+    def _task_thread_func(self, data):
         """Task thread entry point"""
         game, additional_data, *_rest = data
-        self.execute_resilient_manager_logic(game, additional_data)
+        self.run(game, additional_data)
 
     def _task_callback(self, _source_object, _result, data):
         """Method run after the task is done"""

cartridges/store/managers/cover_manager.py

@@ -0,0 +1,198 @@
+# local_cover_manager.py
+#
+# Copyright 2023 Geoffrey Coulaud
+# Copyright 2023 kramo
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from pathlib import Path
+from typing import NamedTuple
+
+import requests
+from gi.repository import GdkPixbuf, Gio
+from requests.exceptions import HTTPError, SSLError
+
+from cartridges import shared
+from cartridges.game import Game
+from cartridges.store.managers.manager import Manager
+from cartridges.store.managers.steam_api_manager import SteamAPIManager
+from cartridges.utils.save_cover import convert_cover, save_cover
+
+
+class ImageSize(NamedTuple):
+    width: float = 0
+    height: float = 0
+
+    @property
+    def aspect_ratio(self) -> float:
+        return self.width / self.height
+
+    def __str__(self):
+        return f"{self.width}x{self.height}"
+
+    def __mul__(self, scale: float | int) -> "ImageSize":
+        return ImageSize(
+            self.width * scale,
+            self.height * scale,
+        )
+
+    def __truediv__(self, divisor: float | int) -> "ImageSize":
+        return self * (1 / divisor)
+
+    def __add__(self, other_size: "ImageSize") -> "ImageSize":
+        return ImageSize(
+            self.width + other_size.width,
+            self.height + other_size.height,
+        )
+
+    def __sub__(self, other_size: "ImageSize") -> "ImageSize":
+        return self + (other_size * -1)
+
+    def element_wise_div(self, other_size: "ImageSize") -> "ImageSize":
+        """Divide every element of self by the equivalent in the other size"""
+        return ImageSize(
+            self.width / other_size.width,
+            self.height / other_size.height,
+        )
+
+    def element_wise_mul(self, other_size: "ImageSize") -> "ImageSize":
+        """Multiply every element of self by the equivalent in the other size"""
+        return ImageSize(
+            self.width * other_size.width,
+            self.height * other_size.height,
+        )
+
+    def invert(self) -> "ImageSize":
+        """Invert the element of self"""
+        return ImageSize(1, 1).element_wise_div(self)
+
+
+class CoverManager(Manager):
+    """
+    Manager in charge of adding the cover image of the game
+
+    Order of priority is:
+    1. local cover
+    2. icon cover
+    3. online cover
+    """
+
+    run_after = (SteamAPIManager,)
+    retryable_on = (HTTPError, SSLError, ConnectionError)
+
+    def download_image(self, url: str) -> Path:
+        image_file = Gio.File.new_tmp()[0]
+        path = Path(image_file.get_path())
+        with requests.get(url, timeout=5) as cover:
+            cover.raise_for_status()
+            path.write_bytes(cover.content)
+        return path
+
+    def is_stretchable(self, source_size: ImageSize, cover_size: ImageSize) -> bool:
+        is_taller = source_size.aspect_ratio < cover_size.aspect_ratio
+        if is_taller:
+            return True
+        max_stretch = 0.12
+        resized_height = (1 / source_size.aspect_ratio) * cover_size.width
+        stretch = 1 - (resized_height / cover_size.height)
+        return stretch <= max_stretch
+
+    def composite_cover(
+        self,
+        image_path: Path,
+        scale: float = 1,
+        blur_size: ImageSize = ImageSize(2, 2),
+    ) -> GdkPixbuf.Pixbuf:
+        """
+        Return the image composited with a background blur.
+        If the image is stretchable, just stretch it.
+
+        :param path: Path where the source image is located
+        :param scale:
+            Scale of the smalled image side
+            compared to the corresponding side in the cover
+        :param blur_size: Size of the downscaled image used for the blur
+        """
+
+        # Load source image
+        source = GdkPixbuf.Pixbuf.new_from_file(
+            str(convert_cover(image_path, resize=False))
+        )
+        source_size = ImageSize(source.get_width(), source.get_height())
+        cover_size = ImageSize._make(shared.image_size)
+
+        # Stretch if possible
+        if scale == 1 and self.is_stretchable(source_size, cover_size):
+            return source
+
+        # Create the blurred cover background
+        # fmt: off
+        cover = (
+            source
+            .scale_simple(*blur_size, GdkPixbuf.InterpType.BILINEAR)
+            .scale_simple(*cover_size, GdkPixbuf.InterpType.BILINEAR)
+        )
+        # fmt: on
+
+        # Scale to fit, apply scaling, then center
+        uniform_scale = scale * min(cover_size.element_wise_div(source_size))
+        source_in_cover_size = source_size * uniform_scale
+        source_in_cover_position = (cover_size - source_in_cover_size) / 2
+
+        # Center the scaled source image in the cover
+        source.composite(
+            cover,
+            *source_in_cover_position,
+            *source_in_cover_size,
+            *source_in_cover_position,
+            uniform_scale,
+            uniform_scale,
+            GdkPixbuf.InterpType.BILINEAR,
+            255,
+        )
+        return cover
+
+    def main(self, game: Game, additional_data: dict) -> None:
+        if game.blacklisted:
+            return
+        for key in (
+            "local_image_path",
+            "local_icon_path",
+            "online_cover_url",
+        ):
+            # Get an image path
+            if not (value := additional_data.get(key)):
+                continue
+            if key == "online_cover_url":
+                image_path = self.download_image(value)
+            else:
+                image_path = Path(value)
+            if not image_path.is_file():
+                continue
+
+            # Icon cover
+            composite_kwargs = {}
+
+            if key == "local_icon_path":
+                composite_kwargs["scale"] = 0.7
+                composite_kwargs["blur_size"] = ImageSize(1, 2)
+
+            save_cover(
+                game.game_id,
+                convert_cover(
+                    pixbuf=self.composite_cover(image_path, **composite_kwargs)
+                ),
+            )

cartridges/store/managers/display_manager.py

@@ -17,20 +17,21 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from src.game import Game
-from src.game_cover import GameCover
-from src.store.managers.manager import Manager
-from src.store.managers.sgdb_manager import SGDBManager
-from src.store.managers.steam_api_manager import SteamAPIManager
+from cartridges import shared
+from cartridges.game import Game
+from cartridges.game_cover import GameCover
+from cartridges.store.managers.manager import Manager
+from cartridges.store.managers.sgdb_manager import SgdbManager
+from cartridges.store.managers.steam_api_manager import SteamAPIManager
 
 
 class DisplayManager(Manager):
     """Manager in charge of adding a game to the UI"""
 
-    run_after = (SteamAPIManager, SGDBManager)
+    run_after = (SteamAPIManager, SgdbManager)
     signals = {"update-ready"}
 
-    def manager_logic(self, game: Game, _additional_data: dict) -> None:
+    def main(self, game: Game, _additional_data: dict) -> None:
         if game.get_parent():
             game.get_parent().get_parent().remove(game)
             if game.get_parent():
@@ -46,27 +47,30 @@ class DisplayManager(Manager):
             "notify::visible", game.toggle_play, None
         )
         game.menu_button.get_popover().connect(
-            "notify::visible", game.win.set_active_game, game
+            "notify::visible", shared.win.set_active_game, game
         )
 
-        if game.game_id in game.win.game_covers:
-            game.game_cover = game.win.game_covers[game.game_id]
+        if game.game_id in shared.win.game_covers:
+            game.game_cover = shared.win.game_covers[game.game_id]
             game.game_cover.add_picture(game.cover)
         else:
             game.game_cover = GameCover({game.cover}, game.get_cover_path())
-            game.win.game_covers[game.game_id] = game.game_cover
+            shared.win.game_covers[game.game_id] = game.game_cover
 
         if (
-            game.win.stack.get_visible_child() == game.win.details_view
-            and game.win.active_game == game
+            shared.win.navigation_view.get_visible_page() == shared.win.details_page
+            and shared.win.active_game == game
         ):
-            game.win.show_details_view(game)
+            shared.win.show_details_page(game)
 
         if not game.removed and not game.blacklisted:
             if game.hidden:
-                game.win.hidden_library.append(game)
+                shared.win.hidden_library.append(game)
             else:
-                game.win.library.append(game)
+                shared.win.library.append(game)
             game.get_parent().set_focusable(False)
 
-        game.win.set_library_child()
+        shared.win.set_library_child()
+
+        if shared.win.get_application().state == shared.AppState.DEFAULT:
+            shared.win.create_source_rows()

cartridges/store/managers/file_manager.py

@@ -19,10 +19,10 @@
 
 import json
 
-from src import shared
-from src.game import Game
-from src.store.managers.async_manager import AsyncManager
-from src.store.managers.steam_api_manager import SteamAPIManager
+from cartridges import shared
+from cartridges.game import Game
+from cartridges.store.managers.async_manager import AsyncManager
+from cartridges.store.managers.steam_api_manager import SteamAPIManager
 
 
 class FileManager(AsyncManager):
@@ -31,7 +31,7 @@ class FileManager(AsyncManager):
     run_after = (SteamAPIManager,)
     signals = {"save-ready"}
 
-    def manager_logic(self, game: Game, additional_data: dict) -> None:
+    def main(self, game: Game, additional_data: dict) -> None:
         if additional_data.get("skip_save"):  # Skip saving when loading games from disk
             return
 
@@ -53,7 +53,7 @@ class FileManager(AsyncManager):
 
         json.dump(
             {attr: getattr(game, attr) for attr in attrs if attr},
-            (shared.games_dir / f"{game.game_id}.json").open("w"),
+            (shared.games_dir / f"{game.game_id}.json").open("w", encoding="utf-8"),
             indent=4,
             sort_keys=True,
         )

cartridges/store/managers/manager.py

@@ -22,9 +22,9 @@ from abc import abstractmethod
 from time import sleep
 from typing import Any, Callable, Container
 
-from src.errors.error_producer import ErrorProducer
-from src.errors.friendly_error import FriendlyError
-from src.game import Game
+from cartridges.errors.error_producer import ErrorProducer
+from cartridges.errors.friendly_error import FriendlyError
+from cartridges.game import Game
 
 
 class Manager(ErrorProducer):
@@ -46,11 +46,11 @@ class Manager(ErrorProducer):
     max_tries: int = 3
 
     @property
-    def name(self):
+    def name(self) -> str:
         return type(self).__name__
 
     @abstractmethod
-    def manager_logic(self, game: Game, additional_data: dict) -> None:
+    def main(self, game: Game, additional_data: dict) -> None:
         """
         Manager specific logic triggered by the run method
         * Implemented by final child classes
@@ -59,13 +59,13 @@ class Manager(ErrorProducer):
         * May raise other exceptions that will be reported
         """
 
-    def execute_resilient_manager_logic(self, game: Game, additional_data: dict):
+    def run(self, game: Game, additional_data: dict) -> None:
         """Handle errors (retry, ignore or raise) that occur in the manager logic"""
 
         # Keep track of the number of tries
         tries = 1
 
-        def handle_error(error: Exception):
+        def handle_error(error: Exception) -> None:
             nonlocal tries
 
             # If FriendlyError, handle its cause instead
@@ -83,11 +83,11 @@ class Manager(ErrorProducer):
             retrying_format = "Retrying %s in %s for %s"
             unretryable_format = "Unretryable %s in %s for %s"
 
-            if error in self.continue_on:
+            if type(error) in self.continue_on:
                 # Handle skippable errors (skip silently)
                 return
 
-            if error in self.retryable_on:
+            if type(error) in self.retryable_on:
                 if tries > self.max_tries:
                     # Handle being out of retries
                     logging.error(out_of_retries_format, *log_args)
@@ -104,9 +104,9 @@ class Manager(ErrorProducer):
                 logging.error(unretryable_format, *log_args, exc_info=error)
                 self.report_error(base_error)
 
-        def try_manager_logic():
+        def try_manager_logic() -> None:
             try:
-                self.manager_logic(game, additional_data)
+                self.main(game, additional_data)
             except Exception as error:  # pylint: disable=broad-exception-caught
                 handle_error(error)
 
@@ -116,5 +116,5 @@ class Manager(ErrorProducer):
         self, game: Game, additional_data: dict, callback: Callable[["Manager"], Any]
     ) -> None:
         """Pass the game through the manager"""
-        self.execute_resilient_manager_logic(game, additional_data)
+        self.run(game, additional_data)
         callback(self)

cartridges/store/managers/sgdb_manager.py

@@ -21,26 +21,25 @@ from json import JSONDecodeError
 
 from requests.exceptions import HTTPError, SSLError
 
-from src.errors.friendly_error import FriendlyError
-from src.game import Game
-from src.store.managers.async_manager import AsyncManager
-from src.store.managers.local_cover_manager import LocalCoverManager
-from src.store.managers.online_cover_manager import OnlineCoverManager
-from src.store.managers.steam_api_manager import SteamAPIManager
-from src.utils.steamgriddb import SGDBAuthError, SGDBHelper
+from cartridges.errors.friendly_error import FriendlyError
+from cartridges.game import Game
+from cartridges.store.managers.async_manager import AsyncManager
+from cartridges.store.managers.cover_manager import CoverManager
+from cartridges.store.managers.steam_api_manager import SteamAPIManager
+from cartridges.utils.steamgriddb import SgdbAuthError, SgdbHelper
 
 
-class SGDBManager(AsyncManager):
-    """Manager in charge of downloading a game's cover from steamgriddb"""
+class SgdbManager(AsyncManager):
+    """Manager in charge of downloading a game's cover from SteamGridDB"""
 
-    run_after = (SteamAPIManager, LocalCoverManager, OnlineCoverManager)
+    run_after = (SteamAPIManager, CoverManager)
     retryable_on = (HTTPError, SSLError, ConnectionError, JSONDecodeError)
 
-    def manager_logic(self, game: Game, _additional_data: dict) -> None:
+    def main(self, game: Game, _additional_data: dict) -> None:
         try:
-            sgdb = SGDBHelper()
+            sgdb = SgdbHelper()
             sgdb.conditionaly_update_cover(game)
-        except SGDBAuthError as error:
+        except SgdbAuthError as error:
             # If invalid auth, cancel all SGDBManager tasks
             self.cancellable.cancel()
             raise FriendlyError(

cartridges/store/managers/steam_api_manager.py

@@ -18,12 +18,13 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from requests.exceptions import HTTPError, SSLError
+from urllib3.exceptions import ConnectionError as Urllib3ConnectionError
 
-from src.game import Game
-from src.store.managers.async_manager import AsyncManager
-from src.utils.steam import (
-    SteamGameNotFoundError,
+from cartridges.game import Game
+from cartridges.store.managers.async_manager import AsyncManager
+from cartridges.utils.steam import (
     SteamAPIHelper,
+    SteamGameNotFoundError,
     SteamNotAGameError,
     SteamRateLimiter,
 )
@@ -32,7 +33,7 @@ from src.utils.steam import (
 class SteamAPIManager(AsyncManager):
     """Manager in charge of completing a game's data from the Steam API"""
 
-    retryable_on = (HTTPError, SSLError, ConnectionError)
+    retryable_on = (HTTPError, SSLError, Urllib3ConnectionError)
 
     steam_api_helper: SteamAPIHelper = None
     steam_rate_limiter: SteamRateLimiter = None
@@ -42,8 +43,8 @@ class SteamAPIManager(AsyncManager):
         self.steam_rate_limiter = SteamRateLimiter()
         self.steam_api_helper = SteamAPIHelper(self.steam_rate_limiter)
 
-    def manager_logic(self, game: Game, additional_data: dict) -> None:
-        # Skip non-steam games
+    def main(self, game: Game, additional_data: dict) -> None:
+        # Skip non-Steam games
         appid = additional_data.get("steam_appid", None)
         if appid is None:
             return

cartridges/store/pipeline.py

@@ -22,8 +22,8 @@ from typing import Iterable
 
 from gi.repository import GObject
 
-from src.game import Game
-from src.store.managers.manager import Manager
+from cartridges.game import Game
+from cartridges.store.managers.manager import Manager
 
 
 class Pipeline(GObject.Object):
@@ -83,7 +83,7 @@ class Pipeline(GObject.Object):
             progress = 1
         return progress
 
-    def advance(self):
+    def advance(self) -> None:
         """Spawn tasks for managers that are able to run for a game"""
 
         # Separate blocking / async managers
@@ -106,5 +106,5 @@ class Pipeline(GObject.Object):
         self.advance()
 
     @GObject.Signal(name="advanced")
-    def advanced(self) -> None:
+    def advanced(self):  # type: ignore
         """Signal emitted when the pipeline has advanced"""

cartridges/store/store.py

@@ -18,12 +18,12 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import logging
-from typing import MutableMapping, Generator, Any
+from typing import Any, Generator, MutableMapping, Optional
 
-from src import shared
-from src.game import Game
-from src.store.managers.manager import Manager
-from src.store.pipeline import Pipeline
+from cartridges import shared
+from cartridges.game import Game
+from cartridges.store.managers.manager import Manager
+from cartridges.store.pipeline import Pipeline
 
 
 class Store:
@@ -33,18 +33,22 @@ class Store:
     pipeline_managers: set[Manager]
     pipelines: dict[str, Pipeline]
     source_games: MutableMapping[str, MutableMapping[str, Game]]
+    new_game_ids: set[str]
+    duplicate_game_ids: set[str]
 
     def __init__(self) -> None:
         self.managers = {}
         self.pipeline_managers = set()
         self.pipelines = {}
         self.source_games = {}
+        self.new_game_ids = set()
+        self.duplicate_game_ids = set()
 
     def __contains__(self, obj: object) -> bool:
         """Check if the game is present in the store with the `in` keyword"""
         if not isinstance(obj, Game):
             return False
-        if not (source_mapping := self.source_games.get(obj.source)):
+        if not (source_mapping := self.source_games.get(obj.base_source)):
             return False
         return obj.game_id in source_mapping
 
@@ -56,7 +60,7 @@ class Store:
 
     def __len__(self) -> int:
         """Get the number of games in the store with the `len` builtin"""
-        return sum(len(source_mapping) for source_mapping in self.source_games)
+        return sum(len(source_mapping) for source_mapping in self.source_games.values())
 
     def __getitem__(self, game_id: str) -> Game:
         """Get a game by its id with `store["game_id_goes_here"]`"""
@@ -73,13 +77,15 @@ class Store:
         except KeyError:
             return default
 
-    def add_manager(self, manager: Manager, in_pipeline=True):
+    def add_manager(self, manager: Manager, in_pipeline: bool = True) -> None:
         """Add a manager to the store"""
         manager_type = type(manager)
         self.managers[manager_type] = manager
         self.toggle_manager_in_pipelines(manager_type, in_pipeline)
 
-    def toggle_manager_in_pipelines(self, manager_type: type[Manager], enable: bool):
+    def toggle_manager_in_pipelines(
+        self, manager_type: type[Manager], enable: bool
+    ) -> None:
         """Change if a manager should run in new pipelines"""
         if enable:
             self.pipeline_managers.add(self.managers[manager_type])
@@ -87,7 +93,7 @@ class Store:
             self.pipeline_managers.discard(self.managers[manager_type])
 
     def cleanup_game(self, game: Game) -> None:
-        """Remove a game's files"""
+        """Remove a game's files, dismiss any loose toasts"""
         for path in (
             shared.games_dir / f"{game.game_id}.json",
             shared.covers_dir / f"{game.game_id}.tiff",
@@ -95,9 +101,17 @@ class Store:
         ):
             path.unlink(missing_ok=True)
 
+        # TODO: don't run this if the state is startup
+        for undo in ("remove", "hide"):
+            try:
+                shared.win.toasts[(game, undo)].dismiss()
+                shared.win.toasts.pop((game, undo))
+            except KeyError:
+                pass
+
     def add_game(
-        self, game: Game, additional_data: dict, run_pipeline=True
-    ) -> Pipeline | None:
+        self, game: Game, additional_data: dict, run_pipeline: bool = True
+    ) -> Optional[Pipeline]:
         """Add a game to the app"""
 
         # Ignore games from a newer spec version
@@ -114,6 +128,7 @@ class Store:
         if not stored_game:
             # New game, do as normal
             logging.debug("New store game %s (%s)", game.name, game.game_id)
+            self.new_game_ids.add(game.game_id)
         elif stored_game.removed:
             # Will replace a removed game, cleanup its remains
             logging.debug(
@@ -122,20 +137,22 @@ class Store:
                 game.game_id,
             )
             self.cleanup_game(stored_game)
+            self.new_game_ids.add(game.game_id)
         else:
             # Duplicate game, ignore it
             logging.debug("Duplicate store game %s (%s)", game.name, game.game_id)
+            self.duplicate_game_ids.add(game.game_id)
             return None
 
         # Connect signals
         for manager in self.managers.values():
             for signal in manager.signals:
-                game.connect(signal, manager.execute_resilient_manager_logic)
+                game.connect(signal, manager.run)
 
         # Add the game to the store
-        if not game.source in self.source_games:
-            self.source_games[game.source] = {}
-        self.source_games[game.source][game.game_id] = game
+        if not game.base_source in self.source_games:
+            self.source_games[game.base_source] = {}
+        self.source_games[game.base_source][game.game_id] = game
 
         # Run the pipeline for the game
         if not run_pipeline:

cartridges/utils/create_dialog.py

@@ -17,15 +17,23 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from gi.repository import Adw
+from typing import Optional
+
+from gi.repository import Adw, Gtk
 
 
-def create_dialog(win, heading, body, extra_option=None, extra_label=None):
-    dialog = Adw.MessageDialog.new(win, heading, body)
+def create_dialog(
+    win: Gtk.Window,
+    heading: str,
+    body: str,
+    extra_option: Optional[str] = None,
+    extra_label: Optional[str] = None,
+) -> Adw.AlertDialog:
+    dialog = Adw.AlertDialog.new(heading, body)
     dialog.add_response("dismiss", _("Dismiss"))
 
     if extra_option:
-        dialog.add_response(extra_option, _(extra_label))
+        dialog.add_response(extra_option, extra_label or "")
 
-    dialog.present()
+    dialog.choose(win)
     return dialog

cartridges/utils/rate_limiter.py

@@ -17,11 +17,11 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from typing import Optional, Sized
-from threading import Lock, Thread, BoundedSemaphore
-from time import sleep, time
 from collections import deque
 from contextlib import AbstractContextManager
+from threading import BoundedSemaphore, Lock, Thread
+from time import sleep, time
+from typing import Any, Sized
 
 
 class PickHistory(Sized):
@@ -30,22 +30,22 @@ class PickHistory(Sized):
 
     period: int
 
-    timestamps: list[int] = None
-    timestamps_lock: Lock = None
+    timestamps: list[float]
+    timestamps_lock: Lock
 
     def __init__(self, period: int) -> None:
         self.period = period
         self.timestamps = []
         self.timestamps_lock = Lock()
 
-    def remove_old_entries(self):
+    def remove_old_entries(self) -> None:
         """Remove history entries older than the period"""
         now = time()
         cutoff = now - self.period
         with self.timestamps_lock:
             self.timestamps = [entry for entry in self.timestamps if entry > cutoff]
 
-    def add(self, *new_timestamps: Optional[int]):
+    def add(self, *new_timestamps: float) -> None:
         """Add timestamps to the history.
         If none given, will add the current timestamp"""
         if len(new_timestamps) == 0:
@@ -60,7 +60,7 @@ class PickHistory(Sized):
             return len(self.timestamps)
 
     @property
-    def start(self) -> int:
+    def start(self) -> float:
         """Get the time at which the history started"""
         self.remove_old_entries()
         with self.timestamps_lock:
@@ -70,7 +70,7 @@ class PickHistory(Sized):
                 entry = time()
         return entry
 
-    def copy_timestamps(self) -> str:
+    def copy_timestamps(self) -> list[float]:
         """Get a copy of the timestamps history"""
         self.remove_old_entries()
         with self.timestamps_lock:
@@ -79,51 +79,55 @@ class PickHistory(Sized):
 
 # pylint: disable=too-many-instance-attributes
 class RateLimiter(AbstractContextManager):
-    """Rate limiter implementing the token bucket algorithm"""
+    """
+    Base rate limiter implementing the token bucket algorithm.
+
+    Do not use directly, create a child class to tailor the rate limiting to the
+    underlying service's limits.
+
+    Subclasses must provide values to the following attributes:
+    * refill_period_seconds - Period in which we have a max amount of tokens
+    * refill_period_tokens - Number of tokens allowed in this period
+    * burst_tokens - Max number of tokens that can be consumed instantly
+    """
 
-    # Period in which we have a max amount of tokens
     refill_period_seconds: int
-    # Number of tokens allowed in this period
     refill_period_tokens: int
-    # Max number of tokens that can be consumed instantly
     burst_tokens: int
 
-    pick_history: PickHistory = None
-    bucket: BoundedSemaphore = None
-    queue: deque[Lock] = None
-    queue_lock: Lock = None
+    pick_history: PickHistory
+    bucket: BoundedSemaphore
+    queue: deque[Lock]
+    queue_lock: Lock
 
     # Protect the number of tokens behind a lock
-    __n_tokens_lock: Lock = None
+    __n_tokens_lock: Lock
     __n_tokens = 0
 
     @property
-    def n_tokens(self):
+    def n_tokens(self) -> int:
         with self.__n_tokens_lock:
             return self.__n_tokens
 
     @n_tokens.setter
-    def n_tokens(self, value: int):
+    def n_tokens(self, value: int) -> None:
         with self.__n_tokens_lock:
             self.__n_tokens = value
 
-    def __init__(
-        self,
-        refill_period_seconds: Optional[int] = None,
-        refill_period_tokens: Optional[int] = None,
-        burst_tokens: Optional[int] = None,
-    ) -> None:
+    def _init_pick_history(self) -> None:
+        """
+        Initialize the tocken pick history
+        (only for use in this class and its children)
+
+        By default, creates an empty pick history.
+        Should be overriden or extended by subclasses.
+        """
+        self.pick_history = PickHistory(self.refill_period_seconds)
+
+    def __init__(self) -> None:
         """Initialize the limiter"""
 
-        # Initialize default values
-        if refill_period_seconds is not None:
-            self.refill_period_seconds = refill_period_seconds
-        if refill_period_tokens is not None:
-            self.refill_period_tokens = refill_period_tokens
-        if burst_tokens is not None:
-            self.burst_tokens = burst_tokens
-        if self.pick_history is None:
-            self.pick_history = PickHistory(self.refill_period_seconds)
+        self._init_pick_history()
 
         # Create synchronization data
         self.__n_tokens_lock = Lock()
@@ -147,8 +151,8 @@ class RateLimiter(AbstractContextManager):
         """
 
         # Compute ideal spacing
-        tokens_left = self.refill_period_tokens - len(self.pick_history)
-        seconds_left = self.pick_history.start + self.refill_period_seconds - time()
+        tokens_left = self.refill_period_tokens - len(self.pick_history)  # type: ignore
+        seconds_left = self.pick_history.start + self.refill_period_seconds - time()  # type: ignore
         try:
             spacing_seconds = seconds_left / tokens_left
         except ZeroDivisionError:
@@ -159,7 +163,7 @@ class RateLimiter(AbstractContextManager):
         natural_spacing = self.refill_period_seconds / self.refill_period_tokens
         return max(natural_spacing, spacing_seconds)
 
-    def refill(self):
+    def refill(self) -> None:
         """Add a token back in the bucket"""
         sleep(self.refill_spacing)
         try:
@@ -170,7 +174,7 @@ class RateLimiter(AbstractContextManager):
         else:
             self.n_tokens += 1
 
-    def refill_thread_func(self):
+    def refill_thread_func(self) -> None:
         """Entry point for the daemon thread that is refilling the bucket"""
         while True:
             self.refill()
@@ -200,18 +204,18 @@ class RateLimiter(AbstractContextManager):
             self.queue.appendleft(lock)
         return lock
 
-    def acquire(self):
+    def acquire(self) -> None:
         """Acquires a token from the bucket when it's your turn in queue"""
         lock = self.add_to_queue()
         self.update_queue()
         # Wait until our turn in queue
         lock.acquire()  # pylint: disable=consider-using-with
-        self.pick_history.add()
+        self.pick_history.add()  # type: ignore
 
     # --- Support for use in with statements
 
-    def __enter__(self):
+    def __enter__(self) -> None:
         self.acquire()
 
-    def __exit__(self, *_args):
+    def __exit__(self, *_args: Any) -> None:
         pass

cartridges/utils/relative_date.py

@@ -18,11 +18,12 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from datetime import datetime
+from typing import Any
 
 from gi.repository import GLib
 
 
-def relative_date(timestamp):  # pylint: disable=too-many-return-statements
+def relative_date(timestamp: int) -> Any:  # pylint: disable=too-many-return-statements
     days_no = ((today := datetime.today()) - datetime.fromtimestamp(timestamp)).days
 
     if days_no == 0:

cartridges/utils/run_executable.py

@@ -1,6 +1,6 @@
-# check_install.py
+# run_executable.py
 #
-# Copyright 2022-2023 kramo
+# Copyright 2023 kramo
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,16 +17,27 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from pathlib import Path
+import logging
+import os
+import subprocess
+from shlex import quote
+
+from cartridges import shared
 
 
-# TODO delegate to the sources
-def check_install(check, locations, setting=None, subdirs=(Path(),)):
-    for location in locations:
-        for subdir in (Path(),) + subdirs:
-            if (location / subdir / check).exists():
-                if setting:
-                    setting[0].set_string(setting[1], str(location / subdir))
-                return location / subdir
+def run_executable(executable) -> None:
+    args = (
+        "flatpak-spawn --host /bin/sh -c " + quote(executable)  # Flatpak
+        if os.getenv("FLATPAK_ID") == shared.APP_ID
+        else executable  # Others
+    )
 
-    return False
+    logging.info("Launching `%s`", str(args))
+    # pylint: disable=consider-using-with
+    subprocess.Popen(
+        args,
+        cwd=shared.home,
+        shell=True,
+        start_new_session=True,
+        creationflags=subprocess.CREATE_NEW_PROCESS_GROUP if os.name == "nt" else 0,  # type: ignore
+    )

cartridges/utils/save_cover.py

@@ -20,26 +20,40 @@
 
 from pathlib import Path
 from shutil import copyfile
+from typing import Optional
 
-from gi.repository import Gdk, Gio, GLib
+from gi.repository import Gdk, GdkPixbuf, Gio, GLib
 from PIL import Image, ImageSequence, UnidentifiedImageError
 
-from src import shared
+from cartridges import shared
 
 
-def resize_cover(cover_path=None, pixbuf=None):
+def convert_cover(
+    cover_path: Optional[Path] = None,
+    pixbuf: Optional[GdkPixbuf.Pixbuf] = None,
+    resize: bool = True,
+) -> Optional[Path]:
     if not cover_path and not pixbuf:
         return None
 
+    pixbuf_extensions = set()
+    for pixbuf_format in GdkPixbuf.Pixbuf.get_formats():
+        for pixbuf_extension in pixbuf_format.get_extensions():
+            pixbuf_extensions.add(pixbuf_extension)
+
+    if not resize and cover_path and cover_path.suffix.lower()[1:] in pixbuf_extensions:
+        return cover_path
+
     if pixbuf:
         cover_path = Path(Gio.File.new_tmp("XXXXXX.tiff")[0].get_path())
-        pixbuf.savev(str(cover_path), "tiff", ["compression"], ["1"])
+        pixbuf.savev(str(cover_path), "tiff")
 
     try:
         with Image.open(cover_path) as image:
             if getattr(image, "is_animated", False):
                 frames = tuple(
-                    frame.resize((200, 300)) for frame in ImageSequence.Iterator(image)
+                    frame.resize((200, 300)) if resize else frame
+                    for frame in ImageSequence.Iterator(image)
                 )
 
                 tmp_path = Path(Gio.File.new_tmp("XXXXXX.gif")[0].get_path())
@@ -56,25 +70,25 @@ def resize_cover(cover_path=None, pixbuf=None):
                     image = image.convert("RGBA")
 
                 tmp_path = Path(Gio.File.new_tmp("XXXXXX.tiff")[0].get_path())
-                image.resize(shared.image_size).save(
+                (image.resize(shared.image_size) if resize else image).save(
                     tmp_path,
                     compression="tiff_adobe_deflate"
                     if shared.schema.get_boolean("high-quality-images")
-                    else "webp",
+                    else shared.TIFF_COMPRESSION,
                 )
     except UnidentifiedImageError:
         try:
             Gdk.Texture.new_from_filename(str(cover_path)).save_to_tiff(
                 tmp_path := Gio.File.new_tmp("XXXXXX.tiff")[0].get_path()
             )
-            return resize_cover(tmp_path)
-        except GLib.GError:
+            return convert_cover(tmp_path)
+        except GLib.Error:
             return None
 
     return tmp_path
 
 
-def save_cover(game_id, cover_path):
+def save_cover(game_id: str, cover_path: Path) -> None:
     shared.covers_dir.mkdir(parents=True, exist_ok=True)
 
     animated_path = shared.covers_dir / f"{game_id}.gif"

cartridges/utils/steam.py

@@ -21,13 +21,14 @@
 import json
 import logging
 import re
+from pathlib import Path
 from typing import TypedDict
 
 import requests
 from requests.exceptions import HTTPError
 
-from src import shared
-from src.utils.rate_limiter import PickHistory, RateLimiter
+from cartridges import shared
+from cartridges.utils.rate_limiter import RateLimiter
 
 
 class SteamError(Exception):
@@ -71,16 +72,18 @@ class SteamRateLimiter(RateLimiter):
     refill_period_tokens = 200
     burst_tokens = 100
 
-    def __init__(self) -> None:
-        # Load pick history from schema
-        # (Remember API limits through restarts of Cartridges)
+    def _init_pick_history(self) -> None:
+        """
+        Load the pick history from schema.
+
+        Allows remembering API limits through restarts of Cartridges.
+        """
+        super()._init_pick_history()
         timestamps_str = shared.state_schema.get_string("steam-limiter-tokens-history")
-        self.pick_history = PickHistory(self.refill_period_seconds)
         self.pick_history.add(*json.loads(timestamps_str))
         self.pick_history.remove_old_entries()
-        super().__init__()
 
-    def acquire(self):
+    def acquire(self) -> None:
         """Get a token from the bucket and store the pick history in the schema"""
         super().acquire()
         timestamps_str = json.dumps(self.pick_history.copy_timestamps())
@@ -88,9 +91,9 @@ class SteamRateLimiter(RateLimiter):
 
 
 class SteamFileHelper:
-    """Helper for steam file formats"""
+    """Helper for Steam file formats"""
 
-    def get_manifest_data(self, manifest_path) -> SteamManifestData:
+    def get_manifest_data(self, manifest_path: Path) -> SteamManifestData:
         """Get local data for a game from its manifest"""
 
         with open(manifest_path, "r", encoding="utf-8") as file:
@@ -104,7 +107,11 @@ class SteamFileHelper:
                 raise SteamInvalidManifestError()
             data[key] = match.group(1)
 
-        return SteamManifestData(**data)
+        return SteamManifestData(
+            name=data["name"],
+            appid=data["appid"],
+            stateflags=data["stateflags"],
+        )
 
 
 class SteamAPIHelper:
@@ -116,7 +123,7 @@ class SteamAPIHelper:
     def __init__(self, rate_limiter: RateLimiter) -> None:
         self.rate_limiter = rate_limiter
 
-    def get_api_data(self, appid) -> SteamAPIData:
+    def get_api_data(self, appid: str) -> SteamAPIData:
         """
         Get online data for a game from its appid.
         May block to satisfy the Steam web API limitations.

cartridges/utils/steamgriddb.py

@@ -20,47 +20,49 @@
 
 import logging
 from pathlib import Path
+from typing import Any
 
 import requests
 from gi.repository import Gio
 from requests.exceptions import HTTPError
 
-from src import shared
-from src.utils.save_cover import resize_cover, save_cover
+from cartridges import shared
+from cartridges.game import Game
+from cartridges.utils.save_cover import convert_cover, save_cover
 
 
-class SGDBError(Exception):
+class SgdbError(Exception):
     pass
 
 
-class SGDBAuthError(SGDBError):
+class SgdbAuthError(SgdbError):
     pass
 
 
-class SGDBGameNotFoundError(SGDBError):
+class SgdbGameNotFound(SgdbError):
     pass
 
 
-class SGDBBadRequestError(SGDBError):
+class SgdbBadRequest(SgdbError):
     pass
 
 
-class SGDBNoImageFoundError(SGDBError):
+class SgdbNoImageFound(SgdbError):
     pass
 
 
-class SGDBHelper:
+class SgdbHelper:
     """Helper class to make queries to SteamGridDB"""
 
     base_url = "https://www.steamgriddb.com/api/v2/"
 
     @property
-    def auth_headers(self):
+    def auth_headers(self) -> dict[str, str]:
         key = shared.schema.get_string("sgdb-key")
         headers = {"Authorization": f"Bearer {key}"}
         return headers
 
-    def get_game_id(self, game):
+    def get_game_id(self, game: Game) -> Any:
         """Get grid results for a game. Can raise an exception."""
         uri = f"{self.base_url}search/autocomplete/{game.name}"
         res = requests.get(uri, headers=self.auth_headers, timeout=5)
@@ -68,13 +70,13 @@ class SGDBHelper:
             case 200:
                 return res.json()["data"][0]["id"]
             case 401:
-                raise SGDBAuthError(res.json()["errors"][0])
+                raise SgdbAuthError(res.json()["errors"][0])
             case 404:
-                raise SGDBGameNotFoundError(res.status_code)
+                raise SgdbGameNotFound(res.status_code)
             case _:
                 res.raise_for_status()
 
-    def get_image_uri(self, game_id, animated=False):
+    def get_image_uri(self, game_id: str, animated: bool = False) -> Any:
         """Get the image for a SGDB game id"""
         uri = f"{self.base_url}grids/game/{game_id}?dimensions=600x900"
         if animated:
@@ -84,16 +86,16 @@ class SGDBHelper:
             case 200:
                 data = res.json()["data"]
                 if len(data) == 0:
-                    raise SGDBNoImageFoundError()
+                    raise SgdbNoImageFound()
                 return data[0]["url"]
             case 401:
-                raise SGDBAuthError(res.json()["errors"][0])
+                raise SgdbAuthError(res.json()["errors"][0])
             case 404:
-                raise SGDBGameNotFoundError(res.status_code)
+                raise SgdbGameNotFound(res.status_code)
             case _:
                 res.raise_for_status()
 
-    def conditionaly_update_cover(self, game):
+    def conditionaly_update_cover(self, game: Game) -> None:
         """Update the game's cover if appropriate"""
 
         # Obvious skips
@@ -103,17 +105,17 @@ class SGDBHelper:
 
         image_trunk = shared.covers_dir / game.game_id
         still = image_trunk.with_suffix(".tiff")
-        uri_kwargs = image_trunk.with_suffix(".gif")
+        animated = image_trunk.with_suffix(".gif")
         prefer_sgdb = shared.schema.get_boolean("sgdb-prefer")
 
         # Do nothing if file present and not prefer SGDB
-        if not prefer_sgdb and (still.is_file() or uri_kwargs.is_file()):
+        if not prefer_sgdb and (still.is_file() or animated.is_file()):
             return
 
         # Get ID for the game
         try:
             sgdb_id = self.get_game_id(game)
-        except (HTTPError, SGDBError) as error:
+        except (HTTPError, SgdbError) as error:
             logging.warning(
                 "%s while getting SGDB ID for %s", type(error).__name__, game.name
             )
@@ -132,11 +134,11 @@ class SGDBHelper:
                 tmp_file = Gio.File.new_tmp()[0]
                 tmp_file_path = tmp_file.get_path()
                 Path(tmp_file_path).write_bytes(response.content)
-                save_cover(game.game_id, resize_cover(tmp_file_path))
-            except SGDBAuthError as error:
+                save_cover(game.game_id, convert_cover(tmp_file_path))
+            except SgdbAuthError as error:
                 # Let caller handle auth errors
                 raise error
-            except (HTTPError, SGDBError) as error:
+            except (HTTPError, SgdbError) as error:
                 logging.warning(
                     "%s while getting image for %s kwargs=%s",
                     type(error).__name__,
@@ -154,4 +156,4 @@ class SGDBHelper:
             game.name,
             sgdb_id,
         )
-        raise SGDBNoImageFoundError()
+        raise SgdbNoImageFound()

cartridges/window.py

@@ -0,0 +1,537 @@
+# window.py
+#
+# Copyright 2022-2023 kramo
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# pyright: reportAssignmentType=none
+
+from sys import platform
+from typing import Any, Optional
+
+from cartridges import shared
+from cartridges.game import Game
+from cartridges.game_cover import GameCover
+from cartridges.utils.relative_date import relative_date
+from gi.repository import Adw, Gio, GLib, Gtk, Pango
+
+
+@Gtk.Template(resource_path=shared.PREFIX + "/gtk/window.ui")
+class CartridgesWindow(Adw.ApplicationWindow):
+    __gtype_name__ = "CartridgesWindow"
+
+    overlay_split_view: Adw.OverlaySplitView = Gtk.Template.Child()
+    navigation_view: Adw.NavigationView = Gtk.Template.Child()
+    sidebar_navigation_page: Adw.NavigationPage = Gtk.Template.Child()
+    sidebar: Gtk.ListBox = Gtk.Template.Child()
+    all_games_row_box: Gtk.Box = Gtk.Template.Child()
+    all_games_no_label: Gtk.Label = Gtk.Template.Child()
+    added_row_box: Gtk.Box = Gtk.Template.Child()
+    added_games_no_label: Gtk.Label = Gtk.Template.Child()
+    toast_overlay: Adw.ToastOverlay = Gtk.Template.Child()
+    primary_menu_button: Gtk.MenuButton = Gtk.Template.Child()
+    show_sidebar_button: Gtk.Button = Gtk.Template.Child()
+    details_view: Gtk.Overlay = Gtk.Template.Child()
+    library_page: Adw.NavigationPage = Gtk.Template.Child()
+    library_view: Adw.ToolbarView = Gtk.Template.Child()
+    library: Gtk.FlowBox = Gtk.Template.Child()
+    scrolledwindow: Gtk.ScrolledWindow = Gtk.Template.Child()
+    library_overlay: Gtk.Overlay = Gtk.Template.Child()
+    notice_empty: Adw.StatusPage = Gtk.Template.Child()
+    notice_no_results: Adw.StatusPage = Gtk.Template.Child()
+    search_bar: Gtk.SearchBar = Gtk.Template.Child()
+    search_entry: Gtk.SearchEntry = Gtk.Template.Child()
+    search_button: Gtk.ToggleButton = Gtk.Template.Child()
+
+    details_page: Adw.NavigationPage = Gtk.Template.Child()
+    details_view_toolbar_view: Adw.ToolbarView = Gtk.Template.Child()
+    details_view_cover: Gtk.Picture = Gtk.Template.Child()
+    details_view_spinner: Adw.Spinner = Gtk.Template.Child()
+    details_view_title: Gtk.Label = Gtk.Template.Child()
+    details_view_blurred_cover: Gtk.Picture = Gtk.Template.Child()
+    details_view_play_button: Gtk.Button = Gtk.Template.Child()
+    details_view_developer: Gtk.Label = Gtk.Template.Child()
+    details_view_added: Gtk.ShortcutLabel = Gtk.Template.Child()
+    details_view_last_played: Gtk.Label = Gtk.Template.Child()
+    details_view_hide_button: Gtk.Button = Gtk.Template.Child()
+
+    hidden_library_page: Adw.NavigationPage = Gtk.Template.Child()
+    hidden_primary_menu_button: Gtk.MenuButton = Gtk.Template.Child()
+    hidden_library: Gtk.FlowBox = Gtk.Template.Child()
+    hidden_library_view: Adw.ToolbarView = Gtk.Template.Child()
+    hidden_scrolledwindow: Gtk.ScrolledWindow = Gtk.Template.Child()
+    hidden_library_overlay: Gtk.Overlay = Gtk.Template.Child()
+    hidden_notice_empty: Adw.StatusPage = Gtk.Template.Child()
+    hidden_notice_no_results: Adw.StatusPage = Gtk.Template.Child()
+    hidden_search_bar: Gtk.SearchBar = Gtk.Template.Child()
+    hidden_search_entry: Gtk.SearchEntry = Gtk.Template.Child()
+    hidden_search_button: Gtk.ToggleButton = Gtk.Template.Child()
+
+    game_covers: dict = {}
+    toasts: dict = {}
+    active_game: Game
+    details_view_game_cover: Optional[GameCover] = None
+    sort_state: str = "last_played"
+    filter_state: str = "all"
+    source_rows: dict = {}
+
+    def create_source_rows(self) -> None:
+        def get_removed(source_id: str) -> Any:
+            removed = tuple(
+                game.removed or game.hidden or game.blacklisted
+                for game in shared.store.source_games[source_id].values()
+            )
+            return (
+                (count,) if (count := sum(removed)) != len(removed) else False
+            )  # Return a tuple because 0 == False and 1 == True
+
+        total_games_no = 0
+        restored = False
+
+        selected_id = (
+            self.source_rows[selected_row][0]
+            if (selected_row := self.sidebar.get_selected_row()) in self.source_rows
+            else None
+        )
+
+        if selected_row == self.added_row_box.get_parent():
+            self.sidebar.select_row(self.added_row_box.get_parent())
+            restored = True
+
+        if added_missing := (
+            not shared.store.source_games.get("imported")
+            or not (removed := get_removed("imported"))
+        ):
+            self.sidebar.select_row(self.all_games_row_box.get_parent())
+        else:
+            games_no = len(shared.store.source_games["imported"]) - removed[0]
+            self.added_games_no_label.set_label(str(games_no))
+            total_games_no += games_no
+        self.added_row_box.get_parent().set_visible(not added_missing)
+
+        self.sidebar.get_row_at_index(2).set_visible(False)
+
+        while row := self.sidebar.get_row_at_index(3):
+            self.sidebar.remove(row)
+
+        for source_id in shared.store.source_games:
+            if source_id == "imported":
+                continue
+            if not (removed := get_removed(source_id)):
+                continue
+
+            row = Gtk.Box(
+                margin_top=12,
+                margin_bottom=12,
+                margin_start=6,
+                margin_end=6,
+                spacing=12,
+            )
+            games_no = len(shared.store.source_games[source_id]) - removed[0]
+            total_games_no += games_no
+
+            row.append(
+                Gtk.Image.new_from_icon_name(
+                    "user-desktop-symbolic"
+                    if (split_id := source_id.split("_")[0]) == "desktop"
+                    else f"{split_id}-source-symbolic"
+                )
+            )
+
+            row.append(
+                Gtk.Label(
+                    label=self.get_application().get_source_name(source_id),
+                    halign=Gtk.Align.START,
+                    wrap=True,
+                    wrap_mode=Pango.WrapMode.CHAR,
+                )
+            )
+
+            row.append(
+                games_no_label := Gtk.Label(
+                    label=games_no,
+                    hexpand=True,
+                    halign=Gtk.Align.END,
+                )
+            )
+
+            games_no_label.add_css_class("dim-label")
+
+            # Order rows based on the number of games in them
+            index = 3
+            while source_row := self.sidebar.get_row_at_index(index):
+                if self.source_rows[source_row][1] < games_no:
+                    self.sidebar.insert(row, index)
+                    break
+                index += 1
+            if not row.get_parent():
+                self.sidebar.append(row)
+
+            self.source_rows[row.get_parent()] = (
+                source_id,
+                games_no,
+            )
+
+            if source_id == selected_id:
+                self.sidebar.select_row(row.get_parent())
+                restored = True
+
+            self.sidebar.get_row_at_index(2).set_visible(True)
+
+        self.all_games_no_label.set_label(str(total_games_no))
+
+        if not restored:
+            self.sidebar.select_row(self.all_games_row_box.get_parent())
+
+    def row_selected(self, _widget: Any, row: Gtk.ListBoxRow | None) -> None:
+        if not row:
+            return
+        match row.get_child():
+            case self.all_games_row_box:
+                value = "all"
+            case self.added_row_box:
+                value = "imported"
+            case _:
+                value = self.source_rows[row][0]
+
+        self.library_page.set_title(self.get_application().get_source_name(value))
+
+        self.filter_state = value
+        self.library.invalidate_filter()
+
+        if self.overlay_split_view.get_collapsed():
+            self.overlay_split_view.set_show_sidebar(False)
+
+    def __init__(self, **kwargs: Any) -> None:
+        super().__init__(**kwargs)
+
+        if platform == "darwin":
+            self.sidebar_navigation_page.set_title("")
+
+        self.details_view.set_measure_overlay(self.details_view_toolbar_view, True)
+        self.details_view.set_clip_overlay(self.details_view_toolbar_view, False)
+
+        self.library.set_filter_func(self.filter_func)
+        self.hidden_library.set_filter_func(self.filter_func)
+
+        self.library.set_sort_func(self.sort_func)
+        self.hidden_library.set_sort_func(self.sort_func)
+
+        self.set_library_child()
+
+        self.notice_empty.set_icon_name(shared.APP_ID + "-symbolic")
+
+        self.overlay_split_view.set_show_sidebar(
+            shared.state_schema.get_boolean("show-sidebar")
+        )
+
+        self.sidebar.select_row(self.all_games_row_box.get_parent())
+
+        if shared.PROFILE == "development":
+            self.add_css_class("devel")
+
+        # Connect search entries
+        self.search_bar.connect_entry(self.search_entry)
+        self.hidden_search_bar.connect_entry(self.hidden_search_entry)
+
+        # Connect signals
+        self.search_entry.connect("search-changed", self.search_changed, False)
+        self.hidden_search_entry.connect("search-changed", self.search_changed, True)
+
+        self.search_entry.connect("activate", self.show_details_page_search)
+        self.hidden_search_entry.connect("activate", self.show_details_page_search)
+
+        self.navigation_view.connect("popped", self.set_show_hidden)
+        self.navigation_view.connect("pushed", self.set_show_hidden)
+
+        self.sidebar.connect("row-selected", self.row_selected)
+
+        style_manager = Adw.StyleManager.get_default()
+        style_manager.connect("notify::dark", self.set_details_view_opacity)
+        style_manager.connect("notify::high-contrast", self.set_details_view_opacity)
+
+        # Allow for a custom number of rows for the library
+        if shared.schema.get_uint("library-rows"):
+            shared.schema.bind(
+                "library-rows",
+                self.library,
+                "max-children-per-line",
+                Gio.SettingsBindFlags.DEFAULT,
+            )
+            shared.schema.bind(
+                "library-rows",
+                self.hidden_library,
+                "max-children-per-line",
+                Gio.SettingsBindFlags.DEFAULT,
+            )
+        else:
+            self.library.set_max_children_per_line(10)
+            self.hidden_library.set_max_children_per_line(10)
+
+    def search_changed(self, _widget: Any, hidden: bool) -> None:
+        # Refresh search filter on keystroke in search box
+        (self.hidden_library if hidden else self.library).invalidate_filter()
+
+    def set_library_child(self) -> None:
+        child, hidden_child = self.notice_empty, self.hidden_notice_empty
+
+        for game in shared.store:
+            if game.removed or game.blacklisted:
+                continue
+            if game.hidden:
+                if game.filtered and hidden_child:
+                    hidden_child = self.hidden_notice_no_results
+                    continue
+                hidden_child = None
+            else:
+                if game.filtered and child:
+                    child = self.notice_no_results
+                    continue
+                child = None
+
+        def remove_from_overlay(widget: Gtk.Widget) -> None:
+            if isinstance(widget.get_parent(), Gtk.Overlay):
+                widget.get_parent().remove_overlay(widget)
+
+        if child:
+            self.library_overlay.add_overlay(child)
+        else:
+            remove_from_overlay(self.notice_empty)
+            remove_from_overlay(self.notice_no_results)
+
+        if hidden_child:
+            self.hidden_library_overlay.add_overlay(hidden_child)
+        else:
+            remove_from_overlay(self.hidden_notice_empty)
+            remove_from_overlay(self.hidden_notice_no_results)
+
+    def filter_func(self, child: Gtk.Widget) -> bool:
+        game = child.get_child()
+        text = (
+            (
+                self.hidden_search_entry
+                if self.navigation_view.get_visible_page() == self.hidden_library_page
+                else self.search_entry
+            )
+            .get_text()
+            .lower()
+        )
+
+        filtered = text != "" and not (
+            text in game.name.lower()
+            or (text in game.developer.lower() if game.developer else False)
+        )
+
+        if not filtered:
+            if self.filter_state == "all":
+                pass
+            elif game.base_source != self.filter_state:
+                filtered = True
+
+        game.filtered = filtered
+        self.set_library_child()
+
+        return not filtered
+
+    def set_active_game(self, _widget: Any, _pspec: Any, game: Game) -> None:
+        self.active_game = game
+
+    def show_details_page(self, game: Game) -> None:
+        self.active_game = game
+
+        self.details_view_cover.set_opacity(int(not game.loading))
+        self.details_view_spinner.set_visible(game.loading)
+
+        self.details_view_developer.set_label(game.developer or "")
+        self.details_view_developer.set_visible(bool(game.developer))
+
+        icon, text = "view-conceal-symbolic", _("Hide")
+        if game.hidden:
+            icon, text = "view-reveal-symbolic", _("Unhide")
+
+        self.details_view_hide_button.set_icon_name(icon)
+        self.details_view_hide_button.set_tooltip_text(text)
+
+        if self.details_view_game_cover:
+            self.details_view_game_cover.pictures.remove(self.details_view_cover)
+
+        self.details_view_game_cover = game.game_cover
+        self.details_view_game_cover.add_picture(self.details_view_cover)
+
+        self.details_view_blurred_cover.set_paintable(
+            self.details_view_game_cover.get_blurred()
+        )
+
+        self.details_view_title.set_label(game.name)
+        self.details_page.set_title(game.name)
+
+        date = relative_date(game.added)
+        self.details_view_added.set_label(
+            # The variable is the date when the game was added
+            _("Added: {}").format(date)
+        )
+        last_played_date = (
+            relative_date(game.last_played) if game.last_played else _("Never")
+        )
+        self.details_view_last_played.set_label(
+            # The variable is the date when the game was last played
+            _("Last played: {}").format(last_played_date)
+        )
+
+        if self.navigation_view.get_visible_page() != self.details_page:
+            self.navigation_view.push(self.details_page)
+            self.set_focus(self.details_view_play_button)
+
+        self.set_details_view_opacity()
+
+    def set_details_view_opacity(self, *_args: Any) -> None:
+        if self.navigation_view.get_visible_page() != self.details_page:
+            return
+
+        if (
+            style_manager := Adw.StyleManager.get_default()
+        ).get_high_contrast() or not style_manager.get_system_supports_color_schemes():
+            self.details_view_blurred_cover.set_opacity(0.3)
+            return
+
+        self.details_view_blurred_cover.set_opacity(
+            1 - self.details_view_game_cover.luminance[0]  # type: ignore
+            if style_manager.get_dark()
+            else self.details_view_game_cover.luminance[1]  # type: ignore
+        )
+
+    def sort_func(self, child1: Gtk.Widget, child2: Gtk.Widget) -> int:
+        var, order = "name", True
+
+        if self.sort_state in ("newest", "oldest"):
+            var, order = "added", self.sort_state == "newest"
+        elif self.sort_state == "last_played":
+            var = "last_played"
+        elif self.sort_state == "a-z":
+            order = False
+
+        def get_value(index: int) -> str:
+            return (
+                str(getattr((child1.get_child(), child2.get_child())[index], var))
+                .lower()
+                .removeprefix("the ")
+            )
+
+        if var != "name" and get_value(0) == get_value(1):
+            var, order = "name", False
+
+        return ((get_value(0) > get_value(1)) ^ order) * 2 - 1
+
+    def set_show_hidden(self, navigation_view: Adw.NavigationView, *_args: Any) -> None:
+        self.lookup_action("show_hidden").set_enabled(
+            navigation_view.get_visible_page() == self.library_page
+        )
+
+    def on_show_sidebar_action(self, *_args: Any) -> None:
+        shared.state_schema.set_boolean(
+            "show-sidebar", (value := not self.overlay_split_view.get_show_sidebar())
+        )
+        self.overlay_split_view.set_show_sidebar(value)
+
+    def on_go_to_parent_action(self, *_args: Any) -> None:
+        if self.navigation_view.get_visible_page() == self.details_page:
+            self.navigation_view.pop()
+
+    def on_go_home_action(self, *_args: Any) -> None:
+        self.navigation_view.pop_to_page(self.library_page)
+
+    def on_show_hidden_action(self, *_args: Any) -> None:
+        if self.navigation_view.get_visible_page() == self.hidden_library_page:
+            return
+
+        self.navigation_view.push(self.hidden_library_page)
+
+    def on_sort_action(self, action: Gio.SimpleAction, state: GLib.Variant) -> None:
+        action.set_state(state)
+        self.sort_state = str(state).strip("'")
+        self.library.invalidate_sort()
+
+        shared.state_schema.set_string("sort-mode", self.sort_state)
+
+    def on_toggle_search_action(self, *_args: Any) -> None:
+        if self.navigation_view.get_visible_page() == self.library_page:
+            search_bar = self.search_bar
+            search_entry = self.search_entry
+        elif self.navigation_view.get_visible_page() == self.hidden_library_page:
+            search_bar = self.hidden_search_bar
+            search_entry = self.hidden_search_entry
+        else:
+            return
+
+        search_bar.set_search_mode(not (search_mode := search_bar.get_search_mode()))
+
+        if not search_mode:
+            self.set_focus(search_entry)
+
+        search_entry.set_text("")
+
+    def show_details_page_search(self, widget: Gtk.Widget) -> None:
+        library = (
+            self.hidden_library if widget == self.hidden_search_entry else self.library
+        )
+        index = 0
+
+        while True:
+            if not (child := library.get_child_at_index(index)):
+                break
+
+            if self.filter_func(child):
+                self.show_details_page(child.get_child())
+                break
+
+            index += 1
+
+    def on_undo_action(
+        self, _widget: Any, game: Optional[Game] = None, undo: Optional[str] = None
+    ) -> None:
+        if not game:  # If the action was activated via Ctrl + Z
+            if shared.importer and (
+                shared.importer.imported_game_ids or shared.importer.removed_game_ids
+            ):
+                shared.importer.undo_import()
+                return
+
+            try:
+                game = tuple(self.toasts.keys())[-1][0]
+                undo = tuple(self.toasts.keys())[-1][1]
+            except IndexError:
+                return
+
+        if game:
+            if undo == "hide":
+                game.toggle_hidden(False)
+
+            elif undo == "remove":
+                game.removed = False
+                game.save()
+                game.update()
+
+            self.toasts[(game, undo)].dismiss()
+            self.toasts.pop((game, undo))
+
+    def on_open_menu_action(self, *_args: Any) -> None:
+        if self.navigation_view.get_visible_page() == self.library_page:
+            self.primary_menu_button.popup()
+        elif self.navigation_view.get_visible_page() == self.hidden_library_page:
+            self.hidden_primary_menu_button.popup()
+
+    def on_close_action(self, *_args: Any) -> None:
+        self.close()

data/cartridges.gresource.xml.in

@@ -1,14 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="@PREFIX@">
-    <file preprocess="xml-stripblanks">gtk/window.ui</file>
-    <file preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
+    <file preprocess="xml-stripblanks">@APP_ID@.metainfo.xml</file>
+    <file preprocess="xml-stripblanks">gtk/details-dialog.ui</file>
     <file preprocess="xml-stripblanks">gtk/game.ui</file>
     <file preprocess="xml-stripblanks">gtk/preferences.ui</file>
-    <file preprocess="xml-stripblanks">gtk/details-window.ui</file>
+    <file preprocess="xml-stripblanks">gtk/window.ui</file>
+    <file preprocess="xml-stripblanks" alias="shortcuts-dialog.ui">gtk/shortcuts-dialog.ui</file>
     <file alias="style.css">gtk/style.css</file>
-    <file alias="style-dark.css">gtk/style-dark.css</file>
     <file>library_placeholder.svg</file>
     <file>library_placeholder_small.svg</file>
   </gresource>
+  <gresource prefix="@PREFIX@/icons/scalable/categories/">
+  <file alias="bottles-source-symbolic.svg">icons/sources/bottles-source-symbolic.svg</file>
+  <file alias="flatpak-source-symbolic.svg">icons/sources/flatpak-source-symbolic.svg</file>
+  <file alias="heroic-source-symbolic.svg">icons/sources/heroic-source-symbolic.svg</file>
+  <file alias="itch-source-symbolic.svg">icons/sources/itch-source-symbolic.svg</file>
+  <file alias="legendary-source-symbolic.svg">icons/sources/legendary-source-symbolic.svg</file>
+  <file alias="lutris-source-symbolic.svg">icons/sources/lutris-source-symbolic.svg</file>
+  <file alias="retroarch-source-symbolic.svg">icons/sources/retroarch-source-symbolic.svg</file>
+  <file alias="steam-source-symbolic.svg">icons/sources/steam-source-symbolic.svg</file>
+  </gresource>
 </gresources>

data/gtk/details-dialog.blp

@@ -0,0 +1,145 @@
+using Gtk 4.0;
+using Adw 1;
+
+template $DetailsDialog: Adw.Dialog {
+  content-width: 480;
+
+  Adw.ToolbarView {
+    [top]
+    Adw.HeaderBar HeaderBar {
+      show-start-title-buttons: false;
+      show-end-title-buttons: false;
+
+      [start]
+      Button cancel_button {
+        label: _("Cancel");
+        action-name: "window.close";
+      }
+
+      [end]
+      Button apply_button {
+        styles [
+          "suggested-action"
+        ]
+      }
+    }
+
+    Adw.PreferencesPage {
+      Adw.PreferencesGroup cover_group {
+        Adw.Clamp cover_clamp {
+          maximum-size: 200;
+
+          Overlay {
+            [overlay]
+            Adw.Spinner spinner {
+              visible: false;
+            }
+
+            Overlay cover_overlay {
+              halign: center;
+              valign: center;
+
+              [overlay]
+              Button cover_button_edit {
+                icon-name: "document-edit-symbolic";
+                tooltip-text: _("New Cover");
+                halign: end;
+                valign: end;
+                margin-bottom: 6;
+                margin-end: 6;
+
+                styles [
+                  "circular",
+                  "osd"
+                ]
+              }
+
+              [overlay]
+              Revealer cover_button_delete_revealer {
+                transition-type: crossfade;
+                margin-end: 40;
+
+                Button cover_button_delete {
+                  icon-name: "user-trash-symbolic";
+                  tooltip-text: _("Delete Cover");
+                  halign: end;
+                  valign: end;
+                  margin-bottom: 6;
+                  margin-end: 6;
+
+                  styles [
+                    "circular",
+                    "osd"
+                  ]
+                }
+              }
+
+              Picture cover {
+                width-request: 200;
+                height-request: 300;
+
+                styles [
+                  "card"
+                ]
+              }
+            }
+          }
+        }
+      }
+
+      Adw.PreferencesGroup {
+        Adw.EntryRow name {
+          title: _("Title");
+        }
+
+        Adw.EntryRow developer {
+          title: _("Developer (optional)");
+        }
+      }
+
+      Adw.PreferencesGroup {
+        Adw.EntryRow executable {
+          title: _("Executable");
+
+          [suffix]
+          Button file_chooser_button {
+            valign: center;
+            icon-name: "document-open-symbolic";
+            tooltip-text: _("Select File");
+
+            styles [
+              "flat",
+            ]
+          }
+
+          [suffix]
+          MenuButton exec_info_button {
+            valign: center;
+            icon-name: "help-about-symbolic";
+            tooltip-text: _("More Info");
+
+            popover: Popover exec_info_popover {
+              focusable: true;
+
+              Label exec_info_label {
+                use-markup: true;
+                wrap: true;
+                max-width-chars: 50;
+                halign: center;
+                valign: center;
+                margin-top: 6;
+                margin-bottom: 6;
+                margin-start: 6;
+                margin-end: 6;
+              }
+            };
+
+            styles [
+              "flat"
+            ]
+          }
+        }
+      }
+    }
+  }
+}

data/gtk/details-window.blp

@@ -1,161 +0,0 @@
-using Gtk 4.0;
-using Adw 1;
-
-template $DetailsWindow : Adw.Window {
-    default-width: 500;
-    default-height: -1;
-    modal: true;
-
-    ShortcutController {
-        Shortcut {
-            trigger: "Escape";
-            action: "action(window.close)";
-        }
-    }
-
-    Box {
-        orientation: vertical;
-
-        Adw.HeaderBar HeaderBar {
-            show-start-title-buttons: false;
-            show-end-title-buttons: false;
-
-            [start]
-            Button cancel_button {
-                label: _("Cancel");
-                action-name: "window.close";
-            }
-
-            [end]
-            Button apply_button {
-                styles [
-                    "suggested-action"
-                ]
-            }
-        }
-
-        Adw.PreferencesPage {
-            vexpand: true;
-
-            Adw.PreferencesGroup cover_group {
-                Adw.Clamp cover_clamp {
-                    maximum-size: 200;
-                    Overlay {
-                        [overlay]
-                        Spinner spinner {
-                            margin-start: 72;
-                            margin-end: 72;
-                        }
-
-                        Overlay cover_overlay {
-                            halign: center;
-                            valign: center;
-
-                            [overlay]
-                            Button cover_button_edit {
-                                icon-name: "document-edit-symbolic";
-                                tooltip-text: _("New Cover");
-                                halign: end;
-                                valign: end;
-                                margin-bottom: 6;
-                                margin-end: 6;
-
-                                styles [
-                                    "circular", "osd"
-                                ]
-                            }
-
-                            [overlay]
-                            Revealer cover_button_delete_revealer {
-                                transition-type: crossfade;
-                                margin-end: 40;
-
-                                Button cover_button_delete {
-                                    icon-name: "user-trash-symbolic";
-                                    tooltip-text: _("Delete Cover");
-                                    halign: end;
-                                    valign: end;
-                                    margin-bottom: 6;
-                                    margin-end: 6;
-
-                                    styles [
-                                        "circular", "osd"
-                                    ]
-                                }
-                            }
-
-                            Picture cover {
-                                width-request: 200;
-                                height-request: 300;
-                                
-                                styles [
-                                    "card"
-                                ]
-                            }
-                        }
-                    }
-                }
-            }
-
-            Adw.PreferencesGroup title_group {
-                title: _("Title");
-                description: _("The title of the game");
-
-                Entry name {
-                    accessibility {
-                        label: _("Title");
-                    }
-                }
-            }
-
-            Adw.PreferencesGroup developer_group {
-                title: _("Developer");
-                description: _("The developer or publisher (optional)");
-
-                Entry developer {
-                    accessibility {
-                        label: _("Developer");
-                    }
-                }
-            }
-
-            Adw.PreferencesGroup exec_group {
-                title: _("Executable");
-                description: _("File to open or command to run when launching the game");
-
-                [header-suffix]
-                Gtk.MenuButton exec_info_button {
-                    valign: center;
-                    icon-name: "help-about-symbolic";
-                    tooltip-text: _("More Info");
-
-                    popover: Popover exec_info_popover {
-
-                        Label exec_info_label {
-                            use-markup: true;
-                            wrap: true;
-                            max-width-chars: 50;
-                            halign: center;
-                            valign: center;
-                            margin-top: 6;
-                            margin-bottom: 6;
-                            margin-start: 6;
-                            margin-end: 6;
-                            selectable: true;
-                        }
-                    };
-
-                    styles [
-                        "flat"
-                    ]
-                }
-
-                Entry executable {
-                    accessibility {
-                        label: _("Executable");
-                    }
-                }
-            }
-        }
-    }
-}

data/gtk/game.blp

@@ -1,13 +1,14 @@
 using Gtk 4.0;
 using Adw 1;
 
-template $Game : Box {
+template $Game: Box {
   orientation: vertical;
   halign: center;
   valign: start;
 
   Adw.Clamp {
     maximum-size: 200;
+    unit: px;
 
     Overlay {
       [overlay]
@@ -63,9 +64,8 @@ template $Game : Box {
 
           Overlay {
             [overlay]
-            Spinner spinner {
-              margin-start: 72;
-              margin-end: 72;
+            Adw.Spinner spinner {
+              visible: false;
             }
 
             Picture cover {
@@ -98,38 +98,16 @@ template $Game : Box {
 
 menu game_options {
   section {
-    item {
-      label: _("Edit");
-      action: "app.edit_game";
-    }
-
-    item {
-      label: _("Hide");
-      action: "app.hide_game";
-    }
-
-    item {
-      label: _("Remove");
-      action: "app.remove_game";
-    }
+    item (_("Edit"), "app.edit_game")
+    item (_("Hide"), "app.hide_game")
+    item (_("Remove"), "app.remove_game")
   }
 }
 
 menu hidden_game_options {
   section {
-    item {
-      label: _("Edit");
-      action: "app.edit_game";
-    }
-
-    item {
-      label: _("Unhide");
-      action: "app.hide_game";
-    }
-
-    item {
-      label: _("Remove");
-      action: "app.remove_game";
-    }
+    item (_("Edit"), "app.edit_game")
+    item (_("Unhide"), "app.hide_game")
+    item (_("Remove"), "app.remove_game")
   }
 }

data/gtk/help-overlay.blp

@@ -1,68 +0,0 @@
-using Gtk 4.0;
-
-ShortcutsWindow help_overlay {
-  modal: true;
-
-  ShortcutsSection {
-    section-name: "shortcuts";
-    max-height: 10;
-
-    ShortcutsGroup {
-      title: _("General");
-
-      ShortcutsShortcut {
-        title: _("Quit");
-        action-name: "app.quit";
-      }
-
-      ShortcutsShortcut {
-        title: _("Search");
-        action-name: "win.toggle_search";
-      }
-
-      ShortcutsShortcut {
-        title: _("Show preferences");
-        action-name: "app.preferences";
-      }
-
-      ShortcutsShortcut {
-        title: _("Shortcuts");
-        action-name: "win.show-help-overlay";
-      }
-
-      ShortcutsShortcut {
-        title: _("Undo");
-        action-name: "win.undo";
-      }
-
-      ShortcutsShortcut {
-        title: _("Open menu");
-        action-name: "win.open_menu";
-      }
-    }
-
-    ShortcutsGroup {
-      title: _("Games");
-
-      ShortcutsShortcut {
-        title: _("Add new game");
-        action-name: "app.add_game";
-      }
-
-      ShortcutsShortcut {
-        title: _("Import games");
-        action-name: "app.import";
-      }
-
-      ShortcutsShortcut {
-        title: _("Show hidden games");
-        action-name: "win.show_hidden";
-      }
-
-      ShortcutsShortcut {
-        title: _("Remove game");
-        action-name: "app.remove_game_details_view";
-      }
-    }
-  }
-}

data/gtk/preferences.blp

@@ -1,8 +1,8 @@
 using Gtk 4.0;
 using Adw 1;
 
-template $PreferencesWindow : Adw.PreferencesWindow {
-  default-height: 500;
+template $CartridgesPreferences: Adw.PreferencesDialog {
+  search-enabled: true;
 
   Adw.PreferencesPage general_page {
     name: "general";
@@ -12,71 +12,45 @@ template $PreferencesWindow : Adw.PreferencesWindow {
     Adw.PreferencesGroup behavior_group {
       title: _("Behavior");
 
-      Adw.ActionRow {
+      Adw.SwitchRow exit_after_launch_switch {
         title: _("Exit After Launching Games");
-        activatable-widget: exit_after_launch_switch;
-
-        Switch exit_after_launch_switch {
-          valign: center;
-        }
       }
 
-      Adw.ActionRow {
+      Adw.SwitchRow cover_launches_game_switch {
         title: _("Cover Image Launches Game");
         subtitle: _("Swaps the behavior of the cover image and the play button");
-        activatable-widget: cover_launches_game_switch;
-
-        Switch cover_launches_game_switch {
-          valign: center;
-        }
       }
     }
 
     Adw.PreferencesGroup images_group {
       title: _("Images");
 
-      Adw.ActionRow {
+      Adw.SwitchRow high_quality_images_switch {
         title: _("High Quality Images");
         subtitle: _("Save game covers losslessly at the cost of storage");
-        activatable-widget: high_quality_images_switch;
-
-        Switch high_quality_images_switch {
-          valign: center;
-        }
       }
     }
 
     Adw.PreferencesGroup danger_zone_group {
       title: _("Danger Zone");
+      separate-rows: true;
 
-      Adw.ActionRow {
+      Adw.ButtonRow remove_all_games_button_row {
         title: _("Remove All Games");
 
-        Button remove_all_games_button {
-          label: _("Remove");
-          valign: center;
-
-          styles [
-            "destructive-action",
-          ]
-        }
+        styles [
+          "destructive-action"
+        ]
       }
 
-      Adw.ActionRow reset_action_row {
-        title: "Reset App";
-        subtitle: "Completely resets and quits Cartridges";
+      Adw.ButtonRow reset_button_row {
         visible: false;
+        title: "Reset App";
 
-        Button reset_button {
-          label: "Reset";
-          valign: center;
-
-          styles [
-            "destructive-action",
-          ]
-        }
+        styles [
+          "destructive-action"
+        ]
       }
-
     }
   }
 
@@ -85,20 +59,46 @@ template $PreferencesWindow : Adw.PreferencesWindow {
     title: _("Import");
     icon-name: "document-save-symbolic";
 
+    Adw.PreferencesGroup import_behavior_group {
+      title: _("Behavior");
+
+      Adw.SwitchRow auto_import_switch {
+        title: _("Import Games Automatically");
+      }
+
+      Adw.SwitchRow remove_missing_switch {
+        title: _("Remove Uninstalled Games");
+      }
+    }
+
     Adw.PreferencesGroup sources_group {
       title: _("Sources");
+      separate-rows: true;
 
       Adw.ExpanderRow steam_expander_row {
         title: _("Steam");
         show-enable-switch: true;
 
+        [prefix]
+        Image {
+          icon-name: "steam-source-symbolic";
+        }
+
         Adw.ActionRow steam_data_action_row {
           title: _("Install Location");
 
           Button steam_data_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+
+            styles [
+              "flat"
+            ]
           }
+
+          styles [
+            "property"
+          ]
         }
       }
 
@@ -106,40 +106,34 @@ template $PreferencesWindow : Adw.PreferencesWindow {
         title: _("Lutris");
         show-enable-switch: true;
 
+        [prefix]
+        Image {
+          icon-name: "lutris-source-symbolic";
+        }
+
         Adw.ActionRow lutris_data_action_row {
           title: _("Install Location");
 
           Button lutris_data_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+
+            styles [
+              "flat"
+            ]
           }
+
+          styles [
+            "property"
+          ]
         }
 
-        Adw.ActionRow lutris_cache_action_row {
-          title: _("Cache Location");
-
-          Button lutris_cache_file_chooser_button {
-            icon-name: "folder-symbolic";
-            valign: center;
-          }
-        }
-
-        Adw.ActionRow {
+        Adw.SwitchRow lutris_import_steam_switch {
           title: _("Import Steam Games");
-          activatable-widget: lutris_import_steam_switch;
-
-          Switch lutris_import_steam_switch {
-            valign: center;
-          }
         }
 
-        Adw.ActionRow {
+        Adw.SwitchRow lutris_import_flatpak_switch {
           title: _("Import Flatpak Games");
-          activatable-widget: lutris_import_flatpak_switch;
-
-          Switch lutris_import_flatpak_switch {
-            valign: center;
-          }
         }
       }
 
@@ -147,49 +141,42 @@ template $PreferencesWindow : Adw.PreferencesWindow {
         title: _("Heroic");
         show-enable-switch: true;
 
+        [prefix]
+        Image {
+          icon-name: "heroic-source-symbolic";
+        }
+
         Adw.ActionRow heroic_config_action_row {
           title: _("Install Location");
 
           Button heroic_config_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+
+            styles [
+              "flat"
+            ]
           }
+
+          styles [
+            "property"
+          ]
         }
 
-        Adw.ActionRow {
+        Adw.SwitchRow heroic_import_epic_switch {
           title: _("Import Epic Games");
-          activatable-widget: heroic_import_epic_switch;
-
-          Switch heroic_import_epic_switch {
-            valign: center;
-          }
         }
 
-        Adw.ActionRow {
+        Adw.SwitchRow heroic_import_gog_switch {
           title: _("Import GOG Games");
-          activatable-widget: heroic_import_gog_switch;
-
-          Switch heroic_import_gog_switch {
-            valign: center;
-          }
         }
 
-        Adw.ActionRow {
+        Adw.SwitchRow heroic_import_amazon_switch {
           title: _("Import Amazon Games");
-          activatable-widget: heroic_import_amazon_switch;
-
-          Switch heroic_import_amazon_switch {
-            valign: center;
-          }
         }
 
-        Adw.ActionRow {
+        Adw.SwitchRow heroic_import_sideload_switch {
           title: _("Import Sideloaded Games");
-          activatable-widget: heroic_import_sideload_switch;
-
-          Switch heroic_import_sideload_switch {
-            valign: center;
-          }
         }
       }
 
@@ -197,13 +184,26 @@ template $PreferencesWindow : Adw.PreferencesWindow {
         title: _("Bottles");
         show-enable-switch: true;
 
+        [prefix]
+        Image {
+          icon-name: "bottles-source-symbolic";
+        }
+
         Adw.ActionRow bottles_data_action_row {
           title: _("Install Location");
 
           Button bottles_data_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+
+            styles [
+              "flat"
+            ]
           }
+
+          styles [
+            "property"
+          ]
         }
       }
 
@@ -211,13 +211,26 @@ template $PreferencesWindow : Adw.PreferencesWindow {
         title: _("itch");
         show-enable-switch: true;
 
+        [prefix]
+        Image {
+          icon-name: "itch-source-symbolic";
+        }
+
         Adw.ActionRow itch_config_action_row {
           title: _("Install Location");
 
           Button itch_config_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+
+            styles [
+              "flat"
+            ]
           }
+
+          styles [
+            "property"
+          ]
         }
       }
 
@@ -225,13 +238,53 @@ template $PreferencesWindow : Adw.PreferencesWindow {
         title: _("Legendary");
         show-enable-switch: true;
 
+        [prefix]
+        Image {
+          icon-name: "legendary-source-symbolic";
+        }
+
         Adw.ActionRow legendary_config_action_row {
           title: _("Install Location");
 
           Button legendary_config_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+
+            styles [
+              "flat"
+            ]
           }
+
+          styles [
+            "property"
+          ]
+        }
+      }
+
+      Adw.ExpanderRow retroarch_expander_row {
+        title: _("RetroArch");
+        show-enable-switch: true;
+
+        [prefix]
+        Image {
+          icon-name: "retroarch-source-symbolic";
+        }
+
+        Adw.ActionRow retroarch_config_action_row {
+          title: _("Install Location");
+
+          Button retroarch_config_file_chooser_button {
+            icon-name: "folder-symbolic";
+            valign: center;
+
+            styles [
+              "flat"
+            ]
+          }
+
+          styles [
+            "property"
+          ]
         }
       }
 
@@ -239,22 +292,58 @@ template $PreferencesWindow : Adw.PreferencesWindow {
         title: _("Flatpak");
         show-enable-switch: true;
 
-        Adw.ActionRow flatpak_data_action_row {
-          title: _("Install Location");
-
-          Button flatpak_data_file_chooser_button {
-            icon-name: "folder-symbolic";
-            valign: center;
-          }
+        [prefix]
+        Image {
+          icon-name: "flatpak-source-symbolic";
         }
 
-        Adw.ActionRow flatpak_import_launchers_row {
-          title: _("Import Game Launchers");
-          activatable-widget: flatpak_import_launchers_switch;
+        Adw.ActionRow flatpak_system_data_action_row {
+          // The location of the system-wide data directory
+          title: _("System Location");
 
-          Switch flatpak_import_launchers_switch {
+          Button flatpak_system_data_file_chooser_button {
+            icon-name: "folder-symbolic";
             valign: center;
+
+            styles [
+              "flat"
+            ]
           }
+
+          styles [
+            "property"
+          ]
+        }
+
+        Adw.ActionRow flatpak_user_data_action_row {
+          // The location of the user-specific data directory
+          title: _("User Location");
+
+          Button flatpak_user_data_file_chooser_button {
+            icon-name: "folder-symbolic";
+            valign: center;
+
+            styles [
+              "flat"
+            ]
+          }
+
+          styles [
+            "property"
+          ]
+        }
+
+        Adw.SwitchRow flatpak_import_launchers_switch {
+          title: _("Import Game Launchers");
+        }
+      }
+
+      Adw.SwitchRow desktop_switch {
+        title: _("Desktop Entries");
+
+        [prefix]
+        Image {
+          icon-name: "user-desktop-symbolic";
         }
       }
     }
@@ -276,31 +365,36 @@ template $PreferencesWindow : Adw.PreferencesWindow {
     Adw.PreferencesGroup sgdb_behavior_group {
       title: _("Behavior");
 
-      Adw.ActionRow sgdb_switch_row {
+      Adw.SwitchRow sgdb_switch {
         title: _("Use SteamGridDB");
         subtitle: _("Download images when adding or importing games");
-        activatable-widget: sgdb_switch;
-
-        Switch sgdb_switch {
-          valign: center;
-        }
       }
 
-      Adw.ActionRow {
+      Adw.SwitchRow sgdb_prefer_switch {
         title: _("Prefer Over Official Images");
-        activatable-widget: sgdb_prefer_switch;
-
-        Switch sgdb_prefer_switch {
-          valign: center;
-        }
       }
 
-      Adw.ActionRow {
+      Adw.SwitchRow sgdb_animated_switch {
         title: _("Prefer Animated Images");
-        activatable-widget: sgdb_animated_switch;
+      }
+    }
 
-        Switch sgdb_animated_switch {
-          valign: center;
+    Adw.PreferencesGroup {
+      Adw.ActionRow {
+        title: _("Update Covers");
+        subtitle: _("Fetch covers for games already in your library");
+        sensitive: bind sgdb_switch.active;
+
+        Stack sgdb_stack {
+          Button sgdb_fetch_button {
+            label: _("Update");
+            valign: center;
+          }
+
+          Adw.Spinner sgdb_spinner {
+            visible: false;
+            valign: center;
+          }
         }
       }
     }

data/gtk/shortcuts-dialog.blp

@@ -0,0 +1,67 @@
+using Gtk 4.0;
+using Adw 1;
+
+Adw.ShortcutsDialog shortcuts_dialog {
+  Adw.ShortcutsSection {
+    title: _("General");
+
+    Adw.ShortcutsItem {
+      title: _("Search");
+      action-name: "win.toggle_search";
+    }
+
+    Adw.ShortcutsItem {
+      title: _("Preferences");
+      action-name: "app.preferences";
+    }
+
+    Adw.ShortcutsItem {
+      title: _("Keyboard Shortcuts");
+      action-name: "app.shortcuts";
+    }
+
+    Adw.ShortcutsItem {
+      title: _("Undo");
+      action-name: "win.undo";
+    }
+
+    Adw.ShortcutsItem {
+      title: _("Quit");
+      action-name: "app.quit";
+    }
+
+    Adw.ShortcutsItem {
+      title: _("Toggle Sidebar");
+      action-name: "win.show_sidebar";
+    }
+
+    Adw.ShortcutsItem {
+      title: _("Main Menu");
+      action-name: "win.open_menu";
+    }
+  }
+
+  Adw.ShortcutsSection {
+    title: _("Games");
+
+    Adw.ShortcutsItem {
+      title: _("Add Game");
+      action-name: "app.add_game";
+    }
+
+    Adw.ShortcutsItem {
+      title: _("Import");
+      action-name: "app.import";
+    }
+
+    Adw.ShortcutsItem {
+      title: _("Show Hidden Games");
+      action-name: "win.show_hidden";
+    }
+
+    Adw.ShortcutsItem {
+      title: _("Remove Game");
+      action-name: "app.remove_game_details_view";
+    }
+  }
+}

data/gtk/style-dark.css

@@ -1,5 +1,7 @@
-@define-color accent_color @purple_1;
-@define-color accent_bg_color @purple_4;
+:root {
+  --accent-color: var(--purple-1);
+  --accent-bg-color: var(--purple-4);
+}
 
 #details_view {
     background-color: black;
@@ -8,4 +10,4 @@
 #details_view_play_button {
     color: rgba(0, 0, 0, .8);
     background-color: white;
-}
+}

data/gtk/style.css

@@ -1,11 +1,33 @@
-@define-color accent_color @purple_5;
-@define-color accent_bg_color @purple_3;
+:root {
+  --accent-color: var(--purple-5);
+  --accent-bg-color: var(--purple-3);
+}
+
+.no-hover > flowboxchild:hover {
+  background-color: transparent;
+}
 
 #details_view {
-    background-color: white;
+  background-color: white;
 }
 
 #details_view_play_button {
-    color: white;
-    background-color: rgba(0, 0, 0, .8);
-}
+  color: white;
+  background-color: rgba(0, 0, 0, 0.8);
+}
+
+@media (prefers-color-scheme: dark) {
+  :root {
+    --accent-color: var(--purple-1);
+    --accent-bg-color: var(--purple-4);
+  }
+
+  #details_view {
+    background-color: black;
+  }
+
+  #details_view_play_button {
+    color: rgba(0, 0, 0, 0.8);
+    background-color: white;
+  }
+}

data/gtk/window.blp

@@ -4,7 +4,7 @@ using Adw 1;
 Adw.StatusPage notice_no_results {
   icon-name: "system-search-symbolic";
   title: _("No Games Found");
-  description: _("Try a different search.");
+  description: _("Try a different search");
   vexpand: true;
   valign: center;
 }
@@ -12,14 +12,14 @@ Adw.StatusPage notice_no_results {
 Adw.StatusPage hidden_notice_no_results {
   icon-name: "system-search-symbolic";
   title: _("No Games Found");
-  description: _("Try a different search.");
+  description: _("Try a different search");
   vexpand: true;
   valign: center;
 }
 
 Adw.StatusPage notice_empty {
   title: _("No Games");
-  description: _("Use the + button to add games.");
+  description: _("Use the + button to add games");
   vexpand: true;
   valign: center;
 
@@ -38,332 +38,468 @@ Adw.StatusPage notice_empty {
 Adw.StatusPage hidden_notice_empty {
   icon-name: "view-conceal-symbolic";
   title: _("No Hidden Games");
-  description: _("Games you hide will appear here.");
+  description: _("Games you hide will appear here");
   vexpand: true;
   valign: center;
 }
 
-template $CartridgesWindow : Adw.ApplicationWindow {
+template $CartridgesWindow: Adw.ApplicationWindow {
   title: _("Cartridges");
+  width-request: 360;
+  height-request: 100;
+
+  Adw.Breakpoint {
+    condition ("max-width: 564px")
+
+    setters {
+      overlay_split_view.collapsed: true;
+      details_view_box.orientation: vertical;
+      details_view_box.margin-top: 12;
+      details_view_box.margin-start: 12;
+      details_view_box.margin-end: 12;
+      details_view_details_box.margin-start: 0;
+      details_view_details_box.margin-end: 0;
+      details_view_title.margin-top: 30;
+      details_view_title.halign: center;
+      details_view_developer.halign: center;
+      details_view_date_box.halign: center;
+      details_view_toolbar.halign: center;
+      details_view_toolbar.orientation: vertical;
+      details_view_play_button.halign: center;
+      details_view_toolbar_buttons.margin-start: 0;
+    }
+  }
 
   Adw.ToastOverlay toast_overlay {
-    Stack stack {
-      visible-child: library_view;
-      transition-type: over_left;
+    Adw.NavigationView navigation_view {
+      Adw.NavigationPage library_page {
+        title: _("All Games");
 
-      Overlay details_view {
-        name: "details_view";
+        Adw.OverlaySplitView overlay_split_view {
+          sidebar-width-fraction: .2;
 
-        [overlay]
-        Box details_view_box {
-          orientation: vertical;
+          [sidebar]
+          Adw.NavigationPage sidebar_navigation_page {
+            title: _("Cartridges");
 
-          Adw.HeaderBar {
-            [start]
-            Button back_button {
-              tooltip-text: _("Back");
-              action-name: "win.go_back";
-              icon-name: "go-previous-symbolic";
+            Adw.ToolbarView {
+              [top]
+              Adw.HeaderBar {
+                [start]
+                Button {
+                  icon-name: "sidebar-show-symbolic";
+                  action-name: "win.show_sidebar";
+                  tooltip-text: _("Toggle Sidebar");
+                }
+              }
+
+              ScrolledWindow {
+                hscrollbar-policy: never;
+
+                ListBox sidebar {
+                  Box all_games_row_box {
+                    margin-top: 12;
+                    margin-bottom: 12;
+                    margin-start: 6;
+                    margin-end: 6;
+                    spacing: 12;
+
+                    Image {
+                      icon-name: "view-grid-symbolic";
+                    }
+
+                    Label {
+                      halign: start;
+                      label: _("All Games");
+                      wrap: true;
+                      wrap-mode: char;
+                    }
+
+                    Label all_games_no_label {
+                      hexpand: true;
+                      halign: end;
+
+                      styles [
+                        "dim-label",
+                      ]
+                    }
+                  }
+
+                  Box added_row_box {
+                    margin-top: 12;
+                    margin-bottom: 12;
+                    margin-start: 6;
+                    spacing: 12;
+
+                    Image {
+                      icon-name: "list-add-symbolic";
+                    }
+
+                    Label {
+                      halign: start;
+                      label: _("Added");
+                      margin-end: 6;
+                      wrap: true;
+                      wrap-mode: char;
+                    }
+
+                    Label added_games_no_label {
+                      hexpand: true;
+                      halign: end;
+                      margin-end: 6;
+
+                      styles [
+                        "dim-label",
+                      ]
+                    }
+                  }
+
+                  ListBoxRow {
+                    selectable: false;
+                    activatable: false;
+
+                    Label {
+                      label: _("Imported");
+
+                      styles [
+                        "heading",
+                      ]
+
+                      halign: start;
+                    }
+                  }
+
+                  styles [
+                    "navigation-sidebar",
+                  ]
+                }
+              }
             }
-
-            [title]
-            Adw.WindowTitle details_view_header_bar_title {
-              title: _("Game Details");
-            }
-
-            styles [
-              "flat",
-            ]
           }
 
-          Adw.Bin {
-            hexpand: true;
-            vexpand: true;
+          Adw.ToolbarView library_view {
+            [top]
+            Adw.HeaderBar header_bar {
+              [start]
+              Button show_sidebar_button {
+                icon-name: "sidebar-show-symbolic";
+                action-name: "win.show_sidebar";
+                tooltip-text: _("Toggle Sidebar");
+                visible: bind overlay_split_view.show-sidebar inverted;
+              }
 
-            Box {
-              halign: center;
-              valign: center;
-              margin-start: 24;
-              margin-end: 24;
-              margin-top: 24;
-              margin-bottom: 24;
+              [start]
+              MenuButton {
+                tooltip-text: _("Add Game");
+                icon-name: "list-add-symbolic";
+                menu-model: add_games;
+              }
+
+              [end]
+              MenuButton primary_menu_button {
+                tooltip-text: _("Main Menu");
+                icon-name: "open-menu-symbolic";
+                menu-model: primary_menu;
+              }
+
+              [end]
+              ToggleButton search_button {
+                tooltip-text: _("Search");
+                icon-name: "system-search-symbolic";
+                action-name: "win.toggle_search";
+              }
+            }
+
+            [top]
+            SearchBar search_bar {
+              search-mode-enabled: bind search_button.active bidirectional;
+              key-capture-widget: navigation_view;
 
               Adw.Clamp {
-                maximum-size: 200;
+                maximum-size: 500;
+                tightening-threshold: 500;
 
-                Overlay {
-                  [overlay]
-                  Spinner details_view_spinner {
-                    margin-start: 72;
-                    margin-end: 72;
-                  }
+                SearchEntry search_entry {
+                  placeholder-text: _("Search");
+                  hexpand: true;
 
-                  Picture details_view_cover {
-                    halign: end;
-                    valign: start;
-                    width-request: 200;
-                    height-request: 300;
-
-                    styles [
-                      "card",
-                    ]
+                  ShortcutController {
+                    Shortcut {
+                      trigger: "Escape";
+                      action: "action(win.toggle_search)";
+                    }
                   }
                 }
               }
+            }
 
-              Box {
-                orientation: vertical;
-                margin-start: 48;
-                vexpand: true;
-                valign: center;
-
-                Label details_view_title {
-                  label: _("Game Title");
-                  hexpand: true;
-                  halign: start;
-                  max-width-chars: 24;
-                  wrap: true;
-                  wrap-mode: word_char;
-                  natural-wrap-mode: word;
-
-                  styles [
-                    "title-1",
-                  ]
-                }
-
-                Label details_view_developer {
-                  margin-top: 6;
-                  hexpand: true;
-                  halign: start;
-                  max-width-chars: 36;
-                  wrap: true;
-                  wrap-mode: word_char;
-                  natural-wrap-mode: word;
-
-                  styles [
-                    "heading",
-                  ]
-                }
-
-                Box {
-                  orientation: horizontal;
+            Overlay library_overlay {
+              ScrolledWindow scrolledwindow {
+                FlowBox library {
+                  homogeneous: true;
+                  halign: center;
+                  valign: start;
+                  column-spacing: 12;
+                  row-spacing: 12;
                   margin-top: 15;
-                  hexpand: true;
-                  halign: start;
+                  margin-bottom: 15;
+                  margin-start: 15;
+                  margin-end: 15;
+                  selection-mode: none;
 
-                  Label details_view_added {
-                    wrap: true;
-                    wrap-mode: word_char;
-                    natural-wrap-mode: word;
-                  }
-
-                  Label details_view_last_played {
-                    margin-start: 12;
-                    wrap: true;
-                    wrap-mode: word_char;
-                    natural-wrap-mode: word;
-                  }
-                }
-
-                Box {
-                  hexpand: true;
-                  vexpand: true;
-                  valign: center;
-
-                  Button details_view_play_button {
-                    name: "details_view_play_button";
-                    action-name: "app.launch_game";
-                    label: _("Play");
-                    halign: start;
-                    margin-top: 24;
-
-                    styles [
-                      "opaque",
-                      "pill",
-                    ]
-                  }
-
-                  Box {
-                    halign: start;
-                    valign: center;
-                    margin-top: 24;
-                    margin-start: 9;
-
-                    Button {
-                      icon-name: "document-edit-symbolic";
-                      action-name: "app.edit_game";
-                      tooltip-text: _("Edit");
-
-                      styles ["raised", "circular"]
-                    }
-
-                    Button details_view_hide_button {
-                      action-name: "app.hide_game";
-
-                      styles ["raised", "circular"]
-                    }
-
-                    Button {
-                      icon-name: "user-trash-symbolic";
-                      action-name: "app.remove_game";
-                      tooltip-text: _("Remove");
-
-                      styles ["raised", "circular"]
-                    }
-
-                    MenuButton {
-                      icon-name: "system-search-symbolic";
-                      menu-model: search;
-                      tooltip-text: _("Search");
-
-                      styles ["raised", "circular"]
-                    }
-
-                    styles [
-                      "toolbar",
-                    ]
-                  }
+                  styles [
+                    "no-hover",
+                  ]
                 }
               }
             }
           }
         }
+      }
+    }
+  }
+}
 
-        Picture details_view_blurred_cover {
-          keep-aspect-ratio: false;
-        }
+Adw.NavigationPage hidden_library_page {
+  title: _("Hidden Games");
+
+  Adw.ToolbarView hidden_library_view {
+    [top]
+    Adw.HeaderBar hidden_header_bar {
+      [end]
+      MenuButton hidden_primary_menu_button {
+        tooltip-text: _("Main Menu");
+        icon-name: "open-menu-symbolic";
+        menu-model: primary_menu;
       }
 
-      Box library_view {
-        orientation: vertical;
+      [end]
+      ToggleButton hidden_search_button {
+        tooltip-text: _("Search");
+        icon-name: "system-search-symbolic";
+        action-name: "win.toggle_search";
+      }
+    }
 
-        Adw.HeaderBar header_bar {
-          [start]
-          MenuButton {
-            tooltip-text: _("Add Game");
-            icon-name: "list-add-symbolic";
-            menu-model: add_games;
-          }
+    [top]
+    SearchBar hidden_search_bar {
+      search-mode-enabled: bind hidden_search_button.active bidirectional;
+      key-capture-widget: hidden_library_view;
 
-          [end]
-          MenuButton primary_menu_button {
-            tooltip-text: _("Main Menu");
-            icon-name: "open-menu-symbolic";
-            menu-model: primary_menu;
-          }
+      Adw.Clamp {
+        maximum-size: 500;
+        tightening-threshold: 500;
 
-          [end]
-          ToggleButton search_button {
-            tooltip-text: _("Search");
-            icon-name: "system-search-symbolic";
-            action-name: "win.toggle_search";
-          }
+        SearchEntry hidden_search_entry {
+          placeholder-text: _("Search");
+          hexpand: true;
         }
+      }
+    }
 
-        SearchBar search_bar {
-          search-mode-enabled: bind-property search_button.active bidirectional;
-          key-capture-widget: library_view;
+    Overlay hidden_library_overlay {
+      ScrolledWindow hidden_scrolledwindow {
+        FlowBox hidden_library {
+          homogeneous: true;
+          halign: center;
+          valign: start;
+          column-spacing: 12;
+          row-spacing: 12;
+          margin-top: 15;
+          margin-bottom: 15;
+          margin-start: 15;
+          margin-end: 15;
+          selection-mode: none;
+
+          styles [
+            "no-hover",
+          ]
+        }
+      }
+    }
+
+    styles [
+      "background",
+    ]
+  }
+}
+
+Adw.NavigationPage details_page {
+  title: _("Game Details");
+
+  Overlay details_view {
+    name: "details_view";
+
+    [overlay]
+    Adw.ToolbarView details_view_toolbar_view {
+      [top]
+      Adw.HeaderBar {}
+
+      ScrolledWindow {
+        Box details_view_box {
+          halign: center;
+          valign: center;
+          margin-start: 24;
+          margin-end: 24;
+          margin-top: 24;
+          margin-bottom: 24;
 
           Adw.Clamp {
-            maximum-size: 500;
-            tightening-threshold: 500;
+            maximum-size: 200;
 
-            SearchEntry search_entry {
-              hexpand: true;
+            Overlay {
+              [overlay]
+              Adw.Spinner details_view_spinner {
+                visible: false;
+              }
+
+              Picture details_view_cover {
+                halign: end;
+                valign: start;
+                width-request: 200;
+                height-request: 300;
+
+                styles [
+                  "card",
+                ]
+              }
             }
           }
-        }
 
-        Adw.Bin library_bin {
-          ScrolledWindow scrolledwindow {
-            hexpand: true;
+          Box details_view_details_box {
+            orientation: vertical;
+            margin-start: 48;
             vexpand: true;
+            valign: center;
 
-            FlowBox library {
-              homogeneous: true;
-              halign: center;
-              valign: start;
-              column-spacing: 12;
-              row-spacing: 12;
+            Label details_view_title {
+              label: _("Game Title");
+              hexpand: true;
+              halign: start;
+              max-width-chars: 24;
+              wrap: true;
+              wrap-mode: word_char;
+              natural-wrap-mode: word;
+
+              styles [
+                "title-1",
+              ]
+            }
+
+            Label details_view_developer {
+              margin-top: 6;
+              hexpand: true;
+              halign: start;
+              max-width-chars: 36;
+              wrap: true;
+              wrap-mode: word_char;
+              natural-wrap-mode: word;
+
+              styles [
+                "heading",
+              ]
+            }
+
+            Box details_view_date_box {
+              orientation: horizontal;
               margin-top: 15;
-              margin-bottom: 15;
-              margin-start: 15;
-              margin-end: 15;
-              selection-mode: none;
+              hexpand: true;
+              halign: start;
+
+              Label details_view_added {
+                wrap: true;
+                wrap-mode: word_char;
+                natural-wrap-mode: word;
+                justify: center;
+              }
+
+              Label details_view_last_played {
+                margin-start: 12;
+                wrap: true;
+                wrap-mode: word_char;
+                natural-wrap-mode: word;
+                justify: center;
+              }
+            }
+
+            Box details_view_toolbar {
+              hexpand: true;
+              vexpand: true;
+              valign: center;
+
+              Button details_view_play_button {
+                name: "details_view_play_button";
+                action-name: "app.launch_game";
+                label: _("Play");
+                halign: start;
+                margin-top: 24;
+
+                styles [
+                  "opaque",
+                  "pill",
+                ]
+              }
+
+              Box details_view_toolbar_buttons {
+                halign: start;
+                valign: center;
+                margin-top: 24;
+                margin-start: 9;
+
+                Button {
+                  icon-name: "document-edit-symbolic";
+                  action-name: "app.edit_game";
+                  tooltip-text: _("Edit");
+
+                  styles [
+                    "raised",
+                    "circular",
+                  ]
+                }
+
+                Button details_view_hide_button {
+                  action-name: "app.hide_game";
+
+                  styles [
+                    "raised",
+                    "circular",
+                  ]
+                }
+
+                Button {
+                  icon-name: "user-trash-symbolic";
+                  action-name: "app.remove_game";
+                  tooltip-text: _("Remove");
+
+                  styles [
+                    "raised",
+                    "circular",
+                  ]
+                }
+
+                MenuButton {
+                  icon-name: "system-search-symbolic";
+                  menu-model: search;
+                  tooltip-text: _("Search");
+
+                  styles [
+                    "raised",
+                    "circular",
+                  ]
+                }
+
+                styles [
+                  "toolbar",
+                ]
+              }
             }
           }
         }
       }
+    }
 
-      Box hidden_library_view {
-        orientation: vertical;
-
-        Adw.HeaderBar hidden_header_bar {
-          [start]
-          Button hidden_back_button {
-            tooltip-text: _("Back");
-            action-name: "win.go_back";
-            icon-name: "go-previous-symbolic";
-          }
-
-          [title]
-          Adw.WindowTitle {
-            title: _("Hidden Games");
-          }
-
-          [end]
-          MenuButton hidden_primary_menu_button {
-            tooltip-text: _("Main Menu");
-            icon-name: "open-menu-symbolic";
-            menu-model: primary_menu;
-          }
-
-          [end]
-          ToggleButton hidden_search_button {
-            tooltip-text: _("Search");
-            icon-name: "system-search-symbolic";
-            action-name: "win.toggle_search";
-          }
-        }
-
-        SearchBar hidden_search_bar {
-          search-mode-enabled: bind-property hidden_search_button.active bidirectional;
-          key-capture-widget: hidden_library_view;
-
-          Adw.Clamp {
-            maximum-size: 500;
-            tightening-threshold: 500;
-
-            SearchEntry hidden_search_entry {
-              hexpand: true;
-            }
-          }
-        }
-
-        Adw.Bin hidden_library_bin {
-          ScrolledWindow hidden_scrolledwindow {
-            hexpand: true;
-            vexpand: true;
-
-            FlowBox hidden_library {
-              homogeneous: true;
-              halign: center;
-              valign: start;
-              column-spacing: 12;
-              row-spacing: 12;
-              margin-top: 15;
-              margin-bottom: 15;
-              margin-start: 15;
-              margin-end: 15;
-              selection-mode: none;
-            }
-          }
-        }
-
-        styles [
-          "background",
-        ]
-      }
+    Picture details_view_blurred_cover {
+      keep-aspect-ratio: false;
     }
   }
 }
@@ -412,66 +548,30 @@ menu primary_menu {
   }
 
   section {
-    item {
-      label: _("Preferences");
-      action: "app.preferences";
-    }
-
-    item {
-      label: _("Keyboard Shortcuts");
-      action: "win.show-help-overlay";
-    }
-
-    item {
-      label: _("About Cartridges");
-      action: "app.about";
-    }
+    item (_("Preferences"), "app.preferences")
+    item (_("Keyboard Shortcuts"), "app.shortcuts")
+    item (_("About Cartridges"), "app.about")
   }
 }
 
 menu add_games {
   section {
-    item {
-      label: _("Add Game");
-      action: "app.add_game";
-    }
+    item (_("Add Game"), "app.add_game")
   }
 
   section {
-    item {
-      label: _("Import");
-      action: "app.import";
-    }
+    item (_("Import"), "app.import")
   }
 }
 
 menu search {
   section {
-    label: "Search on…";
-
-    item {
-      label: "IGDB";
-      action: "app.igdb_search";
-    }
-
-    item {
-      label: "SteamGridDB";
-      action: "app.sgdb_search";
-    }
-
-    item {
-      label: "ProtonDB";
-      action: "app.protondb_search";
-    }
-
-    item {
-      label: "Lutris";
-      action: "app.lutris_search";
-    }
-
-    item {
-      label: "HowLongToBeat";
-      action: "app.hltb_search";
-    }
+    label: _("Search on…");
+    item (_("IGDB"), "app.igdb_search")
+    item (_("SteamGridDB"), "app.sgdb_search")
+    item (_("ProtonDB"), "app.protondb_search")
+    item (_("PCGamingWiki"), "app.pcgw_search")
+    item (_("Lutris"), "app.lutris_search")
+    item (_("HowLongToBeat"), "app.hltb_search")
   }
 }

data/hu.kramo.Cartridges.desktop.in

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Cartridges
-GenericName=Game Launcher
-Comment=Launch all your games
-Exec=cartridges
-Icon=@APP_ID@
-Terminal=false
-Type=Application
-Categories=GNOME;GTK;Game;
-Keywords=gaming;launcher;steam;lutris;heroic;bottles;itch;flatpak;legendary;
-StartupNotify=true

data/hu.kramo.Cartridges.metainfo.xml.in

@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-  <id>@APP_ID@</id>
-	<metadata_license>CC0-1.0</metadata_license>
-	<project_license>GPL-3.0-or-later</project_license>
-  <name>Cartridges</name>
-  <summary>Launch all your games</summary>
-	<description>
-	  <p>Cartridges is a simple game launcher for all of your games. It has support for importing games from Steam, Lutris, Heroic and more with no login necessary. You can sort and hide games or download cover art from SteamGridDB.</p>
-	</description>
-  <url type="homepage">https://github.com/kra-mo/cartridges</url>
-  <url type="bugtracker">https://github.com/kra-mo/cartridges/issues</url>
-  <url type="translate">https://hosted.weblate.org/engage/cartridges/</url>
-  <url type="contact">https://www.kramo.hu/about/</url>
-  <url type="vcs-browser">https://github.com/kra-mo/cartridges</url>
-  <url type="contribute">https://github.com/kra-mo/cartridges/blob/main/CONTRIBUTING.md</url>
-  <developer_name translatable="no">kramo</developer_name>
-  <launchable type="desktop-id">@APP_ID@.desktop</launchable>
-  <supports>
-    <control>pointing</control>
-    <control>keyboard</control>
-    <control>touch</control>
-  </supports>
-  <recommends>
-    <display_length compare="gt">545</display_length>
-  </recommends>
-  <screenshots>
-    <screenshot type="default">
-      <image>https://raw.githubusercontent.com/kra-mo/cartridges/main/data/screenshots/1.png</image>
-      <caption>Library</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/kra-mo/cartridges/main/data/screenshots/2.png</image>
-      <caption>Edit Game Details</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/kra-mo/cartridges/main/data/screenshots/3.png</image>
-      <caption>Game Details</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/kra-mo/cartridges/main/data/screenshots/4.png</image>
-      <caption>Preferences</caption>
-    </screenshot>
-  </screenshots>
-  <content_rating type="oars-1.1" />
-  <releases>
-    <release version="2.1" date="2023-07-25">
-      <description translatable="no">
-        <ul>
-          <li>Added support for Amazon Games in the Heroic importer</li>
-          <li>Translations since 2.0</li>
-        </ul>
-      </description>
-    </release>
-    <release version="2.0" date="2023-07-05">
-      <description translatable="no">
-        <p>After months of work, Cartridges 2.0 is here:</p>
-        <ul>
-          <li>New import source: Legendary</li>
-          <li>New import source: Flatpak</li>
-          <li>Importing games should be much quicker</li>
-          <li>Error handling has been improved</li>
-          <li>Various UX improvements</li>
-          <li>Translations since 1.5</li>
-        </ul>
-        <p>Thanks to the new import backend, adding new sources is much easier and a lot more are coming soon!</p>
-      </description>
-    </release>
-    <release version="1.5" date="2023-05-23">
-      <description translatable="no">
-        <ul>
-          <li>Cartridges is now part of GNOME Circle!</li>
-          <li>Extra Steam libraries are now detected automatically</li>
-          <li>Executables are now passed directly to the shell</li>
-          <li>Various UX improvements</li>
-          <li>Translations since 1.4</li>
-        </ul>
-      </description>
-    </release>
-    <release version="1.4" date="2023-04-16">
-      <description translatable="no">
-        <ul>
-          <li>Support for animated covers</li>
-          <li>Redesigned details view</li>
-          <li>Easily search for games on various databases</li>
-          <li>Translations since 1.3</li>
-        </ul>
-      </description>
-    </release>
-    <release version="1.3" date="2023-04-06">
-      <description translatable="no">
-        <ul>
-          <li>Support for importing game covers from SteamGridDB!</li>
-          <li>New import source: Lutris</li>
-          <li>New import source: itch</li>
-          <li>Better feedback for hiding and launching games</li>
-          <li>UX improvements</li>
-          <li>Translations since 1.2</li>
-        </ul>
-      </description>
-    </release>
-    <release version="1.2" date="2023-03-30">
-      <description translatable="no">
-        <ul>
-          <li>Refined the user experience for importing games</li>
-          <li>Added option to remove all games</li>
-          <li>Translations since 1.1</li>
-        </ul>
-      </description>
-    </release>
-    <release version="1.1" date="2023-03-26">
-      <description translatable="no">
-        <ul>
-          <li>Added option to launch games by clicking the cover image</li>
-          <li>Added option to save cover art losslessly</li>
-          <li>Translations since 1.0</li>
-        </ul>
-      </description>
-    </release>
-    <release version="1.0" date="2023-03-25">
-      <description translatable="no">
-        <p>First stable release</p>
-      </description>
-    </release>
-  </releases>
-</component>

data/icons/meson.build

@@ -1,11 +1,11 @@
 scalable_dir = join_paths('hicolor', 'scalable', 'apps')
 install_data(
   join_paths(scalable_dir, ('@0@.svg').format(app_id)),
-  install_dir: join_paths(get_option('datadir'), 'icons', scalable_dir)
+  install_dir: join_paths(get_option('datadir'), 'icons', scalable_dir),
 )
 
 symbolic_dir = join_paths('hicolor', 'symbolic', 'apps')
 install_data(
   join_paths(symbolic_dir, ('@0@-symbolic.svg').format(app_id)),
-  install_dir: join_paths(get_option('datadir'), 'icons', symbolic_dir)
+  install_dir: join_paths(get_option('datadir'), 'icons', symbolic_dir),
 )

data/icons/sources/bottles-source-symbolic.svg

@@ -0,0 +1 @@
+<svg width="16" height="16" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M2.847 0v.616c0 .371-.17.786-.405 1.239C1.812 2.95 1.163 4.02 1.01 5.288L1 16h2l.01-10.712c.153-1.267.802-2.337 1.432-3.433.235-.453.405-.868.405-1.24V0h-2Zm4 0v.616c0 .371-.17.786-.404 1.239C5.812 2.95 5.163 4.02 5.01 5.288L5 16h2.001l.01-10.712c.153-1.267.801-2.337 1.432-3.433.235-.453.405-.868.405-1.24V0h-2Zm4.001 0v.616c-.315 1.678-1.632 3.165-1.837 4.672L9.001 16h5.693l-.008-10.7c-.32-1.815-1.385-3.08-1.838-4.684V0h-2Z" fill="#000"/></svg>

data/icons/sources/flatpak-source-symbolic.svg

@@ -0,0 +1 @@
+<svg width="16" height="16" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M7.805.02a.971.971 0 0 0-.36.148l-6 4A.998.998 0 0 0 1 5v6a1 1 0 0 0 .445.833l6 4c.337.223.774.223 1.11 0l6-4a.998.998 0 0 0 .446-.832V5a.998.998 0 0 0-.445-.832l-6-4a.994.994 0 0 0-.75-.149Zm.196 2.179V9l5-3.332v4.797l-5 3.337V9L3 5.668v-.133L8 2.2Z" fill="#000"/></svg>

data/icons/sources/heroic-source-symbolic.svg

@@ -0,0 +1 @@
+<svg width="16" height="16" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="m7.872 16-3.817-3.083L2 2.79 7.872 0l5.871 2.789-2.055 10.128L7.872 16Zm0-4.257-.294-.293-.88-7.927 1.1-1.908 1.174 1.908-.807 7.927-.293.293Zm-.294.367-.147.367-1.761.294-.294-.66.294-.662 1.761.294.147.367Zm-.073.734-.22 1.541.587.294.587-.294-.22-1.541-.367-.22-.367.22Zm.807-.367-.147-.367.147-.367 1.761-.293.294.66-.294.66-1.761-.293Z" fill="#000"/></svg>

data/icons/sources/itch-source-symbolic.svg

@@ -0,0 +1 @@
+<svg width="16" height="16" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M1.965 1.992C1.43 2.08 1 2.58 1 3.115V15.18c0 .534.43.894.965.806l12.066-1.979c.534-.088.964-.588.964-1.122V.82c0-.535-.43-.894-.964-.807L1.964 1.992Zm3.41 3.33c.555-.091.95.204 1.09.722l3.068-.503c.14-.564.532-.988 1.087-1.08.882-.144 1.851.602 2.154 1.659l.723 2.523c.302 1.056-.172 2.04-1.054 2.184-.774.127-1.615-.432-2.014-1.286l-4.863.798c-.399.984-1.24 1.82-2.014 1.946-.882.145-1.356-.683-1.054-1.838l.723-2.76c.303-1.157 1.272-2.22 2.154-2.365ZM7.282 6.58v.986l-.791.13L7.997 9.36 9.505 7.2l-.743.122v-.985l-1.48.243Z" fill="#000"/></svg>

data/icons/sources/legendary-source-symbolic.svg

@@ -0,0 +1 @@
+<svg width="16" height="16" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#a)"><path fill-rule="evenodd" clip-rule="evenodd" d="M0 6.355V1a1 1 0 0 1 1-1h2.893a1 1 0 0 1 .708.293l.645.645a1 1 0 0 0 .707.293h4.094a1 1 0 0 0 .707-.293L11.4.293A1 1 0 0 1 12.107 0H15a1 1 0 0 1 1 1v5.355a1 1 0 0 1-.293.707l-.23.23a1 1 0 0 0 0 1.415l.23.23a1 1 0 0 1 .293.708V15a1 1 0 0 1-1 1h-2.893a1 1 0 0 1-.708-.293l-.645-.645a1 1 0 0 0-.707-.293H5.953a1 1 0 0 0-.707.293l-.645.645a1 1 0 0 1-.708.293H1a1 1 0 0 1-1-1V9.645a1 1 0 0 1 .293-.707l.23-.23a1 1 0 0 0 0-1.415l-.23-.23A1 1 0 0 1 0 6.354ZM8 5a1 1 0 0 0-2 0v5.5a1 1 0 0 0 1 1h3a1 1 0 1 0 0-2H8V5Z" fill="#000"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>

data/icons/sources/lutris-source-symbolic.svg

@@ -0,0 +1 @@
+<svg width="16" height="16" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#a)"><path fill-rule="evenodd" clip-rule="evenodd" d="M0 7.937C0 3.554 3.518 0 7.857 0c1.196 0 2.33.27 3.344.753.055-.118.181-.363.301-.371.158-.012.248.09.35.203l.001.002c.102.115.306.287.306.287s.929-.32 1.97.251c1.043.572 1.19.744 1.394 1.144.144.284.14.87.126 1.19a.248.248 0 0 0-.039-.004c-.17 0-.308.174-.308.387 0 .214.138.387.308.387a.256.256 0 0 0 .133-.039c.153.292.233.562.255.806-.05-.348-.544-.586-.544-.586s-.077.135-.243.215c-.025.012-.056.01-.091.006-.063-.007-.138-.014-.21.06-.239.484.345.888.617.877.265-.011.476-.276.475-.512.047.92-.74 1.461-1.495 1.374-.493-.058-.907-.249-1.383-.469a10.262 10.262 0 0 0-1.187-.483c-.951-.307-1.569-.47-2.322-.585-1.486-.227-2.557.12-3.061.424a5.84 5.84 0 0 0-.427.284c.772.15 1.236 1.329 1.25 1.65l.002.013v.007l.001.033c-.021.484-.247.845-.725.83a.823.823 0 0 1-.713-.426c-.014-.024-.028-.049-.044-.072a1.92 1.92 0 0 0-.965-.795c-.46.705-.715 1.548-.715 2.53 0 2.897 2.345 5.052 5.213 5.052.907 0 2.817-.309 4-1.28.226-.207.485-.438.725-.55-.862 2.161-3.479 3.488-6.299 3.403C3.534 15.996 0 12.321 0 7.937ZM13.415 4.02a.596.596 0 0 0 .593-.6.596.596 0 0 0-.593-.599.597.597 0 0 0-.594.6c0 .33.266.6.594.6Z" fill="#000"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>

data/icons/sources/retroarch-source-symbolic.svg

@@ -0,0 +1 @@
+<svg width="16" height="16" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M4.56 4 5.6 5.28H3.52L3.04 7.2H1.76l.48-1.92H.96L0 9.12h2.56l-.32 1.28h2.24L2.8 12.32h1.88l1.56-1.92h3.52l1.56 1.92h1.88l-1.68-1.92h2.24l-.32-1.28H16l-.96-3.84h-1.28l.48 1.92h-1.28l-.48-1.92H10.4L11.44 4h-1.36L8.96 5.28H7.04L5.92 4H4.56Zm.16 2.56H6v1.28H4.72V6.56Zm5.283 0h1.28v1.28h-1.28V6.56Z" fill="#000"/></svg>

data/icons/sources/steam-source-symbolic.svg

@@ -0,0 +1 @@
+<svg width="16" height="16" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#a)"><path fill-rule="evenodd" clip-rule="evenodd" d="M9.352 5.1a1.509 1.509 0 1 0 2.51 1.675A1.509 1.509 0 0 0 9.352 5.1Zm2.923-.277a2.009 2.009 0 1 1-3.34 2.231 2.009 2.009 0 0 1 3.34-2.23ZM5.01 12.131l-.983-.407a1.7 1.7 0 0 0 3.108-.103 1.696 1.696 0 0 0-1.213-2.29 1.699 1.699 0 0 0-.966.07l1.015.421a1.249 1.249 0 0 1-.96 2.307v.002ZM2.546 2.121A7.996 7.996 0 0 1 7.966 0l.003.013a7.988 7.988 0 0 1 7.159 4.432 7.996 7.996 0 0 1-4.277 11.018 7.99 7.99 0 0 1-8.274-1.558A7.989 7.989 0 0 1 .279 10.18l3.064 1.267A2.264 2.264 0 0 0 7.823 11v-.107l2.718-1.938h.063A3.016 3.016 0 1 0 7.589 5.94v.031l-1.906 2.76h-.126c-.454 0-.898.138-1.273.395L0 7.354A7.995 7.995 0 0 1 2.546 2.12Z" fill="#000"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>

data/meson.build

@@ -1,20 +1,28 @@
-blueprints = custom_target('blueprints',
+blueprints = custom_target(
+  'blueprints',
   input: files(
-    'gtk/help-overlay.blp',
-    'gtk/window.blp',
+    'gtk/details-dialog.blp',
     'gtk/game.blp',
     'gtk/preferences.blp',
-    'gtk/details-window.blp'
+    'gtk/shortcuts-dialog.blp',
+    'gtk/window.blp',
   ),
   output: '.',
-  command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],
+  command: [
+    find_program('blueprint-compiler'),
+    'batch-compile',
+    '@OUTPUT@',
+    '@CURRENT_SOURCE_DIR@',
+    '@INPUT@',
+  ],
 )
 
-gnome.compile_resources('cartridges',
+gnome.compile_resources(
+  'cartridges',
   configure_file(
     input: 'cartridges.gresource.xml.in',
     output: 'cartridges.gresource.xml',
-    configuration: conf
+    configuration: conf,
   ),
   gresource_bundle: true,
   install: true,
@@ -22,55 +30,86 @@ gnome.compile_resources('cartridges',
   dependencies: blueprints,
 )
 
-desktop_file = i18n.merge_file(
-        input: configure_file(
-          input: 'hu.kramo.Cartridges.desktop.in',
-          output: app_id + '.desktop.in',
-          configuration: conf
-        ),
-       output: app_id + '.desktop',
-         type: 'desktop',
-       po_dir: '../po',
-      install: true,
-  install_dir: join_paths(get_option('datadir'), 'applications')
-)
-
-desktop_utils = find_program('desktop-file-validate', required: false)
-if desktop_utils.found()
-  test('Validate desktop file', desktop_utils, args: [desktop_file])
+if host_machine.system() == 'windows'
+  desktop_file = configure_file(
+    input: 'page.kramo.Cartridges.desktop.in',
+    output: app_id + '.desktop.in',
+    configuration: conf,
+    install: true,
+    install_dir: join_paths(get_option('datadir'), 'applications'),
+  )
+else
+  desktop_file = i18n.merge_file(
+    input: configure_file(
+      input: 'page.kramo.Cartridges.desktop.in',
+      output: app_id + '.desktop.in',
+      configuration: conf,
+    ),
+    output: app_id + '.desktop',
+    type: 'desktop',
+    po_dir: '../po',
+    install: true,
+    install_dir: join_paths(get_option('datadir'), 'applications'),
+  )
 endif
 
-appstream_file = i18n.merge_file(
-        input: configure_file(
-          input: 'hu.kramo.Cartridges.metainfo.xml.in',
-          output: app_id + '.metainfo.xml.in',
-          configuration: conf
-        ),
-       output: app_id + '.metainfo.xml',
-       po_dir: '../po',
-      install: true,
-  install_dir: join_paths(get_option('datadir'), 'metainfo')
-)
+if host_machine.system() != 'windows'
+  desktop_utils = find_program('desktop-file-validate', required: false)
+  if desktop_utils.found()
+    test('Validate desktop file', desktop_utils, args: [desktop_file])
+  endif
+endif
 
-appstream_util = find_program('appstream-util', required: false)
-if appstream_util.found()
-  test('Validate appstream file', appstream_util, args: ['validate', appstream_file])
+if host_machine.system() == 'windows'
+  appstream_file = configure_file(
+    input: 'page.kramo.Cartridges.metainfo.xml.in',
+    output: app_id + '.metainfo.xml',
+    configuration: conf,
+    install: true,
+    install_dir: join_paths(get_option('datadir'), 'metainfo'),
+  )
+else
+  appstream_file = i18n.merge_file(
+    input: configure_file(
+      input: 'page.kramo.Cartridges.metainfo.xml.in',
+      output: app_id + '.metainfo.xml.in',
+      configuration: conf,
+    ),
+    output: app_id + '.metainfo.xml',
+    po_dir: '../po',
+    install: true,
+    install_dir: join_paths(get_option('datadir'), 'metainfo'),
+  )
+endif
+
+if host_machine.system() != 'windows'
+  appstreamcli = find_program('appstreamcli', required: false)
+  if appstreamcli.found()
+    test(
+      'Validate appstream file',
+      appstreamcli,
+      args: ['validate', '--no-net', '--explain', appstream_file],
+      workdir: meson.current_build_dir(),
+    )
+  endif
 endif
 
 install_data(
   configure_file(
-    input: 'hu.kramo.Cartridges.gschema.xml.in',
+    input: 'page.kramo.Cartridges.gschema.xml.in',
     output: app_id + '.gschema.xml',
-    configuration: conf
+    configuration: conf,
   ),
-  install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas')
+  install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas'),
 )
 
 compile_schemas = find_program('glib-compile-schemas', required: false)
 if compile_schemas.found()
-  test('Validate schema file',
-       compile_schemas,
-       args: ['--strict', '--dry-run', meson.current_source_dir()])
+  test(
+    'Validate schema file',
+    compile_schemas,
+    args: ['--strict', '--dry-run', meson.current_source_dir()],
+  )
 endif
 
 subdir('icons')

data/page.kramo.Cartridges.desktop.in

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Cartridges
+GenericName=Game Launcher
+Comment=Launch all your games
+Exec=cartridges
+Icon=@APP_ID@
+Terminal=false
+Type=Application
+Categories=GNOME;GTK;Game;PackageManager;
+# Translators: Leave "cartridges" untranslated here.
+Keywords=gaming;games;play;cartridges;launch;launcher;steam;lutris;heroic;epic;bottles;itch;legendary;retroarch;
+StartupNotify=true

data/page.kramo.Cartridges.gschema.xml.in

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist gettext-domain="cartridges">
+
   <schema id="@APP_ID@" path="@PREFIX@/">
+    <key name="auto-import" type="b">
+        <default>false</default>
+    </key>
     <key name="exit-after-launch" type="b">
       <default>false</default>
     </key>
@@ -10,6 +14,9 @@
     <key name="high-quality-images" type="b">
       <default>false</default>
     </key>
+    <key name="remove-missing" type="b">
+      <default>true</default>
+    </key>
     <key name="steam" type="b">
       <default>true</default>
     </key>
@@ -67,12 +74,24 @@
     <key name="legendary-location" type="s">
       <default>"~/.config/legendary/"</default>
     </key>
+    <key name="retroarch" type="b">
+      <default>true</default>
+    </key>
+    <key name="retroarch-location" type="s">
+      <default>"~/.var/app/org.libretro.RetroArch/config/retroarch/"</default>
+    </key>
+    <key name="desktop" type="b">
+      <default>true</default>
+    </key>
     <key name="flatpak" type="b">
       <default>true</default>
     </key>
-    <key name="flatpak-location" type="s">
+    <key name="flatpak-system-location" type="s">
       <default>"/var/lib/flatpak/"</default>
     </key>
+    <key name="flatpak-user-location" type="s">
+      <default>"~/.local/share/flatpak/"</default>
+    </key>
     <key name="flatpak-import-launchers" type="b">
       <default>false</default>
     </key>
@@ -88,13 +107,17 @@
     <key name="sgdb-animated" type="b">
       <default>false</default>
     </key>
+    <key name="library-rows" type="u">
+      <default>0</default>
+    </key>
   </schema>
+
   <schema id="@APP_ID@.State" path="@PREFIX@/State/">
     <key name="width" type="i">
-      <default>1110</default>
+      <default>1170</default>
     </key>
     <key name="height" type="i">
-      <default>820</default>
+      <default>795</default>
     </key>
     <key name="is-maximized" type="b">
       <default>false</default>
@@ -107,10 +130,13 @@
         <choice value="oldest" />
         <choice value="last_played" />
       </choices>
-      <default>"a-z"</default>
+      <default>"last_played"</default>
+    </key>
+    <key name="show-sidebar" type="b">
+      <default>false</default>
     </key>
     <key name="steam-limiter-tokens-history" type="s">
       <default>"[]"</default>
     </key>
   </schema>
-</schemalist>
+</schemalist>

data/page.kramo.Cartridges.metainfo.xml.in

@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>@APP_ID@</id>
+  <replaces>
+    <id>hu.kramo.Cartridges</id>
+  </replaces>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0-or-later</project_license>
+  <name>Cartridges</name>
+  <summary>Launch all your games</summary>
+  <description>
+    <p>Cartridges is a simple game launcher for all of your games. It has support for importing games from Steam, Lutris, Heroic and more with no login necessary. You can sort and hide games or download cover art from SteamGridDB.</p>
+  </description>
+  <url type="homepage">https://apps.gnome.org/Cartridges/</url>
+  <url type="bugtracker">https://git.kramo.page/cartridges/issues</url>
+  <url type="translate">https://hosted.weblate.org/engage/cartridges/</url>
+  <url type="contact">https://www.kramo.page/about/</url>
+  <url type="vcs-browser">https://git.kramo.page/cartridges</url>
+  <url type="contribute">https://git.kramo.page/cartridges/blob/main/CONTRIBUTING.md</url>
+  <developer id="page.kramo">
+    <name translate="no">kramo</name>
+  </developer>
+  <launchable type="desktop-id">@APP_ID@.desktop</launchable>
+  <translation type="gettext">cartridges</translation>
+  <branding>
+    <color type="primary" scheme_preference="light">#d5b0e7</color>
+    <color type="primary" scheme_preference="dark">#501a5c</color>
+  </branding>
+  <supports>
+    <control>pointing</control>
+    <control>keyboard</control>
+    <control>touch</control>
+  </supports>
+  <requires>
+    <display_length compare="ge">360</display_length>
+  </requires>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://codeberg.org/kramo/cartridges/raw/branch/main/data/screenshots/1.png</image>
+      <caption>Cartridges</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://codeberg.org/kramo/cartridges/raw/branch/main/data/screenshots/2.png</image>
+      <caption>Game Details</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://codeberg.org/kramo/cartridges/raw/branch/main/data/screenshots/3.png</image>
+      <caption>Edit Game Details</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://codeberg.org/kramo/cartridges/raw/branch/main/data/screenshots/4.png</image>
+      <caption>Preferences</caption>
+    </screenshot>
+  </screenshots>
+  <content_rating type="oars-1.1" />
+  <releases>
+    <release version="2.13.1" date="2025-09-24">
+      <description translate="no">
+        <p>Updated for GNOME 49, using the new keyboard shortcuts dialog.</p>
+      </description>
+    </release>
+    <release version="2.12.1" date="2025-03-23">
+      <description translate="no">
+        <p>Removed an option used for debugging that would accidentally show up for all users.</p>
+      </description>
+    </release>
+    <release version="2.12" date="2025-03-19">
+      <description translate="no">
+        <p>Updated for GNOME 48</p>
+      </description>
+    </release>
+    <release version="2.11" date="2024-12-21">
+      <description translate="no">
+        <ul>
+          <li>Added the option to import games automatically</li>
+          <li>Increased the number of games per row on wide screens</li>
+          <li>Fixed an issue where animated covers would not play</li>
+          <li>Fixed an issue where the import dialog would stay open</li>
+        </ul>
+      </description>
+    </release>
+    <release version="2.10" date="2024-09-18">
+      <description translate="no">
+        <p>Updated for GNOME 47</p>
+      </description>
+    </release>
+    <release version="2.9" date="2024-07-10">
+      <description translate="no">
+        <ul>
+          <li>Cartridges is now available on macOS! You can download it from GitHub.</li>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+    </release>
+    <release version="2.8" date="2024-03-20">
+      <description translate="no">
+        <ul>
+          <li>The app features new adaptive widgets taking advantage of developments in GNOME 46</li>
+        </ul>
+      </description>
+    </release>
+    <release version="2.7" date="2023-12-12">
+      <description translate="no">
+        <ul>
+          <li>Flatpaks installed for the user and system-wide ones can now be imported separately</li>
+        </ul>
+      </description>
+    </release>
+    <release version="2.6" date="2023-10-11">
+      <description translate="no">
+        <p>You can now search your Cartridges library from GNOME!</p>
+        <p>To enable the functionality, go to "Search" in the Settings app and toggle "Cartridges" on.</p>
+      </description>
+    </release>
+    <release version="2.5" date="2023-10-06">
+      <description translate="no">
+        <ul>
+          <li>Added the ability to refetch covers from SteamGridDB</li>
+          <li>Fixed an issue with fractional scaling</li>
+          <li>Translations since 2.4</li>
+        </ul>
+        <p>The project now accepts donations. Thank you so much if you decide to donate! 💜</p>
+      </description>
+    </release>
+    <release version="2.4" date="2023-09-21">
+      <description translate="no">
+        <ul>
+          <li>Cartridges now adapts to smaller screen sizes</li>
+          <li>You can now filter games by import source</li>
+          <li>Ported to Libadwaita 1.4</li>
+          <li>Translations since 2.3</li>
+        </ul>
+      </description>
+    </release>
+    <release version="2.3" date="2023-08-29">
+      <description translate="no">
+        <ul>
+          <li>New import source: desktop entries</li>
+          <li>Added the ability to pick executables via the file picker</li>
+          <li>Manually added covers are now padded if they are too short</li>
+          <li>Translations since 2.2</li>
+        </ul>
+      </description>
+    </release>
+    <release version="2.2" date="2023-08-17">
+      <description translate="no">
+        <ul>
+          <li>New import source: RetroArch</li>
+          <li>Added the option to automatically remove uninstalled games on import</li>
+          <li>Added the ability to undo an import</li>
+          <li>Various UX improvements</li>
+          <li>Translations since 2.1</li>
+        </ul>
+      </description>
+    </release>
+    <release version="2.1" date="2023-07-25">
+      <description translate="no">
+        <ul>
+          <li>Added support for Amazon Games in the Heroic importer</li>
+          <li>Translations since 2.0</li>
+        </ul>
+      </description>
+    </release>
+    <release version="2.0" date="2023-07-05">
+      <description translate="no">
+        <p>After months of work, Cartridges 2.0 is here:</p>
+        <ul>
+          <li>New import source: Legendary</li>
+          <li>New import source: Flatpak</li>
+          <li>Importing games should be much quicker</li>
+          <li>Error handling has been improved</li>
+          <li>Various UX improvements</li>
+          <li>Translations since 1.5</li>
+        </ul>
+        <p>Thanks to the new import backend, adding new sources is much easier and a lot more are coming soon!</p>
+      </description>
+    </release>
+    <release version="1.5" date="2023-05-23">
+      <description translate="no">
+        <ul>
+          <li>Cartridges is now part of GNOME Circle!</li>
+          <li>Extra Steam libraries are now detected automatically</li>
+          <li>Executables are now passed directly to the shell</li>
+          <li>Various UX improvements</li>
+          <li>Translations since 1.4</li>
+        </ul>
+      </description>
+    </release>
+    <release version="1.4" date="2023-04-16">
+      <description translate="no">
+        <ul>
+          <li>Support for animated covers</li>
+          <li>Redesigned details view</li>
+          <li>Easily search for games on various databases</li>
+          <li>Translations since 1.3</li>
+        </ul>
+      </description>
+    </release>
+    <release version="1.3" date="2023-04-06">
+      <description translate="no">
+        <ul>
+          <li>Support for importing game covers from SteamGridDB!</li>
+          <li>New import source: Lutris</li>
+          <li>New import source: itch</li>
+          <li>Better feedback for hiding and launching games</li>
+          <li>UX improvements</li>
+          <li>Translations since 1.2</li>
+        </ul>
+      </description>
+    </release>
+    <release version="1.2" date="2023-03-30">
+      <description translate="no">
+        <ul>
+          <li>Refined the user experience for importing games</li>
+          <li>Added option to remove all games</li>
+          <li>Translations since 1.1</li>
+        </ul>
+      </description>
+    </release>
+    <release version="1.1" date="2023-03-26">
+      <description translate="no">
+        <ul>
+          <li>Added option to launch games by clicking the cover image</li>
+          <li>Added option to save cover art losslessly</li>
+          <li>Translations since 1.0</li>
+        </ul>
+      </description>
+    </release>
+    <release version="1.0" date="2023-03-25">
+      <description translate="no">
+        <p>First stable release</p>
+      </description>
+    </release>
+  </releases>
+</component>

docs/game_id.json.md

@@ -35,7 +35,7 @@ Stored as a Unix time stamp.
 
 The executable to run when launching a game.
 
-If the source has a URL handler, using that is preferred. In that case, the value should be `"xdg-open url://example/url"` for Linux and `"start url://example/url"` for Windows.
+If the source has a URL handler, using that is preferred. In that case, the value should be `"xdg-open url://example/url"` for Linux, `"start url://example/url"` for Windows and `"open url://example/url"` for macOS.
 
 Stored as either a string (preferred) or an argument vector to be passed to the shell through [subprocess.Popen](https://docs.python.org/3/library/subprocess.html#popen-constructor).
 
@@ -113,4 +113,4 @@ The version number of the [game_id].json specification.
 
 Cartridges will set the value for itself. Don't touch it.
 
-Stored as a number.
+Stored as a number.

flatpak/hu.kramo.Cartridges.Devel.json

@@ -1,133 +0,0 @@
-{
-    "id" : "hu.kramo.Cartridges.Devel",
-    "runtime" : "org.gnome.Platform",
-    "runtime-version" : "44",
-    "sdk" : "org.gnome.Sdk",
-    "command" : "cartridges",
-    "finish-args" : [
-        "--share=network",
-        "--share=ipc",
-        "--socket=fallback-x11",
-        "--device=dri",
-        "--socket=wayland",
-        "--talk-name=org.freedesktop.Flatpak",
-        "--filesystem=host:ro",
-        "--filesystem=~/.var/app/com.valvesoftware.Steam/data/Steam/:ro",
-        "--filesystem=~/.var/app/net.lutris.Lutris/:ro",
-        "--filesystem=~/.var/app/com.heroicgameslauncher.hgl/config/heroic/:ro",
-        "--filesystem=~/.var/app/com.heroicgameslauncher.hgl/config/legendary/:ro",
-        "--filesystem=~/.var/app/com.usebottles.bottles/data/bottles/:ro",
-        "--filesystem=~/.var/app/io.itch.itch/config/itch/:ro",
-        "--filesystem=/var/lib/flatpak:ro"
-    ],
-    "cleanup" : [
-        "/include",
-        "/lib/pkgconfig",
-        "/man",
-        "/share/doc",
-        "/share/gtk-doc",
-        "/share/man",
-        "/share/pkgconfig",
-        "*.la",
-        "*.a"
-    ],
-    "modules" : [
-        {
-            "name": "python3-modules",
-            "buildsystem": "simple",
-            "build-commands": [],
-            "modules": [
-                {
-                    "name": "python3-pyyaml",
-                    "buildsystem": "simple",
-                    "build-commands": [
-                        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"pyyaml\" --no-build-isolation"
-                    ],
-                    "sources": [
-                        {
-                            "type": "file",
-                            "url": "https://files.pythonhosted.org/packages/36/2b/61d51a2c4f25ef062ae3f74576b01638bebad5e045f747ff12643df63844/PyYAML-6.0.tar.gz",
-                            "sha256": "68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"
-                        }
-                    ]
-                },
-                {
-                    "name": "python3-requests",
-                    "buildsystem": "simple",
-                    "build-commands": [
-                        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"requests\" --no-build-isolation"
-                    ],
-                    "sources": [
-                        {
-                            "type": "file",
-                            "url": "https://files.pythonhosted.org/packages/71/4c/3db2b8021bd6f2f0ceb0e088d6b2d49147671f25832fb17970e9b583d742/certifi-2022.12.7-py3-none-any.whl",
-                            "sha256": "4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"
-                        },
-                        {
-                            "type": "file",
-                            "url": "https://files.pythonhosted.org/packages/ff/d7/8d757f8bd45be079d76309248845a04f09619a7b17d6dfc8c9ff6433cac2/charset-normalizer-3.1.0.tar.gz",
-                            "sha256": "34e0a2f9c370eb95597aae63bf85eb5e96826d81e3dcf88b8886012906f509b5"
-                        },
-                        {
-                            "type": "file",
-                            "url": "https://files.pythonhosted.org/packages/fc/34/3030de6f1370931b9dbb4dad48f6ab1015ab1d32447850b9fc94e60097be/idna-3.4-py3-none-any.whl",
-                            "sha256": "90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"
-                        },
-                        {
-                            "type": "file",
-                            "url": "https://files.pythonhosted.org/packages/d2/f4/274d1dbe96b41cf4e0efb70cbced278ffd61b5c7bb70338b62af94ccb25b/requests-2.28.2-py3-none-any.whl",
-                            "sha256": "64299f4909223da747622c030b781c0d7811e359c37124b4bd368fb8c6518baa"
-                        },
-                        {
-                            "type": "file",
-                            "url": "https://files.pythonhosted.org/packages/7b/f5/890a0baca17a61c1f92f72b81d3c31523c99bec609e60c292ea55b387ae8/urllib3-1.26.15-py2.py3-none-any.whl",
-                            "sha256": "aa751d169e23c7479ce47a0cb0da579e3ede798f994f5816a74e4f4500dcea42"
-                        }
-                    ]
-                },
-                {
-                    "name": "python3-pillow",
-                    "buildsystem": "simple",
-                    "build-commands": [
-                        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"pillow\" --no-build-isolation"
-                    ],
-                    "sources": [
-                        {
-                            "type": "file",
-                            "url": "https://files.pythonhosted.org/packages/00/d5/4903f310765e0ff2b8e91ffe55031ac6af77d982f0156061e20a4d1a8b2d/Pillow-9.5.0.tar.gz",
-                            "sha256": "bf548479d336726d7a0eceb6e767e179fbde37833ae42794602631a070d630f1"
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "name" : "blueprint-compiler",
-            "buildsystem" : "meson",
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/jwestman/blueprint-compiler",
-                    "tag" : "v0.8.1"
-                }
-            ],
-            "cleanup" : [
-                "*"
-            ]
-        },
-        {
-            "name" : "cartridges",
-            "builddir" : true,
-            "buildsystem" : "meson",
-            "config-opts": [
-                "-Dprofile=development"
-            ],
-            "sources" : [
-                {
-                    "type" : "dir",
-                    "path" : ".."
-                }
-            ]
-        }
-    ]
-}

meson.build

@@ -1,44 +1,64 @@
-project('cartridges',
-          version: '2.1',
-    meson_version: '>= 0.59.0',
-  default_options: [ 'warning_level=2', 'werror=false', ],
+project(
+  'cartridges',
+  version: '2.13.1',
+  meson_version: '>= 0.59.0',
+  default_options: [
+    'warning_level=2',
+    'werror=false',
+  ],
 )
 
-i18n = import('i18n')
+dependency('gtk4', version: '>= 4.15.0')
+dependency('libadwaita-1', version: '>= 1.6.beta')
+
+# Translations are broken on Windows for multiple reasons
+# gresources don't work and MSYS2 seems to have also broken the gettext package
+if host_machine.system() != 'windows'
+  i18n = import('i18n')
+endif
+
 gnome = import('gnome')
 python = import('python')
 
+py_installation = python.find_installation('python3')
+
+python_dir = join_paths(get_option('prefix'), py_installation.get_install_dir())
 pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())
+libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'))
 
 profile = get_option('profile')
 if profile == 'development'
-  app_id = 'hu.kramo.Cartridges.Devel'
-  prefix = '/hu/kramo/Cartridges/Devel'
-elif profile ==  'release'
-  app_id = 'hu.kramo.Cartridges'
-  prefix = '/hu/kramo/Cartridges'
+  app_id = 'page.kramo.Cartridges.Devel'
+  prefix = '/page/kramo/Cartridges/Devel'
+elif profile == 'release'
+  app_id = 'page.kramo.Cartridges'
+  prefix = '/page/kramo/Cartridges'
 endif
 
 conf = configuration_data()
-conf.set('PYTHON', python.find_installation('python3').full_path())
-conf.set('PYTHON_VERSION', python.find_installation('python3').language_version())
+conf.set('PYTHON', py_installation.full_path())
+conf.set('PYTHON_VERSION', py_installation.language_version())
 conf.set('APP_ID', app_id)
 conf.set('PREFIX', prefix)
 conf.set('VERSION', meson.project_version())
 conf.set('PROFILE', profile)
+conf.set('TIFF_COMPRESSION', get_option('tiff_compression'))
 conf.set('localedir', join_paths(get_option('prefix'), get_option('localedir')))
 conf.set('pkgdatadir', pkgdatadir)
+conf.set('libexecdir', libexecdir)
 
 subdir('data')
-subdir('src')
-subdir('po')
+subdir('cartridges')
 
 if host_machine.system() == 'windows'
-  subdir('windows')
+  subdir('build-aux/windows')
+else
+  subdir('search-provider')
+  subdir('po')
 endif
 
 gnome.post_install(
-     glib_compile_schemas: true,
-    gtk_update_icon_cache: true,
+  glib_compile_schemas: true,
+  gtk_update_icon_cache: true,
   update_desktop_database: true,
-)
+)

meson_options.txt

@@ -7,3 +7,12 @@ option(
   ],
   value: 'release'
 )
+option(
+  'tiff_compression',
+  type: 'combo',
+  choices: [
+    'webp',
+    'jpeg',
+  ],
+  value: 'webp'
+)

po/LINGUAS

@@ -20,3 +20,16 @@ sv
 tr
 el
 cs
+zh_Hans
+be
+hr
+ca
+ja
+hi
+en_GB
+ie
+te
+ia
+nn
+eu
+kw

po/POTFILES

@@ -1,19 +1,34 @@
-data/hu.kramo.Cartridges.desktop.in
-data/hu.kramo.Cartridges.gschema.xml.in
-data/hu.kramo.Cartridges.metainfo.xml.in
+data/page.kramo.Cartridges.desktop.in
+data/page.kramo.Cartridges.gschema.xml.in
+data/page.kramo.Cartridges.metainfo.xml.in
 
-data/gtk/details-window.blp
+data/gtk/details-dialog.blp
 data/gtk/game.blp
-data/gtk/help-overlay.blp
 data/gtk/preferences.blp
+data/gtk/shortcuts-dialog.blp
 data/gtk/window.blp
 
-src/main.py
-src/window.py
-src/details_window.py
-src/game.py
-src/preferences.py
+cartridges/main.py
+cartridges/window.py
+cartridges/details_dialog.py
+cartridges/game.py
+cartridges/preferences.py
 
-src/utils/create_dialog.py
-src/importer/sources/source.py
-src/store/managers/sgdb_manager.py
+cartridges/utils/create_dialog.py
+cartridges/utils/relative_date.py
+
+cartridges/importer/importer.py
+cartridges/importer/source.py
+cartridges/importer/location.py
+cartridges/importer/location.py
+cartridges/importer/bottles_source.py
+cartridges/importer/desktop_source.py
+cartridges/importer/flatpak_source.py
+cartridges/importer/heroic_source.py
+cartridges/importer/itch_source.py
+cartridges/importer/legendary_source.py
+cartridges/importer/lutris_source.py
+cartridges/importer/retroarch_source.py
+cartridges/importer/steam_source.py
+
+cartridges/store/managers/sgdb_manager.py

po/ar.po

@@ -3,13 +3,17 @@
 # This file is distributed under the same license as the cartridges package.
 # Ali Aljishi <ahj696@hotmail.com>, 2023.
 # kramo <contact@kramo.hu>, 2023.
+# Ali-98 <ahj696@hotmail.com>, 2023.
+# Weblate Translation Memory <noreply-mt-weblate-translation-memory@weblate.org>, 2024.
+# "Jadiir M. Aal Jaidaan" <ashrafquatre@gmail.com>, 2024.
+# Ahmed Najmawi <iramosu@protonmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: cartridges\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-07-05 14:36+0200\n"
-"PO-Revision-Date: 2023-07-09 07:59+0000\n"
-"Last-Translator: Ali Aljishi <ahj696@hotmail.com>\n"
+"POT-Creation-Date: 2024-11-05 14:01+0100\n"
+"PO-Revision-Date: 2025-08-01 22:02+0000\n"
+"Last-Translator: Ahmed Najmawi <iramosu@protonmail.com>\n"
 "Language-Team: Arabic <https://hosted.weblate.org/projects/cartridges/"
 "cartridges/ar/>\n"
 "Language: ar\n"
@@ -18,28 +22,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Weblate 5.0-dev\n"
+"X-Generator: Weblate 5.13-dev\n"
 
-#: data/hu.kramo.Cartridges.desktop.in:3
-#: data/hu.kramo.Cartridges.metainfo.xml.in:6 data/gtk/window.blp:47
-#: src/main.py:162
+#: data/page.kramo.Cartridges.desktop.in:3
+#: data/page.kramo.Cartridges.metainfo.xml.in:9
+#: data/page.kramo.Cartridges.metainfo.xml.in:40 data/gtk/window.blp:47
+#: data/gtk/window.blp:83
 msgid "Cartridges"
 msgstr "خراطيش"
 
-#: data/hu.kramo.Cartridges.desktop.in:4
+#: data/page.kramo.Cartridges.desktop.in:4
 msgid "Game Launcher"
 msgstr "مشغِّل ألعاب"
 
-#: data/hu.kramo.Cartridges.desktop.in:5
-#: data/hu.kramo.Cartridges.metainfo.xml.in:7
+#: data/page.kramo.Cartridges.desktop.in:5
+#: data/page.kramo.Cartridges.metainfo.xml.in:10
 msgid "Launch all your games"
 msgstr "شغِّل كلَّ ألعابك"
 
-#: data/hu.kramo.Cartridges.desktop.in:11
-msgid "gaming;launcher;steam;lutris;heroic;bottles;itch;"
-msgstr "لعب;مشغل;ستيم;لوترس;هروك;قوارير;إتش;هيرويك;بوتلز;"
+#: data/page.kramo.Cartridges.desktop.in:11
+msgid ""
+"gaming;launcher;steam;lutris;heroic;bottles;itch;flatpak;legendary;retroarch;"
+msgstr ""
+"لعب;مشغل;ستيم;لوترس;هروك;قوارير;إتش;هيرويك;بوتلز;لجندري;فلاتباك;رتروآرتش;"
 
-#: data/hu.kramo.Cartridges.metainfo.xml.in:9
+#: data/page.kramo.Cartridges.metainfo.xml.in:12
 msgid ""
 "Cartridges is a simple game launcher for all of your games. It has support "
 "for importing games from Steam, Lutris, Heroic and more with no login "
@@ -50,78 +57,66 @@ msgstr ""
 "وبرامج أخرى، وذلك دون تسجيل دخول. ولك ترتيب وإخفاء الألعاب فيه كيفما شئت، "
 "وكذلك تستطيع منه تنزيل غُلُف الألعاب من SteamGridDB."
 
-#: data/hu.kramo.Cartridges.metainfo.xml.in:30
-msgid "Library"
-msgstr "المكتبة"
-
-#: data/hu.kramo.Cartridges.metainfo.xml.in:34 src/details_window.py:67
-msgid "Edit Game Details"
-msgstr "حرِّر تفاصيل اللعبة"
-
-#: data/hu.kramo.Cartridges.metainfo.xml.in:38 data/gtk/window.blp:71
+#: data/page.kramo.Cartridges.metainfo.xml.in:44 data/gtk/window.blp:320
+#: cartridges/details_dialog.py:77
 msgid "Game Details"
 msgstr "تفاصيل اللعبة"
 
-#: data/hu.kramo.Cartridges.metainfo.xml.in:42 data/gtk/window.blp:416
-#: src/details_window.py:239
+#: data/page.kramo.Cartridges.metainfo.xml.in:48
+msgid "Edit Game Details"
+msgstr "حرِّر تفاصيل اللعبة"
+
+#: data/page.kramo.Cartridges.metainfo.xml.in:52 data/gtk/help-overlay.blp:19
+#: data/gtk/window.blp:543 cartridges/details_dialog.py:279
+#: cartridges/importer/importer.py:319 cartridges/importer/importer.py:369
 msgid "Preferences"
 msgstr "التفضيلات"
 
-#: data/gtk/details-window.blp:25
+#: data/gtk/details-dialog.blp:15
 msgid "Cancel"
 msgstr "ألغِ"
 
-#: data/gtk/details-window.blp:57
+#: data/gtk/details-dialog.blp:45
 msgid "New Cover"
 msgstr "غلاف جديد"
 
-#: data/gtk/details-window.blp:75
+#: data/gtk/details-dialog.blp:64
 msgid "Delete Cover"
 msgstr "احذف الغلاف"
 
-#: data/gtk/details-window.blp:101 data/gtk/details-window.blp:106
-#: data/gtk/game.blp:80
+#: data/gtk/details-dialog.blp:92 data/gtk/game.blp:80
 msgid "Title"
 msgstr "العنوان"
 
-#: data/gtk/details-window.blp:102
-msgid "The title of the game"
-msgstr "عنوان اللعبة"
+#: data/gtk/details-dialog.blp:96
+msgid "Developer (optional)"
+msgstr "المطوِّر (اختياري)"
 
-#: data/gtk/details-window.blp:112 data/gtk/details-window.blp:117
-msgid "Developer"
-msgstr "المطوِّر"
-
-#: data/gtk/details-window.blp:113
-msgid "The developer or publisher (optional)"
-msgstr "المطوِّر أو الناشر (اختياري)"
-
-#: data/gtk/details-window.blp:123 data/gtk/details-window.blp:155
+#: data/gtk/details-dialog.blp:102
 msgid "Executable"
 msgstr "ملفُّ التنفيذ"
 
-#: data/gtk/details-window.blp:124
-msgid "File to open or command to run when launching the game"
-msgstr "الملفُّ المفتوح أو الأمر المشغَّل عند بدء اللعبة"
+#: data/gtk/details-dialog.blp:108
+msgid "Select File"
+msgstr "اختر ملفًّا"
 
-#: data/gtk/details-window.blp:130
+#: data/gtk/details-dialog.blp:119
 msgid "More Info"
 msgstr "معلومات أكثر"
 
-#: data/gtk/game.blp:102 data/gtk/game.blp:121 data/gtk/window.blp:195
+#: data/gtk/game.blp:101 data/gtk/game.blp:109 data/gtk/window.blp:444
 msgid "Edit"
 msgstr "حرِّر"
 
-#: data/gtk/game.blp:107 src/window.py:171
+#: data/gtk/game.blp:102 cartridges/window.py:359
 msgid "Hide"
 msgstr "أخفِ"
 
-#: data/gtk/game.blp:112 data/gtk/game.blp:131 data/gtk/preferences.blp:56
-#: data/gtk/window.blp:209
+#: data/gtk/game.blp:103 data/gtk/game.blp:111 data/gtk/window.blp:464
 msgid "Remove"
 msgstr "أزل"
 
-#: data/gtk/game.blp:126 src/window.py:173
+#: data/gtk/game.blp:110 cartridges/window.py:361
 msgid "Unhide"
 msgstr "اكشف"
 
@@ -129,52 +124,55 @@ msgstr "اكشف"
 msgid "General"
 msgstr "عام"
 
-#: data/gtk/help-overlay.blp:14
-msgid "Quit"
-msgstr "أنهِ"
-
-#: data/gtk/help-overlay.blp:19 data/gtk/window.blp:217 data/gtk/window.blp:257
-#: data/gtk/window.blp:323
+#: data/gtk/help-overlay.blp:14 data/gtk/window.blp:207 data/gtk/window.blp:223
+#: data/gtk/window.blp:274 data/gtk/window.blp:290 data/gtk/window.blp:475
 msgid "Search"
 msgstr "ابحث"
 
-#: data/gtk/help-overlay.blp:24
-msgid "Show preferences"
-msgstr "أظهر التفضيلات"
+#: data/gtk/help-overlay.blp:24 data/gtk/window.blp:544
+msgid "Keyboard Shortcuts"
+msgstr "اختصارات لوحة المفاتيح"
 
-#: data/gtk/help-overlay.blp:29
-msgid "Shortcuts"
-msgstr "الاختصارات"
-
-#: data/gtk/help-overlay.blp:34 src/game.py:102 src/preferences.py:112
+#: data/gtk/help-overlay.blp:29 cartridges/game.py:103
+#: cartridges/preferences.py:137 cartridges/importer/importer.py:386
 msgid "Undo"
 msgstr "تراجع"
 
-#: data/gtk/help-overlay.blp:39
-msgid "Open menu"
-msgstr "افتح القائمة"
+#: data/gtk/help-overlay.blp:34
+msgid "Quit"
+msgstr "أنهِ"
 
-#: data/gtk/help-overlay.blp:45
+#: data/gtk/help-overlay.blp:39 data/gtk/window.blp:92 data/gtk/window.blp:187
+msgid "Toggle Sidebar"
+msgstr "أظهر شريط الجانب"
+
+#: data/gtk/help-overlay.blp:44 data/gtk/window.blp:200 data/gtk/window.blp:267
+msgid "Main Menu"
+msgstr "القائمة الرئيسة"
+
+#: data/gtk/help-overlay.blp:50
 msgid "Games"
 msgstr "الألعاب"
 
-#: data/gtk/help-overlay.blp:48
-msgid "Add new game"
-msgstr "أضف لعبةً جديدةً"
+#: data/gtk/help-overlay.blp:53 data/gtk/window.blp:193 data/gtk/window.blp:551
+msgid "Add Game"
+msgstr "أضف لعبةً"
 
-#: data/gtk/help-overlay.blp:53
-msgid "Import games"
-msgstr "استورد ألعابًا"
-
-#: data/gtk/help-overlay.blp:58
-msgid "Show hidden games"
-msgstr "أظهر الألعاب المخفية"
+#: data/gtk/help-overlay.blp:58 data/gtk/preferences.blp:58
+#: data/gtk/window.blp:27 data/gtk/window.blp:555
+msgid "Import"
+msgstr "استورد"
 
 #: data/gtk/help-overlay.blp:63
-msgid "Remove game"
+msgid "Show Hidden Games"
+msgstr "أظهر الألعاب المخفية"
+
+#: data/gtk/help-overlay.blp:68
+msgid "Remove Game"
 msgstr "أزل اللعبة"
 
-#: data/gtk/preferences.blp:13 data/gtk/preferences.blp:268
+#: data/gtk/preferences.blp:13 data/gtk/preferences.blp:62
+#: data/gtk/preferences.blp:365
 msgid "Behavior"
 msgstr "السلوك"
 
@@ -182,269 +180,321 @@ msgstr "السلوك"
 msgid "Exit After Launching Games"
 msgstr "اخرج بعد بدء الألعاب"
 
-#: data/gtk/preferences.blp:25
+#: data/gtk/preferences.blp:20
 msgid "Cover Image Launches Game"
 msgstr "تبدأ صورة الغلاف اللعبة"
 
-#: data/gtk/preferences.blp:26
+#: data/gtk/preferences.blp:21
 msgid "Swaps the behavior of the cover image and the play button"
 msgstr "يبدِّل سلوك صورة الغلاف وزرِّ «العب»"
 
-#: data/gtk/preferences.blp:36 src/details_window.py:81
+#: data/gtk/preferences.blp:26 cartridges/details_dialog.py:91
 msgid "Images"
 msgstr "الصور"
 
-#: data/gtk/preferences.blp:39
+#: data/gtk/preferences.blp:29
 msgid "High Quality Images"
 msgstr "صور ذات دقَّة عالية"
 
-#: data/gtk/preferences.blp:40
+#: data/gtk/preferences.blp:30
 msgid "Save game covers losslessly at the cost of storage"
 msgstr "احفظ غُلُف الألعاب دون فقد على حساب مساحة التخزين"
 
-#: data/gtk/preferences.blp:50
+#: data/gtk/preferences.blp:35
 msgid "Danger Zone"
 msgstr "منطقة خطر"
 
-#: data/gtk/preferences.blp:53
+#: data/gtk/preferences.blp:39
 msgid "Remove All Games"
 msgstr "أزل كلَّ الألعاب"
 
-#: data/gtk/preferences.blp:85 data/gtk/window.blp:27 data/gtk/window.blp:442
-msgid "Import"
-msgstr "استورد"
+#: data/gtk/preferences.blp:65
+msgid "Import Games Automatically"
+msgstr "استيراد الألعاب تلقائيًا"
 
-#: data/gtk/preferences.blp:89
+#: data/gtk/preferences.blp:69
+msgid "Remove Uninstalled Games"
+msgstr "أزل الألعاب المحذوفة"
+
+#: data/gtk/preferences.blp:74
 msgid "Sources"
 msgstr "المصادر"
 
-#: data/gtk/preferences.blp:92
+#: data/gtk/preferences.blp:78 cartridges/importer/steam_source.py:114
 msgid "Steam"
 msgstr "ستيم"
 
-#: data/gtk/preferences.blp:96 data/gtk/preferences.blp:110
-#: data/gtk/preferences.blp:151 data/gtk/preferences.blp:192
-#: data/gtk/preferences.blp:206 data/gtk/preferences.blp:220
-#: data/gtk/preferences.blp:234
+#: data/gtk/preferences.blp:87 data/gtk/preferences.blp:114
+#: data/gtk/preferences.blp:149 data/gtk/preferences.blp:192
+#: data/gtk/preferences.blp:219 data/gtk/preferences.blp:246
+#: data/gtk/preferences.blp:273
 msgid "Install Location"
 msgstr "موضع التثبيت"
 
-#: data/gtk/preferences.blp:106
+#: data/gtk/preferences.blp:105 data/gtk/window.blp:565
+#: cartridges/importer/lutris_source.py:107
 msgid "Lutris"
 msgstr "لوترس"
 
-#: data/gtk/preferences.blp:119
-msgid "Cache Location"
-msgstr "موضع الذاكرة المؤقتة"
-
-#: data/gtk/preferences.blp:128
+#: data/gtk/preferences.blp:131
 msgid "Import Steam Games"
 msgstr "استورد ألعابًا من ستيم"
 
-#: data/gtk/preferences.blp:137
+#: data/gtk/preferences.blp:135
 msgid "Import Flatpak Games"
 msgstr "استورد ألعاب فلاتباك"
 
-#: data/gtk/preferences.blp:147
+#: data/gtk/preferences.blp:140 cartridges/importer/heroic_source.py:355
 msgid "Heroic"
 msgstr "هِرُوِك"
 
-#: data/gtk/preferences.blp:160
+#: data/gtk/preferences.blp:166
 msgid "Import Epic Games"
 msgstr "استورد ألعاب أَبِك"
 
-#: data/gtk/preferences.blp:169
+#: data/gtk/preferences.blp:170
 msgid "Import GOG Games"
 msgstr "استورد ألعاب جي‌أو‌جي"
 
+#: data/gtk/preferences.blp:174
+msgid "Import Amazon Games"
+msgstr "استورد ألعابًا من أمازون"
+
 #: data/gtk/preferences.blp:178
 msgid "Import Sideloaded Games"
 msgstr "استورد ألعابًا مثبَّتةً بغير متجر"
 
-#: data/gtk/preferences.blp:188
+#: data/gtk/preferences.blp:183 cartridges/importer/bottles_source.py:86
 msgid "Bottles"
 msgstr "قوارير"
 
-#: data/gtk/preferences.blp:202
+#: data/gtk/preferences.blp:210 cartridges/importer/itch_source.py:81
 msgid "itch"
 msgstr "إتش"
 
-#: data/gtk/preferences.blp:216
+#: data/gtk/preferences.blp:237 cartridges/importer/legendary_source.py:97
 msgid "Legendary"
 msgstr "لجندري"
 
-#: data/gtk/preferences.blp:230
+#: data/gtk/preferences.blp:264 cartridges/importer/retroarch_source.py:142
+msgid "RetroArch"
+msgstr "رتروآرتش"
+
+#: data/gtk/preferences.blp:291 cartridges/importer/flatpak_source.py:143
 msgid "Flatpak"
 msgstr "فلاتباك"
 
-#: data/gtk/preferences.blp:243
+#. The location of the system-wide data directory
+#: data/gtk/preferences.blp:301
+msgid "System Location"
+msgstr "موضع النظام"
+
+#. The location of the user-specific data directory
+#: data/gtk/preferences.blp:319
+msgid "User Location"
+msgstr "موضع المستخدم"
+
+#: data/gtk/preferences.blp:336
 msgid "Import Game Launchers"
 msgstr "استورد مشغِّلات ألعاب"
 
-#: data/gtk/preferences.blp:256
+#: data/gtk/preferences.blp:341 cartridges/importer/desktop_source.py:215
+msgid "Desktop Entries"
+msgstr "مدخلات سطح المكتب"
+
+#: data/gtk/preferences.blp:353 data/gtk/window.blp:563
 msgid "SteamGridDB"
 msgstr "SteamGridDB"
 
-#: data/gtk/preferences.blp:260
+#: data/gtk/preferences.blp:357
 msgid "Authentication"
 msgstr "الاستيثاق"
 
-#: data/gtk/preferences.blp:263
+#: data/gtk/preferences.blp:360
 msgid "API Key"
 msgstr "مفتاح واجهة البرمجة"
 
-#: data/gtk/preferences.blp:271
+#: data/gtk/preferences.blp:368
 msgid "Use SteamGridDB"
 msgstr "استخدم SteamGridDB"
 
-#: data/gtk/preferences.blp:272
+#: data/gtk/preferences.blp:369
 msgid "Download images when adding or importing games"
 msgstr "نزِّل الصور حينما تنزِّل أو تستورد الألعاب"
 
-#: data/gtk/preferences.blp:281
+#: data/gtk/preferences.blp:373
 msgid "Prefer Over Official Images"
 msgstr "فضِّلها على الصور الرسمية"
 
-#: data/gtk/preferences.blp:290
+#: data/gtk/preferences.blp:377
 msgid "Prefer Animated Images"
 msgstr "فضِّل الصور المتحرِّكة"
 
+#: data/gtk/preferences.blp:383
+msgid "Update Covers"
+msgstr "حدِّث الغُلُف"
+
+#: data/gtk/preferences.blp:384
+msgid "Fetch covers for games already in your library"
+msgstr "اجلب غُلُفًا للألعاب التي في المكتبة"
+
+#: data/gtk/preferences.blp:389
+msgid "Update"
+msgstr "حدِّث"
+
 #: data/gtk/window.blp:6 data/gtk/window.blp:14
 msgid "No Games Found"
 msgstr "لم يُعثر على ألعاب"
 
 #: data/gtk/window.blp:7 data/gtk/window.blp:15
-msgid "Try a different search."
-msgstr "جرِّب بحثًا آخر."
+msgid "Try a different search"
+msgstr "جرِّب بحثًا آخر"
 
 #: data/gtk/window.blp:21
 msgid "No Games"
 msgstr "لا توجد ألعاب"
 
 #: data/gtk/window.blp:22
-msgid "Use the + button to add games."
-msgstr "استخدم زرَّ + لتضيف ألعابًا."
+msgid "Use the + button to add games"
+msgstr "استخدم زرَّ + لتضيف ألعابًا"
 
 #: data/gtk/window.blp:40
 msgid "No Hidden Games"
 msgstr "لا توجد ألعاب مخفية"
 
 #: data/gtk/window.blp:41
-msgid "Games you hide will appear here."
-msgstr "هنا يظهر ما أخفيت من ألعاب."
+msgid "Games you hide will appear here"
+msgstr "هنا يظهر ما أخفيت من ألعاب"
 
-#: data/gtk/window.blp:64 data/gtk/window.blp:304
-msgid "Back"
-msgstr "عد"
+#: data/gtk/window.blp:76 data/gtk/window.blp:113 cartridges/main.py:249
+msgid "All Games"
+msgstr "كلُّ الألعاب"
 
-#: data/gtk/window.blp:121
-msgid "Game Title"
-msgstr "عنوان اللعبة"
+#: data/gtk/window.blp:140 cartridges/main.py:251
+msgid "Added"
+msgstr "أُضيفَت"
 
-#: data/gtk/window.blp:176
-msgid "Play"
-msgstr "العب"
+#: data/gtk/window.blp:162
+msgid "Imported"
+msgstr "اُستوردَت"
 
-#: data/gtk/window.blp:243 data/gtk/window.blp:435
-msgid "Add Game"
-msgstr "أضف لعبةً"
-
-#: data/gtk/window.blp:250 data/gtk/window.blp:316
-msgid "Main Menu"
-msgstr "القائمة الرئيسة"
-
-#: data/gtk/window.blp:311
+#: data/gtk/window.blp:260
 msgid "Hidden Games"
 msgstr "الألعاب المخفية"
 
-#: data/gtk/window.blp:374
+#: data/gtk/window.blp:368
+msgid "Game Title"
+msgstr "عنوان اللعبة"
+
+#: data/gtk/window.blp:425
+msgid "Play"
+msgstr "العب"
+
+#: data/gtk/window.blp:502
 msgid "Sort"
 msgstr "رتِّب"
 
-#: data/gtk/window.blp:377
+#: data/gtk/window.blp:505
 msgid "A-Z"
 msgstr "أ-ي"
 
-#: data/gtk/window.blp:383
+#: data/gtk/window.blp:511
 msgid "Z-A"
 msgstr "ي-أ"
 
-#: data/gtk/window.blp:389
+#: data/gtk/window.blp:517
 msgid "Newest"
 msgstr "الأجدد"
 
-#: data/gtk/window.blp:395
+#: data/gtk/window.blp:523
 msgid "Oldest"
 msgstr "الأقدم"
 
-#: data/gtk/window.blp:401
+#: data/gtk/window.blp:529
 msgid "Last Played"
 msgstr "لُعبت آخر مرَّة"
 
-#: data/gtk/window.blp:408
+#: data/gtk/window.blp:536
 msgid "Show Hidden"
 msgstr "أظهر ما أخفي"
 
-#: data/gtk/window.blp:421
-msgid "Keyboard Shortcuts"
-msgstr "اختصارات لوحة المفاتيح"
-
-#: data/gtk/window.blp:426
+#: data/gtk/window.blp:545
 msgid "About Cartridges"
 msgstr "عن «خراطيش»"
 
-#. Translators: Replace this with your name for it to show up in the about window
-#: src/main.py:180
-msgid "translator_credits"
+#: data/gtk/window.blp:562
+msgid "IGDB"
+msgstr "IGDB"
+
+#: data/gtk/window.blp:564
+msgid "ProtonDB"
+msgstr "ProtonDB"
+
+#: data/gtk/window.blp:566
+msgid "HowLongToBeat"
+msgstr "HowLongToBeat"
+
+#. The variable is the title of the game
+#: cartridges/main.py:226 cartridges/game.py:125
+msgid "{} launched"
+msgstr "بُدئت {}"
+
+#. Translators: Replace this with Your Name, Your Name <your.email@example.com>, or Your Name https://your-site.com for it to show up in the About dialog.
+#: cartridges/main.py:291
+msgid "translator-credits"
 msgstr "Ali Aljishi <ahj696@hotmail.com>"
 
 #. The variable is the date when the game was added
-#: src/window.py:194
+#: cartridges/window.py:382
 msgid "Added: {}"
 msgstr "أضيفت في: {}"
 
-#: src/window.py:197
+#: cartridges/window.py:385
 msgid "Never"
 msgstr "أبدًا"
 
 #. The variable is the date when the game was last played
-#: src/window.py:201
+#: cartridges/window.py:389
 msgid "Last played: {}"
 msgstr "لُعبت آخر مرَّة في: {}"
 
-#: src/details_window.py:72
+#: cartridges/details_dialog.py:82
 msgid "Apply"
 msgstr "طبِّق"
 
-#: src/details_window.py:78
+#: cartridges/details_dialog.py:88
 msgid "Add New Game"
 msgstr "أضف لعبةً جديدةً"
 
-#: src/details_window.py:79
-msgid "Confirm"
-msgstr "أكِّد"
+#: cartridges/details_dialog.py:89
+msgid "Add"
+msgstr "أضف"
+
+#: cartridges/details_dialog.py:102
+msgid "Executables"
+msgstr "ملفات التنفيذ"
 
 #. Translate this string as you would translate "file"
-#: src/details_window.py:92
+#: cartridges/details_dialog.py:117
 msgid "file.txt"
 msgstr "ملف.txt"
 
 #. As in software
-#: src/details_window.py:94
+#: cartridges/details_dialog.py:119
 msgid "program"
 msgstr "البرنامج"
 
 #. Translate this string as you would translate "path to {}"
-#: src/details_window.py:99 src/details_window.py:101
+#: cartridges/details_dialog.py:124 cartridges/details_dialog.py:126
 msgid "C:\\path\\to\\{}"
 msgstr "C:\\المسار\\إلى\\{}"
 
 #. Translate this string as you would translate "path to {}"
-#: src/details_window.py:105 src/details_window.py:107
+#: cartridges/details_dialog.py:130 cartridges/details_dialog.py:132
 msgid "/path/to/{}"
 msgstr "/المسار/إلى/{}"
 
-#: src/details_window.py:112
+#: cartridges/details_dialog.py:137
 msgid ""
 "To launch the executable \"{}\", use the command:\n"
 "\n"
@@ -466,93 +516,234 @@ msgstr ""
 "\n"
 "ولا تنسَ إحاطة المسار بعلامتي تنصيص مزدوجتين حالما تضمَّن مسافات!"
 
-#: src/details_window.py:147 src/details_window.py:153
+#: cartridges/details_dialog.py:179 cartridges/details_dialog.py:185
 msgid "Couldn't Add Game"
 msgstr "تعذَّرت إضافة اللعبة"
 
-#: src/details_window.py:147 src/details_window.py:181
+#: cartridges/details_dialog.py:179 cartridges/details_dialog.py:221
 msgid "Game title cannot be empty."
 msgstr "لا يجوز كون عنوان اللعبة فارغًا."
 
-#: src/details_window.py:153 src/details_window.py:189
+#: cartridges/details_dialog.py:185 cartridges/details_dialog.py:229
 msgid "Executable cannot be empty."
 msgstr "لا يجوز كون ملفِّ التنفيذ فارغًا."
 
-#: src/details_window.py:180 src/details_window.py:188
+#: cartridges/details_dialog.py:220 cartridges/details_dialog.py:228
 msgid "Couldn't Apply Preferences"
 msgstr "تعذَّر تطبيق التفضيلات"
 
 #. The variable is the title of the game
-#: src/game.py:138
-msgid "{} launched"
-msgstr "بُدئت {}"
-
-#. The variable is the title of the game
-#: src/game.py:152
+#: cartridges/game.py:139
 msgid "{} hidden"
 msgstr "أٌخفيت {}"
 
-#: src/game.py:152
+#: cartridges/game.py:139
 msgid "{} unhidden"
 msgstr "أٌظهرت {}"
 
-#: src/game.py:169
+#. The variable is the title of the game
+#: cartridges/game.py:153
 msgid "{} removed"
 msgstr "أزيلت {}"
 
-#: src/preferences.py:111
+#: cartridges/preferences.py:136
 msgid "All games removed"
 msgstr "أُزيلت كلُّ الألعاب"
 
-#: src/preferences.py:159
+#: cartridges/preferences.py:188
 msgid ""
 "An API key is required to use SteamGridDB. You can generate one {}here{}."
 msgstr ""
 "تحتاج مفتاح واجهة برمجة حال ما أردت استخدام SteamGridDB، {}هنا تولِّده{}."
 
-#: src/preferences.py:284
+#: cartridges/preferences.py:203
+msgid "Downloading covers…"
+msgstr "تُنزَّل الغُلُف…"
+
+#: cartridges/preferences.py:222
+msgid "Covers updated"
+msgstr "حُدِّثت الغُلُف"
+
+#: cartridges/preferences.py:370
 msgid "Installation Not Found"
 msgstr "لم يُعثر على التثبيت"
 
-#: src/preferences.py:286
-msgid "Select a valid directory."
-msgstr "حدِّد مجلَّدًا صالحًا."
+#: cartridges/preferences.py:371
+msgid "Select a valid directory"
+msgstr "حدِّد مجلَّدًا صالحًا"
 
-#: src/preferences.py:348
+#: cartridges/preferences.py:407 cartridges/importer/importer.py:317
+msgid "Warning"
+msgstr "تحذير"
+
+#: cartridges/preferences.py:441
 msgid "Invalid Directory"
 msgstr "مجلَّد غير صالح"
 
+#: cartridges/preferences.py:447
+msgid "Set Location"
+msgstr "عيِّن الموضع"
+
+#: cartridges/utils/create_dialog.py:33 cartridges/importer/importer.py:318
+msgid "Dismiss"
+msgstr "تجاهل"
+
+#: cartridges/utils/relative_date.py:30
+msgid "Today"
+msgstr "اليوم"
+
+#: cartridges/utils/relative_date.py:32
+msgid "Yesterday"
+msgstr "أمس"
+
+#: cartridges/utils/relative_date.py:36
+msgid "Last Week"
+msgstr "آخر أسبوع"
+
+#: cartridges/utils/relative_date.py:38
+msgid "This Month"
+msgstr "هذا الشهر"
+
+#: cartridges/utils/relative_date.py:40
+msgid "Last Month"
+msgstr "الشهر الماضي"
+
+#: cartridges/utils/relative_date.py:44
+msgid "Last Year"
+msgstr "العام الماضي"
+
+#: cartridges/importer/importer.py:144
+msgid "Importing Games…"
+msgstr "تُستورد الألعاب…"
+
+#: cartridges/importer/importer.py:337
+msgid "The following errors occured during import:"
+msgstr "طرأ هذا الخطأ أثناء الاستيراد:"
+
+#: cartridges/importer/importer.py:366
+msgid "No new games found"
+msgstr "لم يُعثر على ألعاب جديدة"
+
+#. The variable is the number of games.
+#: cartridges/importer/importer.py:379
+msgid "{} game imported"
+msgid_plural "{} games imported"
+msgstr[0] "لم تستورد لعبة"
+msgstr[1] "اُستوردت {} لعبة"
+msgstr[2] "اُستوردت لعبتان"
+msgstr[3] "اُستوردت {} ألعاب"
+msgstr[4] "اُستوردت {} لعبة"
+msgstr[5] "اُستوردت {} لعبة"
+
+#. The variable is the number of games. This text comes after "{0} games imported".
+#: cartridges/importer/importer.py:383
+msgid ", {} removed"
+msgid_plural ", {} removed"
+msgstr[0] "، ولم تُزل أي لعبة"
+msgstr[1] "، وأزيلت لعبة"
+msgstr[2] "، وأزيلت لعبتان"
+msgstr[3] "، وأزيلت {} ألعاب"
+msgstr[4] "، وأزيلت {} لعبة"
+msgstr[5] "، وأزيلت {} لعبة"
+
 #. The variable is the name of the source
-#: src/preferences.py:352
+#: cartridges/importer/location.py:34
 msgid "Select the {} cache directory."
 msgstr "حدِّد مجلَّد ذاكرة {} المؤقتة."
 
 #. The variable is the name of the source
-#: src/preferences.py:355
+#: cartridges/importer/location.py:36
 msgid "Select the {} configuration directory."
 msgstr "حدِّد مجلَّد ضبط {}."
 
 #. The variable is the name of the source
-#: src/preferences.py:358
+#: cartridges/importer/location.py:38
 msgid "Select the {} data directory."
 msgstr "حدِّد مجلَّد بيانات {}."
 
-#: src/preferences.py:364
-msgid "Set Location"
-msgstr "عيِّن الموضع"
+#: cartridges/importer/retroarch_source.py:129
+msgid "No RetroArch Core Selected"
+msgstr "لم تختر نواة رتروآرتش"
 
-#: src/utils/create_dialog.py:25
-msgid "Dismiss"
-msgstr "تجاهل"
+#. The variable is a newline separated list of playlists
+#: cartridges/importer/retroarch_source.py:131
+msgid "The following playlists have no default core:"
+msgstr "ليس للقوائم التالية نواة مبدئية:"
 
-#: src/store/managers/sgdb_manager.py:47
+#: cartridges/importer/retroarch_source.py:133
+msgid "Games with no core selected were not imported"
+msgstr "لم نستورد الألعاب التي لم تختر لها أنويةً"
+
+#: cartridges/store/managers/sgdb_manager.py:46
 msgid "Couldn't Authenticate SteamGridDB"
 msgstr "تعذَّر استيثاق SteamGridDB"
 
-#: src/store/managers/sgdb_manager.py:48
+#: cartridges/store/managers/sgdb_manager.py:47
 msgid "Verify your API key in preferences"
 msgstr "أكِّد مفتاح واجهة البرمجة في التفضيلات"
 
+#, fuzzy
+#~ msgid "1 game imported"
+#~ msgid_plural "{} games imported"
+#~ msgstr[0] "اُستوردت لعبة واحدة"
+#~ msgstr[1] "اُستوردت {} لعبة"
+#~ msgstr[2] "اُستوردت {} لعبة"
+#~ msgstr[3] "اُستوردت {} لعبة"
+#~ msgstr[4] "اُستوردت {} لعبة"
+#~ msgstr[5] "اُستوردت {} لعبة"
+
+#, fuzzy
+#~ msgid "1 removed"
+#~ msgid_plural "{} removed"
+#~ msgstr[0] "أزيل ١"
+#~ msgstr[1] "أزيل {}"
+#~ msgstr[2] "أزيل {}"
+#~ msgstr[3] "أزيل {}"
+#~ msgstr[4] "أزيل {}"
+#~ msgstr[5] "أزيل {}"
+
+#~ msgid "Cache Location"
+#~ msgstr "موضع الذاكرة المؤقتة"
+
+#~ msgid "Library"
+#~ msgstr "المكتبة"
+
+#~ msgid "Show preferences"
+#~ msgstr "أظهر التفضيلات"
+
+#~ msgid "Shortcuts"
+#~ msgstr "الاختصارات"
+
+#~ msgid "Open menu"
+#~ msgstr "افتح القائمة"
+
+#~ msgid "Add new game"
+#~ msgstr "أضف لعبةً جديدةً"
+
+#~ msgid "Import games"
+#~ msgstr "استورد ألعابًا"
+
+#~ msgid "Back"
+#~ msgstr "عد"
+
+#~ msgid "Search games"
+#~ msgstr "ابحث عن ألعاب"
+
+#~ msgid "Search hidden games"
+#~ msgstr "ابحث في الألعاب المخفية"
+
+#~ msgid "The title of the game"
+#~ msgstr "عنوان اللعبة"
+
+#~ msgid "Developer"
+#~ msgstr "المطوِّر"
+
+#~ msgid "File to open or command to run when launching the game"
+#~ msgstr "الملفُّ المفتوح أو الأمر المشغَّل عند بدء اللعبة"
+
+#~ msgid "Confirm"
+#~ msgstr "أكِّد"
+
 #, fuzzy
 #~| msgid "The Steam directory cannot be found."
 #~ msgid "Directory not Valid"
@@ -575,33 +766,12 @@ msgstr "أكِّد مفتاح واجهة البرمجة في التفضيلات"
 #~ msgid "Bottles Install Location"
 #~ msgstr "موضع تثبيت قوارير"
 
-#~ msgid "Today"
-#~ msgstr "اليوم"
-
-#~ msgid "Yesterday"
-#~ msgstr "أمس"
-
 #~ msgid "Cache Not Found"
 #~ msgstr "لم يُعثر على الذاكرة المؤقَّتة"
 
 #~ msgid "Select the Lutris cache directory."
 #~ msgstr "حدِّد مجلَّد ذاكرة لوترس المؤقَّتة."
 
-#~ msgid "Importing Games…"
-#~ msgstr "تُستورد الألعاب…"
-
-#~ msgid "Importing Covers…"
-#~ msgstr "تُستورد الغُلُف…"
-
-#~ msgid "No new games found"
-#~ msgstr "لم يُعثر على ألعاب جديدة"
-
-#~ msgid "1 game imported"
-#~ msgstr "اُستوردت لعبة واحدة"
-
-#~ msgid "{} games imported"
-#~ msgstr "اُستوردت {} لعبة"
-
 #~ msgid "Directory to use when importing games"
 #~ msgstr "المجلَّد المستخدم عند استيراد الألعاب"