diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a87bc2a..5cf6431 100644 --- a/.github/workflows/ci.yml +++ b/.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 diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index da0f54e..2e1d90e 100644 --- a/.github/workflows/publish-release.yml +++ b/.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("\s*\n([\s\S]*?)\s*\s*<\/release>", string)[0] diff --git a/README.md b/README.md index 3d66a7d..8f6f906 100644 --- a/README.md +++ b/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
- + # Cartridges @@ -69,7 +69,7 @@ Thank you for your generosity! 💜 The app is available on Flathub. -Download on Flathub +Download on Flathub ## Windows diff --git a/cartridges/importer/flatpak_source.py b/cartridges/importer/flatpak_source.py index 9cab14e..2297c41 100644 --- a/cartridges/importer/flatpak_source.py +++ b/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", diff --git a/data/icons/hicolor/scalable/apps/hu.kramo.Cartridges.Devel.svg b/data/icons/hicolor/scalable/apps/page.kramo.Cartridges.Devel.svg similarity index 100% rename from data/icons/hicolor/scalable/apps/hu.kramo.Cartridges.Devel.svg rename to data/icons/hicolor/scalable/apps/page.kramo.Cartridges.Devel.svg diff --git a/data/icons/hicolor/scalable/apps/hu.kramo.Cartridges.svg b/data/icons/hicolor/scalable/apps/page.kramo.Cartridges.svg similarity index 100% rename from data/icons/hicolor/scalable/apps/hu.kramo.Cartridges.svg rename to data/icons/hicolor/scalable/apps/page.kramo.Cartridges.svg diff --git a/data/icons/hicolor/symbolic/apps/hu.kramo.Cartridges-symbolic.svg b/data/icons/hicolor/symbolic/apps/page.kramo.Cartridges-symbolic.svg similarity index 100% rename from data/icons/hicolor/symbolic/apps/hu.kramo.Cartridges-symbolic.svg rename to data/icons/hicolor/symbolic/apps/page.kramo.Cartridges-symbolic.svg diff --git a/data/icons/hicolor/symbolic/apps/hu.kramo.Cartridges.Devel-symbolic.svg b/data/icons/hicolor/symbolic/apps/page.kramo.Cartridges.Devel-symbolic.svg similarity index 100% rename from data/icons/hicolor/symbolic/apps/hu.kramo.Cartridges.Devel-symbolic.svg rename to data/icons/hicolor/symbolic/apps/page.kramo.Cartridges.Devel-symbolic.svg diff --git a/data/meson.build b/data/meson.build index cf98149..5150b8e 100644 --- a/data/meson.build +++ b/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 ), diff --git a/data/hu.kramo.Cartridges.desktop.in b/data/page.kramo.Cartridges.desktop.in similarity index 100% rename from data/hu.kramo.Cartridges.desktop.in rename to data/page.kramo.Cartridges.desktop.in diff --git a/data/hu.kramo.Cartridges.gschema.xml.in b/data/page.kramo.Cartridges.gschema.xml.in similarity index 100% rename from data/hu.kramo.Cartridges.gschema.xml.in rename to data/page.kramo.Cartridges.gschema.xml.in diff --git a/data/hu.kramo.Cartridges.metainfo.xml.in b/data/page.kramo.Cartridges.metainfo.xml.in similarity index 94% rename from data/hu.kramo.Cartridges.metainfo.xml.in rename to data/page.kramo.Cartridges.metainfo.xml.in index 40ecb47..7ce11f7 100644 --- a/data/hu.kramo.Cartridges.metainfo.xml.in +++ b/data/page.kramo.Cartridges.metainfo.xml.in @@ -1,13 +1,16 @@ @APP_ID@ - CC0-1.0 - GPL-3.0-or-later + + hu.kramo.Cartridges + + CC0-1.0 + GPL-3.0-or-later Cartridges Launch all your games - -

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.

-
+ +

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.

+
https://github.com/kra-mo/cartridges https://github.com/kra-mo/cartridges/issues https://hosted.weblate.org/engage/cartridges/ @@ -15,7 +18,7 @@ https://github.com/kra-mo/cartridges https://github.com/kra-mo/cartridges/blob/main/CONTRIBUTING.md - kramo + kramo @APP_ID@.desktop cartridges diff --git a/flatpak/hu.kramo.Cartridges.Devel.json b/flatpak/page.kramo.Cartridges.Devel.json similarity index 99% rename from flatpak/hu.kramo.Cartridges.Devel.json rename to flatpak/page.kramo.Cartridges.Devel.json index 2173f4d..1354e60 100644 --- a/flatpak/hu.kramo.Cartridges.Devel.json +++ b/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", diff --git a/meson.build b/meson.build index af92db4..0501e91 100644 --- a/meson.build +++ b/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() diff --git a/search-provider/meson.build b/search-provider/meson.build index fc19c87..4e11b93 100644 --- a/search-provider/meson.build +++ b/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 -) \ No newline at end of file +) diff --git a/search-provider/hu.kramo.Cartridges.SearchProvider.ini b/search-provider/page.kramo.Cartridges.SearchProvider.ini similarity index 100% rename from search-provider/hu.kramo.Cartridges.SearchProvider.ini rename to search-provider/page.kramo.Cartridges.SearchProvider.ini diff --git a/search-provider/hu.kramo.Cartridges.SearchProvider.service.in b/search-provider/page.kramo.Cartridges.SearchProvider.service.in similarity index 100% rename from search-provider/hu.kramo.Cartridges.SearchProvider.service.in rename to search-provider/page.kramo.Cartridges.SearchProvider.service.in