fix db file path on desktop

Author: softartdev

desktop-compose-app/build.gradle.kts

@@ -5,7 +5,6 @@ plugins {
     alias(libs.plugins.compose)
 }
 group = "com.softartdev"
-version = "1.0"
 
 kotlin {
     jvm {
@@ -45,7 +44,7 @@ compose {
             nativeDistributions {
                 targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
                 packageName = "Note Delight"
-                packageVersion = "1.1.3"
+                packageVersion = "1.1.4"
                 description = "Note app with encryption"
                 copyright = "© 2023 SoftArtDev"
                 macOS.iconFile.set(project.file("src/jvmMain/resources/app_icon.icns"))

gradle/libs.versions.toml

@@ -4,7 +4,7 @@ targetSdk = "34"
 minSdk = "21"
 
 kotlin = "1.9.21"
-agp = "8.1.4"
+agp = "8.2.0"
 gms = "4.3.15"
 crashlytics = "2.9.8"
 compose = "1.5.11"
@@ -41,6 +41,7 @@ mockito = "5.2.0"
 turbine = "1.0.0"
 espresso = "3.5.1"
 desugar = "2.0.4"
+appdirs = "1.2.2"
 
 [libraries]
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
@@ -124,6 +125,8 @@ mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockito
 
 turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" }
 
+appdirs = { module = "net.harawata:appdirs", version.ref = "appdirs" }
+
 espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
 espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "espresso" }
 espresso-idling-resource = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "espresso" }

shared/build.gradle.kts

@@ -113,6 +113,7 @@ kotlin {
         }
         jvmMain.dependencies {
             implementation(libs.sqlDelight.jvm)
+            implementation(libs.appdirs)
         }
         jvmTest.dependencies {
             implementation(kotlin("test"))

shared/src/jvmMain/kotlin/com/softartdev/notedelight/shared/db/FilePathResolver.kt

@@ -0,0 +1,24 @@
+package com.softartdev.notedelight.shared.db
+
+import com.softartdev.notedelight.MR
+import dev.icerock.moko.resources.desc.desc
+import net.harawata.appdirs.AppDirs
+import net.harawata.appdirs.AppDirsFactory
+import java.io.File
+
+class FilePathResolver(
+    private val appDirs: AppDirs = AppDirsFactory.getInstance(),
+    private val appName: String = MR.strings.app_name.desc().localized(),
+    private val testMode: Boolean = false
+) : () -> String {
+
+    override fun invoke(): String {
+        val dirPath: String = appDirs.getUserDataDir(appName, null, null)
+        val dir = File(dirPath)
+        if (!dir.exists() && !testMode) {
+            dir.mkdirs()
+        }
+        val file = File(dir, SafeRepo.DB_NAME)
+        return file.absolutePath
+    }
+}

shared/src/jvmMain/kotlin/com/softartdev/notedelight/shared/db/JdbcDatabaseHolder.kt

@@ -7,7 +7,7 @@ import java.util.Properties
 
 class JdbcDatabaseHolder(props: Properties = Properties()) : DatabaseHolder() {
     override val driver = JdbcSqliteDriver(
-        url = JdbcSqliteDriver.IN_MEMORY + SafeRepo.DB_NAME, // jdbc:sqlite:notes.db
+        url = JdbcSqliteDriver.IN_MEMORY + FilePathResolver().invoke(),// jdbc:sqlite:/.../notes.db
         properties = props
     )
     override val noteDb: NoteDb = createQueryWrapper(driver)

shared/src/jvmTest/kotlin/com/softartdev/notedelight/shared/db/FilePathResolverTest.kt

@@ -0,0 +1,38 @@
+package com.softartdev.notedelight.shared.db
+
+import com.softartdev.notedelight.MR
+import dev.icerock.moko.resources.desc.desc
+import net.harawata.appdirs.impl.MacOSXAppDirs
+import net.harawata.appdirs.impl.UnixAppDirs
+import net.harawata.appdirs.impl.WindowsAppDirs
+import net.harawata.appdirs.impl.WindowsFolderResolver
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class FilePathResolverTest : WindowsFolderResolver {
+    private val home = System.getProperty("user.home")
+    private val appName = MR.strings.app_name.desc().localized()
+
+    @Test
+    fun macOSXAppDirs() = assertEquals(
+        expected = "$home/Library/Application Support/$appName/${SafeRepo.DB_NAME}",
+        actual = FilePathResolver(MacOSXAppDirs(), testMode = true).invoke()
+    )
+
+    @Test
+    fun windowsAppDirs() = assertEquals(
+        expected = "$home/AppData/Local/$appName/${SafeRepo.DB_NAME}",
+        actual = FilePathResolver(WindowsAppDirs(this), testMode = true).invoke()
+    )
+
+    @Test
+    fun unixAppDirs() = assertEquals(
+        expected = "$home/.local/share/$appName/${SafeRepo.DB_NAME}",
+        actual = FilePathResolver(UnixAppDirs(), testMode = true).invoke()
+    )
+
+    override fun resolveFolder(folderId: WindowsAppDirs.FolderId?): String = when (folderId) {
+        WindowsAppDirs.FolderId.LOCAL_APPDATA -> "$home/AppData/Local"
+        else -> error("Unsupported folder ID: $folderId")
+    }
+}