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
-        manifest-path: flatpak/hu.kramo.Cartridges.Devel.json
+        bundle: page.kramo.Cartridges.Devel.flatpak
+        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-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
 
 <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/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,13 +1,16 @@
 <?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>
+  <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>
+  <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>
@@ -15,7 +18,7 @@
   <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 id="page.kramo">
-      <name translate="no">kramo</name>
+    <name translate="no">kramo</name>
   </developer>
   <launchable type="desktop-id">@APP_ID@.desktop</launchable>
   <translation type="gettext">cartridges</translation>

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",

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'
-  prefix = '/hu/kramo/Cartridges/Devel'
+  app_id = 'page.kramo.Cartridges.Devel'
+  prefix = '/page/kramo/Cartridges/Devel'
 elif profile ==  'release'
-  app_id = 'hu.kramo.Cartridges'
-  prefix = '/hu/kramo/Cartridges'
+  app_id = 'page.kramo.Cartridges'
+  prefix = '/page/kramo/Cartridges'
 endif
 
 conf = configuration_data()

search-provider/meson.build

@@ -11,15 +11,15 @@ 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
-)
+)