Separate log files according to XDG spec and macOS dir names

JetBrains · Mar 24, 2024 · 7fcc96a · 7fcc96a
1 parent 29ae1d2
commit 7fcc96a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/skiko/src/awtMain/kotlin/org/jetbrains/skiko/RenderExceptionsHandler.kt b/skiko/src/awtMain/kotlin/org/jetbrains/skiko/RenderExceptionsHandler.kt
@@ -12,7 +12,7 @@ internal class RenderExceptionsHandler {
         fun throwException(message: String) {
             if (output == null) {
                 output = File(
-                    "${SkikoProperties.dataPath}/skiko-render-exception-${ProcessHandle.current().pid()}.log"
+                    "${SkikoProperties.logPath}/skiko-render-exception-${ProcessHandle.current().pid()}.log"
                 )
             }
             val exception = RenderException(message)

diff --git a/skiko/src/jvmMain/kotlin/org/jetbrains/skiko/SkikoProperties.kt b/skiko/src/jvmMain/kotlin/org/jetbrains/skiko/SkikoProperties.kt
@@ -29,9 +29,7 @@ object SkikoProperties {
     /**
      * The path where to store data files.
      *
-     * It is used for extracting the Skiko binaries (if `libraryPath` isn't null) and logging.
-     *
-     * TODO: Use $XDG_STATE_HOME (Unix) / ~/Library/Logs (macOS) for logging instead?
+     * It is used for extracting the Skiko binaries (if `libraryPath` isn't null).
      */
     val dataPath: String get() {
         return getProperty("skiko.data.path") ?: when (hostOs) {
@@ -47,6 +45,23 @@ object SkikoProperties {
         }
     }
 
+    /**
+     * The path where to store log files.
+     */
+    val logPath: String get() {
+        return getProperty("skiko.data.path") ?: when (hostOs) {
+            OS.Windows -> "${getenv("LOCALAPPDATA")}/Skiko"
+            OS.MacOS, OS.Ios -> "${getProperty("user.home")}/Library/Logs/Skiko"
+            else -> {
+                var dataHome = getenv("XDG_STATE_HOME")
+                if (dataHome == null || !dataHome.startsWith('/')) {
+                    dataHome = "${getProperty("user.home")}/.local/state"
+                }
+                return "${dataHome}/skiko"
+            }
+        }
+    }
+
     val vsyncEnabled: Boolean get() = getProperty("skiko.vsync.enabled")?.toBoolean() ?: true
 
     /**