Improve desktop integration

4 files changed, 26 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c76cdcec39f1..ab202b2740a7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = osu
 	pkgdesc = A free-to-win rhythm game
 	pkgver = 20220101.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://osu.ppy.sh
 	arch = i686
 	arch = x86_64
@@ -21,7 +21,7 @@ pkgbase = osu
 	sha256sums = bd333075443f22e018b372d7bc1e71606270e7a9d42dea2a7f454aea1a4058a1
 	sha256sums = d1768c68f6011c470c530db5d919f3643a161fce79b42bf6d8c6f6dab10253cc
 	sha256sums = 5765f6c08e946170806fa89de1a71351b4c48cd8cf61e1779f00ca71c4c7490f
-	sha256sums = 0a2bb920ba3e8ddc9aa6e1bb2321c748b6efb06189294ccdb59fb1977d7a39b5
-	sha256sums = 85a5f5468a22dad75b8e8cfad8bd0754ed5e4ece693a398de0b90ba1934ac4fe
+	sha256sums = 3d98f5811539d652bf6378c2c76bff7b6d5ac82e6322942bb287ff9082f1715b
+	sha256sums = 030fb176a43f6cc3306c48123bbdeea6643ef4d0014f369b2bb16d5772feb076
 
 pkgname = osu
diff --git a/PKGBUILD b/PKGBUILD
index fb8cc65b61b0..fcfdf936eee4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname='osu'
 pkgver='20220101.1'
-pkgrel=1
+pkgrel=2
 pkgdesc='A free-to-win rhythm game'
 _terms_commit='a5cf78c68e98280985f58725868b8df0cd2498b8'
 arch=('i686' 'x86_64')
@@ -21,12 +21,12 @@ source=("${pkgname}-installer-${pkgver}.exe::https://m1.ppy.sh/r/osu!install.exe
 sha256sums=('bd333075443f22e018b372d7bc1e71606270e7a9d42dea2a7f454aea1a4058a1'
             'd1768c68f6011c470c530db5d919f3643a161fce79b42bf6d8c6f6dab10253cc'
             '5765f6c08e946170806fa89de1a71351b4c48cd8cf61e1779f00ca71c4c7490f'
-            '0a2bb920ba3e8ddc9aa6e1bb2321c748b6efb06189294ccdb59fb1977d7a39b5'
-            '85a5f5468a22dad75b8e8cfad8bd0754ed5e4ece693a398de0b90ba1934ac4fe')
+            '3d98f5811539d652bf6378c2c76bff7b6d5ac82e6322942bb287ff9082f1715b'
+            '030fb176a43f6cc3306c48123bbdeea6643ef4d0014f369b2bb16d5772feb076')
 
 build() {
 	wrestool -x -t 3 -n 4 -R -o 'osu-stable.png' "${pkgname}-installer-${pkgver}.exe"
-	wrestool -x -t 3 -n 15 -R -o 'osu-stable-beatmap.png' "${pkgname}-installer-${pkgver}.exe"
+	wrestool -x -t 3 -n 15 -R -o 'osu-importable.png' "${pkgname}-installer-${pkgver}.exe"
 }
 
 package() {
@@ -36,5 +36,5 @@ package() {
 	install -D -m 644 "${pkgname}.xml" "${pkgdir}/usr/share/mime/packages/osu-stable.xml"
 	install -D -m 644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/sh.ppy.osu.stable.desktop"
 	install -D -m 644 'osu-stable.png' "${pkgdir}/usr/share/icons/hicolor/256x256/apps/osu-stable.png"
-	install -D -m 644 'osu-stable-beatmap.png' "${pkgdir}/usr/share/icons/hicolor/256x256/mimetypes/osu-stable-beatmap.png"
+	install -D -m 644 'osu-importable.png' "${pkgdir}/usr/share/icons/hicolor/256x256/mimetypes/application-x-osu-importable.png"
 }
diff --git a/osu.desktop b/osu.desktop
index 6754b282c9fc..08442c3c8053 100644
--- a/osu.desktop
+++ b/osu.desktop
@@ -7,5 +7,5 @@ Comment=A free-to-win rhythm game
 Icon=osu-stable
 Exec=osu-stable %F
 Terminal=false
-MimeType=application/x-osu-storyboard;application/x-osu-skin-archive;application/x-osu-replay;application/x-osu-beatmap;x-osu-beatmap-archive;
+MimeType=application/x-osu-beatmap-archive;application/x-osu-replay;application/x-osu-skin-archive;x-scheme-handler/osu;
 Categories=Game;
diff --git a/osu.xml b/osu.xml
index 999979321827..13d17b6b5fd8 100644
--- a/osu.xml
+++ b/osu.xml
@@ -2,31 +2,43 @@
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
 	<mime-type type="application/x-osu-storyboard">
 		<comment>osu! storyboard</comment>
-		<icon name="application-x-osu"/>
+		<sub-class-of type="text/plain"/>
+		<generic-icon name="text-x-generic"/>
 		<glob pattern="*.osb"/>
+		<magic priority="40">
+			<match type="string" value="[Events]" offset="0"/>
+		</magic>
 	</mime-type>
 
 	<mime-type type="application/x-osu-skin-archive">
 		<comment>osu! skin archive</comment>
-		<icon name="application-x-osu"/>
+		<sub-class-of type="application/zip"/>
+		<icon name="application-x-osu-importable"/>
+		<generic-icon name="package-x-generic"/>
 		<glob pattern="*.osk"/>
 	</mime-type>
 
 	<mime-type type="application/x-osu-replay">
 		<comment>osu! replay</comment>
-		<icon name="application-x-osu"/>
+		<icon name="application-x-osu-importable"/>
 		<glob pattern="*.osr"/>
 	</mime-type>
 
 	<mime-type type="application/x-osu-beatmap">
 		<comment>osu! beatmap</comment>
-		<icon name="application-x-osu"/>
+		<sub-class-of type="text/plain"/>
+		<generic-icon name="text-x-generic"/>
 		<glob pattern="*.osu"/>
+		<magic priority="50">
+			<match type="string" value="osu file format v" offset="0"/>
+		</magic>
 	</mime-type>
 
 	<mime-type type="application/x-osu-beatmap-archive">
 		<comment>osu! beatmap archive</comment>
-		<icon name="application-x-osu"/>
+		<sub-class-of type="application/zip"/>
+		<icon name="application-x-osu-importable"/>
+		<generic-icon name="package-x-generic"/>
 		<glob pattern="*.osz"/>
 	</mime-type>
 </mime-info>