Cleanup NativeUtil

app/desktop/src/commonMain/kotlin/ConfigFile.kt

@@ -8,40 +8,13 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
 import kotlinx.serialization.json.encodeToStream
-import java.nio.file.Path
 import java.nio.file.StandardOpenOption
 import kotlin.io.path.*
 
-val windowsAppDataFolder: String? by lazy {
-    runCatching { getAppDataRoaming() }
-        .onFailure(Throwable::printStackTrace)
-        .getOrNull()
-}
-
 @Serializable
 data class Config(@EncodeDefault(EncodeDefault.Mode.NEVER) val sessionToken: String? = null)
 
-fun getAppDataFolder(): Path {
-    val os = System.getProperty("os.name")
-    val basePath = when {
-        os.contains("windows", ignoreCase = true) -> {
-            val uwpFolder = windowsAppDataFolder
-            if (uwpFolder == null) {
-                Path(System.getenv("APPDATA"))
-            } else {
-                Path(uwpFolder)
-            }
-        }
-
-        os.contains("mac", ignoreCase = true) ->
-            Path(System.getenv("HOME")) / "Library" / "Application Support"
-
-        else -> Path(System.getProperty("user.home"))
-    }
-    return basePath / "Tonbrett"
-}
-
-fun getConfigFile() = getAppDataFolder() / "config.json"
+fun getConfigFile() = getAppDataRoaming() / "config.json"
 
 fun getConfig(): Config {
     val file = getConfigFile()

app/desktop/src/commonMain/kotlin/NativeUtil.kt

@@ -1,6 +1,7 @@
 package dev.schlaubi.tonbrett.app.desktop
 
 import java.net.URI
+import java.nio.file.Path
 
 /**
  * Tries to launch the URI using the UWP `Launcher`.
@@ -14,4 +15,4 @@ expect fun launchUri(uri: URI)
  *
  * @return the absolute path to the folder
  */
-expect fun getAppDataRoaming(): String
+expect fun getAppDataRoaming(): Path

app/desktop/src/nonWindowsMain/kotlin/NativeUtil.kt

@@ -2,6 +2,9 @@ package dev.schlaubi.tonbrett.app.desktop
 
 import java.awt.Desktop
 import java.net.URI
+import java.nio.file.Path
+import kotlin.io.path.Path
+import kotlin.io.path.div
 
 actual fun launchUri(uri: URI) {
     val desktop = Desktop.getDesktop()
@@ -12,5 +15,13 @@ actual fun launchUri(uri: URI) {
     }
 }
 
-actual fun getAppDataRoaming(): String =
-    throw UnsupportedOperationException("This function is only supported on Windows")
+actual fun getAppDataRoaming(): Path {
+    val os = System.getProperty("os.name")
+    val basePath = when {
+        os.contains("windows", ignoreCase = true) -> Path(System.getenv("APPDATA"))
+        os.contains("mac", ignoreCase = true) ->
+            Path(System.getenv("HOME")) / "Library" / "Application Support"
+        else -> Path(System.getProperty("user.home"))
+    }
+    return basePath / "Tonbrett"
+}

app/desktop/src/windowsMain/kotlin/NativeUtil.kt

@@ -4,13 +4,14 @@ import dev.schlaubi.tonbrett.app.desktop.uwp_helper.AppDataRoamingResult
 import dev.schlaubi.tonbrett.app.desktop.uwp_helper.UwpHelper.*
 import java.lang.foreign.Arena
 import java.net.URI
+import java.nio.file.Path
 
 actual fun launchUri(uri: URI): Unit = Arena.openConfined().use { arena ->
     val url = arena.allocateUtf8String(uri.toString())
     launch_uri(url)
 }
 
-actual fun getAppDataRoaming(): String =
+actual fun getAppDataRoaming(): Path =
     Arena.openConfined().use { arena ->
         val result = get_app_data_roaming(arena)
         val isError = AppDataRoamingResult.`is_error$get`(result)
@@ -23,5 +24,5 @@ actual fun getAppDataRoaming(): String =
             charArray[index] = short.toInt().toChar()
         }
         val string = String(charArray)
-        if (isError) throw Exception(string) else string
+        if (isError) throw Exception(string) else Path(string)
     }