Merge branch 'main' into gali-importer-structure

.github/ISSUE_TEMPLATE/bug_report.md

@@ -26,6 +26,7 @@ If applicable, add screenshots to help explain your problem.
 **System (please complete the following information):**
  - OS: [e.g. Fedora Linux]
  - Installation method [e.g. Flatpak]
+ - Cartridges version [e.g. 1.5.4]
 
 **Additional context**
 Add any other context about the problem here.

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

@@ -44,12 +44,10 @@
   </screenshots>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="1.5.4" date="2023-05-27">
+    <release version="1.5.5" date="2023-06-10">
       <description translatable="no">
         <ul>
-          <li>Fixes a bug with custom install locations</li>
+          <li>Fixes an issue with Bottles' custom Bottles directory feature</li>
-          <li>Fixes a potential bug with deleted Steam libraries</li>
-          <li>Translations since 1.5</li>
         </ul>
       </description>
     </release>

meson.build

@@ -1,5 +1,5 @@
 project('cartridges',
-          version: '1.5.4',
+          version: '1.5.5',
     meson_version: '>= 0.59.0',
   default_options: [ 'warning_level=2', 'werror=false', ],
 )

src/__builtins__.pyi

@@ -1 +1 @@
-def _(msg: str, /) -> str: ...
+def _(_msg: str, /) -> str: ...

src/importers/bottles_importer.py

@@ -82,15 +82,25 @@ def bottles_importer():
         values["source"] = "bottles"
         values["added"] = current_time
 
-        importer.save_game(
+        # This will not work if both Cartridges and Bottles are installed via Flatpak
-            values,
+        # as Cartridges can't access directories picked via Bottles' file picker portal
-            (
+        try:
-                bottles_dir
+            bottles_location = Path(
-                / "bottles"
+                yaml.safe_load((bottles_dir / "data.yml").read_text("utf-8"))[
+                    "custom_bottles_path"
+                ]
+            )
+        except (FileNotFoundError, KeyError):
+            bottles_location = bottles_dir / "bottles"
+
+        grid_path = (
+            bottles_location
             / game["bottle"]["path"]
             / "grids"
             / game["thumbnail"].split(":")[1]
         )
-            if game["thumbnail"]
+
-            else None,
+        importer.save_game(
+            values,
+            grid_path if game["thumbnail"] and grid_path.is_file() else None,
         )

windows/Cartridges.iss

@@ -1,5 +1,5 @@
 #define MyAppName "Cartridges"
-#define MyAppVersion "1.5.4"
+#define MyAppVersion "1.5.5"
 #define MyAppPublisher "kramo"
 #define MyAppURL "https://github.com/kra-mo/cartridges"
 #define MyAppExeName "pythonw.exe"