From 0193a7893465191114ced0395ecdd4308c245c75 Mon Sep 17 00:00:00 2001
From: kaitouctr <52998298+kaitouctr@users.noreply.github.com>
Date: Fri, 15 Nov 2024 22:50:03 +1100
Subject: [PATCH] Added AppStream file, using rDNS name, and simplified yaml

---
 .github/workflows/ubuntu.yaml                 | 30 ++++++++++---------
 ...github.admiral_fish.pokefinder.appdata.xml | 18 +++++++++++
 ...io.github.admiral_fish.pokefinder.desktop} |  2 +-
 3 files changed, 35 insertions(+), 15 deletions(-)
 create mode 100644 Source/Form/io.github.admiral_fish.pokefinder.appdata.xml
 rename Source/Form/{PokeFinder.desktop => io.github.admiral_fish.pokefinder.desktop} (81%)

diff --git a/.github/workflows/ubuntu.yaml b/.github/workflows/ubuntu.yaml
index d58c427c..f8a006ce 100644
--- a/.github/workflows/ubuntu.yaml
+++ b/.github/workflows/ubuntu.yaml
@@ -40,6 +40,7 @@ jobs:
           mkdir upload
           mv build/Source/PokeFinder .
           tar czf PokeFinder-linux.tar.gz PokeFinder
+      
       - uses: actions/upload-artifact@v4
         with:
           name: PokeFinder-linux
@@ -47,6 +48,7 @@ jobs:
       
       - name: Fetch AppImage tools
         run: |
+          sudo apt install appstream
           sudo apt install libfuse2
           wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
           wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
@@ -54,20 +56,20 @@ jobs:
       
       - name: Build AppImage
         run: |
-          mkdir -p AppDir/usr/bin AppDir/usr/share/applications \
-            AppDir/usr/share/icons/hicolor/16x16/apps \
-            AppDir/usr/share/icons/hicolor/24x24/apps \
-            AppDir/usr/share/icons/hicolor/32x32/apps \
-            AppDir/usr/share/icons/hicolor/48x48/apps \
-            AppDir/usr/share/icons/hicolor/256x256/apps
-          cp PokeFinder AppDir/usr/bin/
-          cp Source/Form/PokeFinder.desktop AppDir/usr/share/applications/
-          cp Source/Form/Images/Icon/pokefinder_16x16.png AppDir/usr/share/icons/hicolor/16x16/apps/pokefinder.png
-          cp Source/Form/Images/Icon/pokefinder_24x24.png AppDir/usr/share/icons/hicolor/24x24/apps/pokefinder.png
-          cp Source/Form/Images/Icon/pokefinder_32x32.png AppDir/usr/share/icons/hicolor/32x32/apps/pokefinder.png
-          cp Source/Form/Images/Icon/pokefinder_48x48.png AppDir/usr/share/icons/hicolor/48x48/apps/pokefinder.png
-          cp Source/Form/Images/Icon/pokefinder_256x256.png AppDir/usr/share/icons/hicolor/256x256/apps/pokefinder.png
-          QMAKE=$QT_ROOT_DIR/bin/qmake ./linuxdeploy-x86_64.AppImage --appdir AppDir --plugin qt --output appimage
+          export QMAKE=$QT_ROOT_DIR/bin/qmake
+          ./linuxdeploy-x86_64.AppImage --appdir AppDir --plugin qt \
+            -e PokeFinder \
+            -d Source/Form/io.github.admiral_fish.pokefinder.desktop \
+            -i Source/Form/Images/Icon/pokefinder_16x16.png \
+            -i Source/Form/Images/Icon/pokefinder_24x24.png \
+            -i Source/Form/Images/Icon/pokefinder_32x32.png \
+            -i Source/Form/Images/Icon/pokefinder_48x48.png \
+            -i Source/Form/Images/Icon/pokefinder_256x256.png \
+            --icon-filename io.github.admiral_fish.pokefinder
+          mkdir AppDir/usr/share/metainfo
+          cp Source/Form/io.github.admiral_fish.pokefinder.appdata.xml AppDir/usr/share/metainfo/
+          ./linuxdeploy-x86_64.AppImage --appdir AppDir --output appimage
+      
       - uses: actions/upload-artifact@v4
         with:
           name: PokeFinder-linux-appimage
diff --git a/Source/Form/io.github.admiral_fish.pokefinder.appdata.xml b/Source/Form/io.github.admiral_fish.pokefinder.appdata.xml
new file mode 100644
index 00000000..a1fe5a57
--- /dev/null
+++ b/Source/Form/io.github.admiral_fish.pokefinder.appdata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+    <id>io.github.admiral_fish.pokefinder</id>
+
+    <name>PokéFinder</name>
+    <summary>Cross platform Pokémon RNG tool </summary>
+
+    <metadata_license>CC-BY-SA-4.0</metadata_license>
+    <project_license>GPL-3.0-or-later</project_license>
+
+    <description>
+        <p>
+            This will be a RNG Tool for all main Pokémon games generations 3-8. It currently supports generations 3/4 and parts of generation 5/8.
+        </p>
+    </description>
+
+    <launchable type="desktop-id">io.github.admiral_fish.pokefinder.desktop</launchable>
+</component>
diff --git a/Source/Form/PokeFinder.desktop b/Source/Form/io.github.admiral_fish.pokefinder.desktop
similarity index 81%
rename from Source/Form/PokeFinder.desktop
rename to Source/Form/io.github.admiral_fish.pokefinder.desktop
index 32ffe01f..33a00ef8 100644
--- a/Source/Form/PokeFinder.desktop
+++ b/Source/Form/io.github.admiral_fish.pokefinder.desktop
@@ -5,5 +5,5 @@ Exec=PokeFinder %f
 Type=Application
 Categories=Game;Utility;
 Terminal=false
-Icon=pokefinder
+Icon=io.github.admiral_fish.pokefinder
 Keywords=pokemon;RNG;tool;
\ No newline at end of file