From 9a578e54a89f87c82ff811bb04257c9b641b199a Mon Sep 17 00:00:00 2001
From: FoxxMD <FoxxMD@users.noreply.github.com>
Date: Thu, 23 Mar 2023 16:03:43 -0400
Subject: [PATCH] Fix app id and other issues from review in flathub PR

https://github.com/flathub/flathub/pull/4002
---
 ...> io.github.foxxmd.multiscrobbler.desktop} |  4 ++--
 ...github.foxxmd.multiscrobbler.metainfo.xml} |  9 ++++++---
 ...ml => io.github.foxxmd.multiscrobbler.yml} | 19 ++++++-------------
 3 files changed, 14 insertions(+), 18 deletions(-)
 rename flatpak/{io.github.multiscrobbler.desktop => io.github.foxxmd.multiscrobbler.desktop} (73%)
 rename flatpak/{io.github.multiscrobbler.metainfo.xml => io.github.foxxmd.multiscrobbler.metainfo.xml} (85%)
 rename flatpak/{io.github.multiscrobbler.yml => io.github.foxxmd.multiscrobbler.yml} (88%)

diff --git a/flatpak/io.github.multiscrobbler.desktop b/flatpak/io.github.foxxmd.multiscrobbler.desktop
similarity index 73%
rename from flatpak/io.github.multiscrobbler.desktop
rename to flatpak/io.github.foxxmd.multiscrobbler.desktop
index 635e15d0..12e4635c 100644
--- a/flatpak/io.github.multiscrobbler.desktop
+++ b/flatpak/io.github.foxxmd.multiscrobbler.desktop
@@ -2,9 +2,9 @@
 Type=Application
 Name=multi-scrobbler
 Comment=Scrobbles music from multiple sources to multiple clients
-Icon=io.github.multiscrobbler
+Icon=io.github.foxxmd.multiscrobbler
 TryExec=multiscrobbler
 Exec=multiscrobbler
 Terminal=true
 Categories=Utility;Music;ConsoleOnly;
-X-Flatpak=io.github.multiscrobbler
+X-Flatpak=io.github.foxxmd.multiscrobbler
diff --git a/flatpak/io.github.multiscrobbler.metainfo.xml b/flatpak/io.github.foxxmd.multiscrobbler.metainfo.xml
similarity index 85%
rename from flatpak/io.github.multiscrobbler.metainfo.xml
rename to flatpak/io.github.foxxmd.multiscrobbler.metainfo.xml
index 5c2ca010..b70bda70 100644
--- a/flatpak/io.github.multiscrobbler.metainfo.xml
+++ b/flatpak/io.github.foxxmd.multiscrobbler.metainfo.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="console-application">
-    <id>io.github.multiscrobbler</id>
+    <id>io.github.foxxmd.multiscrobbler</id>
     <provides>
-        <id>io.github.multiscrobbler.desktop</id>
+        <id>io.github.foxxmd.multiscrobbler.desktop</id>
     </provides>
-    <launchable type="desktop-id">io.github.multiscrobbler.desktop</launchable>
+    <launchable type="desktop-id">io.github.foxxmd.multiscrobbler.desktop</launchable>
     <name>multi-scrobbler</name>
     <summary>Scrobbles music from many sources to many clients</summary>
     <url type="homepage">https://github.com/FoxxMD/multi-scrobbler</url>
@@ -48,4 +48,7 @@
         <category>Music</category>
         <category>ConsoleOnly</category>
     </categories>
+    <content_rating type="oars-1.0">
+        <content_attribute id="language-profanity">mild</content_attribute>
+    </content_rating>
 </component>
diff --git a/flatpak/io.github.multiscrobbler.yml b/flatpak/io.github.foxxmd.multiscrobbler.yml
similarity index 88%
rename from flatpak/io.github.multiscrobbler.yml
rename to flatpak/io.github.foxxmd.multiscrobbler.yml
index 8452e694..6c2a2eb4 100644
--- a/flatpak/io.github.multiscrobbler.yml
+++ b/flatpak/io.github.foxxmd.multiscrobbler.yml
@@ -1,4 +1,4 @@
-app-id: io.github.multiscrobbler
+app-id: io.github.foxxmd.multiscrobbler
 runtime: org.freedesktop.Platform
 runtime-version: '22.08'
 sdk: org.freedesktop.Sdk
@@ -53,16 +53,9 @@ modules:
       - install -Dm755 ../run.sh /app/bin/multiscrobbler
     subdir: main
     sources:
-#      - type: git
-#        url: https://github.com/FoxxMD/multi-scrobbler
-#        tag: 0.4.4
-#        dest: main
-      - type: dir
-        path: '..'
-        skip:
-          - '.flatpak-builder'
-          - 'node_modules'
-          - 'logs'
+      - type: git
+        url: https://github.com/FoxxMD/multi-scrobbler
+        commit: ffc826f04de9fe9d9e31bd1b89a4a05fff2699b6
         dest: main
       # Wrapper to launch the app
       - type: script
@@ -85,8 +78,8 @@ modules:
       - type: file
         path: icon.png
       - type: file
-        path: io.github.multiscrobbler.desktop
+        path: io.github.foxxmd.multiscrobbler.desktop
       # not a desktop app (for now) so don't include this
       - type: file
-        path: io.github.multiscrobbler.metainfo.xml
+        path: io.github.foxxmd.multiscrobbler.metainfo.xml
       - generated-sources.json
-- 
2.51.2