From 036e5814f370fa6c8123febf0aa1540785322236 Mon Sep 17 00:00:00 2001
From: kramo <93832451+kra-mo@users.noreply.github.com>
Date: Sat, 1 Jul 2023 11:11:16 +0200
Subject: [PATCH] Fix Flatpak custom paths

---
 data/hu.kramo.Cartridges.gschema.xml.in |  2 +-
 src/importer/sources/flatpak_source.py  | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/data/hu.kramo.Cartridges.gschema.xml.in b/data/hu.kramo.Cartridges.gschema.xml.in
index 2ba37ae..4fffaad 100644
--- a/data/hu.kramo.Cartridges.gschema.xml.in
+++ b/data/hu.kramo.Cartridges.gschema.xml.in
@@ -68,7 +68,7 @@
       <default>true</default>
     </key>
     <key name="flatpak-location" type="s">
-      <default>"/var/lib/flatpak/exports/"</default>
+      <default>"/var/lib/flatpak/"</default>
     </key>
     <key name="flatpak-import-launchers" type="b">
       <default>false</default>
diff --git a/src/importer/sources/flatpak_source.py b/src/importer/sources/flatpak_source.py
index bde320c..d793ecb 100644
--- a/src/importer/sources/flatpak_source.py
+++ b/src/importer/sources/flatpak_source.py
@@ -53,6 +53,9 @@ class FlatpakSourceIterator(SourceIterator):
         )
 
         for entry in (self.source.data_location["applications"]).iterdir():
+            if entry.suffix != ".desktop":
+                continue
+
             keyfile = GLib.KeyFile.new()
 
             try:
@@ -118,11 +121,11 @@ class FlatpakSource(Source):
     data_location = Location(
         schema_key="flatpak-location",
         candidates=(
-            "/var/lib/flatpak/exports/",
-            shared.data_dir / "flatpak" / "exports",
+            "/var/lib/flatpak/",
+            shared.data_dir / "flatpak",
         ),
         paths={
-            "applications": (True, "share/applications"),
-            "icons": (True, "share/icons"),
+            "applications": (True, "exports/share/applications"),
+            "icons": (True, "exports/share/icons"),
         },
     )