v2.0.1

.github/workflows/ci.yml

@@ -51,10 +51,10 @@ jobs:
           timeout 2 cartridges; [ "$?" -eq "124" ]
 
       - name: Inno Setup
-        run: iscc ".\_build\Cartridges.iss"
+        run: iscc ".\_build\windows\Cartridges.iss"
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
           name: Windows Installer
-          path: _build/Output/Cartridges Setup.exe
+          path: _build/windows/Output/Cartridges Setup.exe

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

@@ -14,7 +14,7 @@
       <default>true</default>
     </key>
     <key name="steam-location" type="s">
-      <default>"~/.steam/"</default>
+      <default>"~/.steam/steam"</default>
     </key>
     <key name="lutris" type="b">
       <default>true</default>

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

@@ -44,6 +44,14 @@
   </screenshots>
   <content_rating type="oars-1.1" />
   <releases>
+    <release version="2.0.1" date="2023-07-06">
+      <description translatable="no">
+        <ul>
+          <li>Fixes the ability to import multiple times at once</li>
+          <li>Fixes an issue with non-Flatpak Steam on Linux</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>

flatpak/hu.kramo.Cartridges.Devel.json

@@ -28,8 +28,7 @@
         "/share/man",
         "/share/pkgconfig",
         "*.la",
-        "*.a",
+        "*.a"
-        "Cartridges.iss"
     ],
     "modules" : [
         {

meson.build

@@ -1,5 +1,5 @@
 project('cartridges',
-          version: '2.0',
+          version: '2.0.1',
     meson_version: '>= 0.59.0',
   default_options: [ 'warning_level=2', 'werror=false', ],
 )
@@ -33,13 +33,9 @@ subdir('data')
 subdir('src')
 subdir('po')
 
-configure_file(
+if host_machine.system() == 'windows'
-  input: './windows/Cartridges.iss.in',
+  subdir('windows')
-  output: 'Cartridges.iss',
+endif
-  configuration: conf,
-  install: true,
-  install_dir: '.'
-)
 
 gnome.post_install(
      glib_compile_schemas: true,

src/importer/importer.py

@@ -91,6 +91,8 @@ class Importer(ErrorProducer):
     def run(self):
         """Use several Gio.Task to import games from added sources"""
 
+        shared.win.get_application().lookup_action("import").set_enabled(False)
+
         self.create_dialog()
 
         # Collect all errors and reset the cancellables for the managers
@@ -221,6 +223,7 @@ class Importer(ErrorProducer):
         self.import_dialog.close()
         self.summary_toast = self.create_summary_toast()
         self.create_error_dialog()
+        shared.win.get_application().lookup_action("import").set_enabled(True)
 
     def create_error_dialog(self):
         """Dialog containing all errors raised by importers"""

src/importer/sources/steam_source.py

@@ -118,9 +118,9 @@ class SteamSource(URLExecutableSource):
     data_location = Location(
         schema_key="steam-location",
         candidates=(
-            shared.flatpak_dir / "com.valvesoftware.Steam" / "data" / "Steam",
+            shared.home / ".steam" / "steam",
             shared.data_dir / "Steam",
-            shared.home / ".steam",
+            shared.flatpak_dir / "com.valvesoftware.Steam" / "data" / "Steam",
             shared.programfiles32_dir / "Steam",
         ),
         paths={

windows/Cartridges.iss.in

@@ -15,10 +15,10 @@ AppSupportURL=https://github.com/kra-mo/cartridges/issues
 AppUpdatesURL={#MyAppURL}
 DefaultDirName={autopf64}\{#MyAppName}
 DisableProgramGroupPage=yes
-LicenseFile=..\LICENSE
+LicenseFile=..\..\LICENSE
 PrivilegesRequiredOverridesAllowed=dialog
 OutputBaseFilename=Cartridges Setup
-SetupIconFile=..\windows\icon.ico
+SetupIconFile=..\..\windows\icon.ico
 Compression=lzma
 SolidCompression=yes
 WizardStyle=modern
@@ -50,7 +50,7 @@ Source: "D:\a\_temp\msys64\ucrt64\share\glib-2.0\*"; DestDir: "{app}\share\glib-
 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: "..\..\windows\icon.ico"; DestDir: "{app}"; Flags: recursesubdirs ignoreversion
 
 [Icons]
 Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\bin\{#MyAppExeName}"; Parameters: """{app}\bin\cartridges"""; IconFilename: "{app}\icon.ico"

windows/meson.build

@@ -0,0 +1,7 @@
+configure_file(
+  input: './Cartridges.iss.in',
+  output: 'Cartridges.iss',
+  configuration: conf,
+  install: true,
+  install_dir: '.'
+)