Update metainfo formatting, add replaces tag

.github/workflows/ci.yml

@@ -19,8 +19,8 @@ jobs:
     - name: Flatpak Builder
       uses: flatpak/flatpak-github-actions/flatpak-builder@v6.3
       with:
-        bundle: hu.kramo.Cartridges.Devel.flatpak
+        bundle: page.kramo.Cartridges.Devel.flatpak
-        manifest-path: flatpak/hu.kramo.Cartridges.Devel.json
+        manifest-path: flatpak/page.kramo.Cartridges.Devel.json
 
   # windows:
   #   name: Windows

.github/workflows/publish-release.yml

@@ -23,7 +23,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]

README.md

@@ -7,12 +7,12 @@
 [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-url]: https://flathub.org/apps/page.kramo.Cartridges
-[flathub-image]: https://img.shields.io/flathub/v/hu.kramo.Cartridges?logo=flathub&style=for-the-badge
+[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/hu.kramo.Cartridges?style=for-the-badge
+[installs-image]: https://img.shields.io/flathub/downloads/page.kramo.Cartridges?style=for-the-badge
 
 <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
 
@@ -69,7 +69,7 @@ Thank you for your generosity! 💜
 
 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 width='240' alt='Download on Flathub' src='https://dl.flathub.org/assets/badges/flathub-badge-en.png'/></a>
 
 ## Windows
 

cartridges/importer/flatpak_source.py

@@ -46,11 +46,18 @@ class FlatpakSourceIterable(SourceIterable):
             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",

data/gtk/details-dialog.blp

@@ -1,11 +1,10 @@
 using Gtk 4.0;
 using Adw 1;
 
-template $DetailsDialog : Adw.Dialog {
+template $DetailsDialog: Adw.Dialog {
   content-width: 480;
 
   Adw.ToolbarView {
-
     [top]
     Adw.HeaderBar HeaderBar {
       show-start-title-buttons: false;
@@ -29,6 +28,7 @@ template $DetailsDialog : Adw.Dialog {
       Adw.PreferencesGroup cover_group {
         Adw.Clamp cover_clamp {
           maximum-size: 200;
+
           Overlay {
             [overlay]
             Spinner spinner {
@@ -50,7 +50,8 @@ template $DetailsDialog : Adw.Dialog {
                 margin-end: 6;
 
                 styles [
-                                    "circular", "osd"
+                  "circular",
+                  "osd"
                 ]
               }
 
@@ -68,7 +69,8 @@ template $DetailsDialog : Adw.Dialog {
                   margin-end: 6;
 
                   styles [
-                                        "circular", "osd"
+                    "circular",
+                    "osd"
                   ]
                 }
               }
@@ -90,10 +92,12 @@ template $DetailsDialog : Adw.Dialog {
         Adw.EntryRow name {
           title: _("Title");
         }
+
         Adw.EntryRow developer {
           title: _("Developer (optional)");
         }
       }
+
       Adw.PreferencesGroup {
         Adw.EntryRow executable {
           title: _("Executable");
@@ -135,7 +139,6 @@ template $DetailsDialog : Adw.Dialog {
               "flat"
             ]
           }
-
         }
       }
     }

data/gtk/game.blp

@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template $Game : Box {
+template $Game: Box {
   orientation: vertical;
   halign: center;
   valign: start;

data/gtk/preferences.blp

@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template $CartridgesPreferences : Adw.PreferencesDialog {
+template $CartridgesPreferences: Adw.PreferencesDialog {
   search-enabled: true;
 
   Adw.PreferencesPage general_page {
@@ -139,6 +139,7 @@ template $CartridgesPreferences : Adw.PreferencesDialog {
           Button steam_data_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+
             styles [
               "flat"
             ]
@@ -161,6 +162,7 @@ template $CartridgesPreferences : Adw.PreferencesDialog {
           Button lutris_data_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+
             styles [
               "flat"
             ]
@@ -191,6 +193,7 @@ template $CartridgesPreferences : Adw.PreferencesDialog {
           Button heroic_config_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+
             styles [
               "flat"
             ]
@@ -229,6 +232,7 @@ template $CartridgesPreferences : Adw.PreferencesDialog {
           Button bottles_data_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+
             styles [
               "flat"
             ]
@@ -251,6 +255,7 @@ template $CartridgesPreferences : Adw.PreferencesDialog {
           Button itch_config_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+
             styles [
               "flat"
             ]
@@ -273,6 +278,7 @@ template $CartridgesPreferences : Adw.PreferencesDialog {
           Button legendary_config_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+
             styles [
               "flat"
             ]
@@ -295,6 +301,7 @@ template $CartridgesPreferences : Adw.PreferencesDialog {
           Button retroarch_config_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+
             styles [
               "flat"
             ]
@@ -318,6 +325,7 @@ template $CartridgesPreferences : Adw.PreferencesDialog {
           Button flatpak_system_data_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+
             styles [
               "flat"
             ]
@@ -331,6 +339,7 @@ template $CartridgesPreferences : Adw.PreferencesDialog {
           Button flatpak_user_data_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+
             styles [
               "flat"
             ]
@@ -394,6 +403,7 @@ template $CartridgesPreferences : Adw.PreferencesDialog {
             label: _("Update");
             valign: center;
           }
+
           Spinner sgdb_spinner {
             valign: center;
           }

data/gtk/window.blp

@@ -43,13 +43,14 @@ Adw.StatusPage hidden_notice_empty {
   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;
@@ -80,6 +81,7 @@ template $CartridgesWindow : Adw.ApplicationWindow {
           [sidebar]
           Adw.NavigationPage {
             title: _("Cartridges");
+
             Adw.ToolbarView {
               [top]
               Adw.HeaderBar {
@@ -103,17 +105,22 @@ template $CartridgesWindow : Adw.ApplicationWindow {
                     Image {
                       icon-name: "view-grid-symbolic";
                     }
+
                     Label {
                       halign: start;
                       label: _("All Games");
                     }
+
                     Label all_games_no_label {
                       hexpand: true;
                       halign: end;
 
-                        styles ["dim-label"]
+                      styles [
+                        "dim-label"
+                      ]
                     }
                   }
+
                   Box added_row_box {
                     margin-top: 12;
                     margin-bottom: 12;
@@ -123,43 +130,55 @@ template $CartridgesWindow : Adw.ApplicationWindow {
                     Image {
                       icon-name: "list-add-symbolic";
                     }
+
                     Label {
                       halign: start;
                       label: _("Added");
                       margin-end: 6;
                     }
+
                     Label added_games_no_label {
                       hexpand: true;
                       halign: end;
                       margin-end: 6;
 
-                        styles ["dim-label"]
+                      styles [
+                        "dim-label"
+                      ]
                     }
                   }
+
                   ListBoxRow {
                     selectable: false;
                     activatable: false;
+
                     Label {
                       label: _("Imported");
-                        styles ["heading"]
+
+                      styles [
+                        "heading"
+                      ]
+
                       halign: start;
                     }
                   }
-                    styles ["navigation-sidebar"]
+
+                  styles [
+                    "navigation-sidebar"
+                  ]
                 }
               }
             }
           }
 
           Adw.ToolbarView library_view {
-
             [top]
             Adw.HeaderBar header_bar {
-
               [start]
               Revealer {
                 transition-type: slide_right;
                 reveal-child: bind overlay_split_view.show-sidebar inverted;
+
                 Button show_sidebar_button {
                   icon-name: "sidebar-show-symbolic";
                   action-name: "win.show_sidebar";
@@ -233,7 +252,7 @@ template $CartridgesWindow : Adw.ApplicationWindow {
       }
     }
   }
-  }
+}
 
 Adw.NavigationPage hidden_library_page {
   title: _("Hidden Games");
@@ -303,10 +322,8 @@ Adw.NavigationPage details_page {
 
     [overlay]
     Adw.ToolbarView details_view_toolbar_view {
-
       [top]
-      Adw.HeaderBar {
+      Adw.HeaderBar {}
-      }
 
       ScrolledWindow {
         Box details_view_box {
@@ -541,7 +558,6 @@ menu add_games {
 menu search {
   section {
     label: "Search on…";
-
     item (_("IGDB"), "app.igdb_search")
     item (_("SteamGridDB"), "app.sgdb_search")
     item (_("ProtonDB"), "app.protondb_search")

data/meson.build

@@ -24,7 +24,7 @@ gnome.compile_resources('cartridges',
 
 desktop_file = i18n.merge_file(
         input: configure_file(
-          input: 'hu.kramo.Cartridges.desktop.in',
+          input: 'page.kramo.Cartridges.desktop.in',
           output: app_id + '.desktop.in',
           configuration: conf
         ),
@@ -42,7 +42,7 @@ endif
 
 appstream_file = i18n.merge_file(
         input: configure_file(
-          input: 'hu.kramo.Cartridges.metainfo.xml.in',
+          input: 'page.kramo.Cartridges.metainfo.xml.in',
           output: app_id + '.metainfo.xml.in',
           configuration: conf
         ),
@@ -63,7 +63,7 @@ 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
   ),

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

@@ -1,6 +1,9 @@
 <?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>

flatpak/page.kramo.Cartridges.Devel.json

@@ -1,5 +1,5 @@
 {
-    "id" : "hu.kramo.Cartridges.Devel",
+    "id" : "page.kramo.Cartridges.Devel",
     "runtime" : "org.gnome.Platform",
     "runtime-version" : "46",
     "sdk" : "org.gnome.Sdk",
@@ -112,7 +112,7 @@
                 {
                     "type" : "git",
                     "url" : "https://gitlab.gnome.org/jwestman/blueprint-compiler",
-                    "tag" : "v0.10.0"
+                    "tag" : "v0.12.0"
                 }
             ],
             "cleanup" : [

meson.build

@@ -16,11 +16,11 @@ libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'))
 
 profile = get_option('profile')
 if profile == 'development'
-  app_id = 'hu.kramo.Cartridges.Devel'
+  app_id = 'page.kramo.Cartridges.Devel'
-  prefix = '/hu/kramo/Cartridges/Devel'
+  prefix = '/page/kramo/Cartridges/Devel'
 elif profile ==  'release'
-  app_id = 'hu.kramo.Cartridges'
+  app_id = 'page.kramo.Cartridges'
-  prefix = '/hu/kramo/Cartridges'
+  prefix = '/page/kramo/Cartridges'
 endif
 
 conf = configuration_data()

search-provider/meson.build

@@ -11,14 +11,14 @@ configure_file(
 )
 
 configure_file(
-  input: 'hu.kramo.Cartridges.SearchProvider.service.in',
+  input: 'page.kramo.Cartridges.SearchProvider.service.in',
   output: app_id + '.SearchProvider.service',
   configuration: conf,
   install_dir: service_dir
 )
 
 configure_file(
-  input: 'hu.kramo.Cartridges.SearchProvider.ini',
+  input: 'page.kramo.Cartridges.SearchProvider.ini',
   output: app_id + '.SearchProvider.ini',
   configuration: conf,
   install_dir: serarch_provider_dir

subprojects/blueprint-compiler.wrap

@@ -1,7 +1,7 @@
 [wrap-git]
 directory = blueprint-compiler
 url = https://gitlab.gnome.org/jwestman/blueprint-compiler.git
-revision = v0.10.0
+revision = v0.12.0
 depth = 1
 
 [provide]