From 8510111cdcf34f426350571250ae57995107618a Mon Sep 17 00:00:00 2001
From: Talo Halton <talohalton@gmail.com>
Date: Sat, 4 May 2024 12:50:30 +0100
Subject: [PATCH] Add --icon option, make icon.png square

---
 icon.png                                      | Bin 5914 -> 1955 bytes
 .../indicator/TrayIndicatorImpl.kt.linux      |   9 +++++++--
 .../strings/ServerLocalisation.kt             |   1 +
 .../strings/ServerLocalisationEn.kt           |   1 +
 .../strings/ServerLocalisationJa.kt           |   1 +
 .../kotlin/spms/server/SpMsCommand.kt         |  15 +++++++++++----
 6 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/icon.png b/icon.png
index e14d336e6f66e37888ed15c8248c34b4bf191105..52f0075a5c55832b51569cc194be411ae568777c 100644
GIT binary patch
delta 1954
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

literal 5914
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
VC@IUG1Af&|48NtmKYPc1_itPS+VTJZ

diff --git a/src/commonMain/kotlin/cinterop/indicator/TrayIndicatorImpl.kt.linux b/src/commonMain/kotlin/cinterop/indicator/TrayIndicatorImpl.kt.linux
index 6ba4ac6..494416e 100644
--- a/src/commonMain/kotlin/cinterop/indicator/TrayIndicatorImpl.kt.linux
+++ b/src/commonMain/kotlin/cinterop/indicator/TrayIndicatorImpl.kt.linux
@@ -118,10 +118,15 @@ class TrayIndicatorImpl(name: String, icon_path: List<String>): TrayIndicator {
         app_indicator_set_status(indicator, AppIndicatorStatus.APP_INDICATOR_STATUS_ACTIVE)
 
         val path: MutableList<String> = icon_path.toMutableList()
-        val icon_file: String = path.removeLast().split('.', limit = 2).first()
+
+        var filename: String = path.removeLast()
+        val last_dot: Int = filename.lastIndexOf('.')
+        if (last_dot != -1) {
+            filename = filename.substring(0, last_dot)
+        }
 
         app_indicator_set_icon_theme_path(indicator, '/' + path.joinToString("/"))
-        app_indicator_set_icon_full(indicator, icon_file, name)
+        app_indicator_set_icon_full(indicator, filename, name)
 
         menu = gtk_menu_new()!!
 
diff --git a/src/commonMain/kotlin/spms/localisation/strings/ServerLocalisation.kt b/src/commonMain/kotlin/spms/localisation/strings/ServerLocalisation.kt
index e5f165f..5c2ca06 100644
--- a/src/commonMain/kotlin/spms/localisation/strings/ServerLocalisation.kt
+++ b/src/commonMain/kotlin/spms/localisation/strings/ServerLocalisation.kt
@@ -10,6 +10,7 @@ interface ServerLocalisation {
     val option_help_gui: String
     val option_help_mute: String
     val option_help_headless: String
+    val option_help_icon: String
 
     val indicator_button_open_client: String
     val indicator_button_stop_server: String
diff --git a/src/commonMain/kotlin/spms/localisation/strings/ServerLocalisationEn.kt b/src/commonMain/kotlin/spms/localisation/strings/ServerLocalisationEn.kt
index 8b12239..0f76e3c 100644
--- a/src/commonMain/kotlin/spms/localisation/strings/ServerLocalisationEn.kt
+++ b/src/commonMain/kotlin/spms/localisation/strings/ServerLocalisationEn.kt
@@ -11,6 +11,7 @@ class ServerLocalisationEn: ServerLocalisation {
     override val option_help_gui: String = "Show mpv's graphical interface"
     override val option_help_mute: String = "Mute player on startup"
     override val option_help_headless: String = "Run without mpv"
+    override val option_help_icon: String = "Path to icon"
 
     override val indicator_button_open_client: String = "Open client"
     override val indicator_button_stop_server: String = "Stop"
diff --git a/src/commonMain/kotlin/spms/localisation/strings/ServerLocalisationJa.kt b/src/commonMain/kotlin/spms/localisation/strings/ServerLocalisationJa.kt
index 82a2d17..7dc190e 100644
--- a/src/commonMain/kotlin/spms/localisation/strings/ServerLocalisationJa.kt
+++ b/src/commonMain/kotlin/spms/localisation/strings/ServerLocalisationJa.kt
@@ -11,6 +11,7 @@ class ServerLocalisationJa: ServerLocalisation {
     override val option_help_gui: String = "mpvのグラフィカルインタフェースを表示"
     override val option_help_mute: String = "実行時にプレイヤーをミュートする"
     override val option_help_headless: String = "mpvプレイヤーなしで実行"
+    override val option_help_icon: String = "アイコンへのパス"
 
     override val indicator_button_open_client: String = "クライアントを開く"
     override val indicator_button_stop_server: String = "終了"
diff --git a/src/commonMain/kotlin/spms/server/SpMsCommand.kt b/src/commonMain/kotlin/spms/server/SpMsCommand.kt
index 622f7e6..b132fc2 100644
--- a/src/commonMain/kotlin/spms/server/SpMsCommand.kt
+++ b/src/commonMain/kotlin/spms/server/SpMsCommand.kt
@@ -38,15 +38,21 @@ private const val CLIENT_REPLY_TIMEOUT_MS: Long = 10000
 
 @Suppress("OPT_IN_USAGE")
 @OptIn(ExperimentalForeignApi::class)
-fun createIndicator(coroutine_scope: CoroutineScope, loc: SpMsLocalisation, port: Int, endProgram: () -> Unit): TrayIndicator? {
+fun createIndicator(
+    coroutine_scope: CoroutineScope,
+    loc: SpMsLocalisation,
+    port: Int,
+    user_icon_path: String?,
+    endProgram: () -> Unit
+): TrayIndicator? {
     val icon_path: Path =
-        when (Platform.osFamily) {
+        user_icon_path?.toPath() ?: when (Platform.osFamily) {
             OsFamily.LINUX -> "/tmp/ic_spmp.png".toPath()
             OsFamily.WINDOWS -> "${getenv("USERPROFILE")!!.toKString()}/AppData/Local/Temp/ic_spmp.png".toPath()
             else -> throw NotImplementedError(Platform.osFamily.name)
         }
 
-    if (!FileSystem.SYSTEM.exists(icon_path)) {
+    if (user_icon_path == null && !FileSystem.SYSTEM.exists(icon_path)) {
         val parent: Path = icon_path.parent!!
         if (!FileSystem.SYSTEM.exists(parent)) {
             FileSystem.SYSTEM.createDirectories(parent, true)
@@ -98,6 +104,7 @@ class SpMsCommand: Command(
 ) {
     private val port: Int by option("-p", "--port").int().default(SPMS_DEFAULT_PORT).help { context.loc.server.option_help_port }
     private val headless: Boolean by option("-x", "--headless").flag().help { context.loc.server.option_help_headless }
+    private val icon_path: String? by option("-i", "--icon").help { context.loc.server.option_help_icon }
     private val player_options: PlayerOptions by PlayerOptions()
 
     override fun run() {
@@ -125,7 +132,7 @@ class SpMsCommand: Command(
 
             runBlocking {
                 try {
-                    val indicator: TrayIndicator? = createIndicator(this, localisation, port) {
+                    val indicator: TrayIndicator? = createIndicator(this, localisation, port, icon_path) {
                         stop = true
                     }