Adopt ARK storage for versions

app/src/main/java/dev/arkbuilders/arkmemo/models/VersionsResult.kt

@@ -1,6 +1,7 @@
 package dev.arkbuilders.arkmemo.models
 
 import dev.arkbuilders.arklib.ResourceId
+import dev.arkbuilders.arkmemo.repo.versions.Version
 
 data class VersionsResult (
     val versions: List<Version>,

app/src/main/java/dev/arkbuilders/arkmemo/repo/versions/PlainVersionStorage.kt → app/src/main/java/dev/arkbuilders/arkmemo/repo/versions/RootVersionStorage.kt

@@ -5,15 +5,14 @@ import dev.arkbuilders.arklib.ResourceId
 import dev.arkbuilders.arklib.arkFolder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import dev.arkbuilders.arkmemo.models.Version
 import dev.arkbuilders.arkmemo.models.VersionsResult
 import space.taran.arkmemo.utils.arkVersions
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.attribute.FileTime
 import kotlin.io.path.writeLines
 
-class PlainVersionStorage(private val root: Path): VersionStorage {
+class RootVersionStorage(private val root: Path): VersionStorage {
 
     private val storageFile = root.arkFolder().arkVersions()
     private var lastModified = FileTime.fromMillis(0L)

app/src/main/java/dev/arkbuilders/arkmemo/repo/versions/RootVersionsStorage.kt

@@ -0,0 +1,23 @@
+package dev.arkbuilders.arkmemo.repo.versions
+
+import dev.arkbuilders.arklib.ResourceId
+import dev.arkbuilders.arklib.arkFolder
+import dev.arkbuilders.arklib.data.storage.FileStorage
+import kotlinx.coroutines.CoroutineScope
+import space.taran.arkmemo.utils.arkVersions
+import java.nio.file.Path
+
+class RootVersionsStorage(
+    private val scope: CoroutineScope,
+    private val root: Path
+):
+    FileStorage<Versions>("versions", scope, root.arkFolder().arkVersions(), VersionsMonoid),
+    VersionsStorage {
+
+    override fun valueFromString(raw: String): Versions =
+        raw.split(",").filter { it.isNotEmpty() }.map {
+            ResourceId.fromString(it)
+        }.toSet()
+
+    override fun valueToString(value: Versions): String = value.joinToString(",")
+}

app/src/main/java/dev/arkbuilders/arkmemo/models/Version.kt → app/src/main/java/dev/arkbuilders/arkmemo/repo/versions/Version.kt

@@ -1,7 +1,9 @@
-package dev.arkbuilders.arkmemo.models
+package dev.arkbuilders.arkmemo.repo.versions
 
 import dev.arkbuilders.arklib.ResourceId
 
+typealias Version2 = ResourceId
+
 data class Version(
     val parent: ResourceId,
     val child: ResourceId

app/src/main/java/dev/arkbuilders/arkmemo/repo/versions/VersionStorage.kt

@@ -1,9 +1,10 @@
 package dev.arkbuilders.arkmemo.repo.versions
 
 import dev.arkbuilders.arklib.ResourceId
-import dev.arkbuilders.arkmemo.models.Version
+import dev.arkbuilders.arklib.data.storage.Storage
+
+interface VersionStorage: Storage<Version2> {
 
-interface VersionStorage {
     suspend fun add(version: Version)
 
     suspend fun forget(id: ResourceId)
@@ -19,6 +20,4 @@ interface VersionStorage {
     fun childrenNotParents(): List<ResourceId>
 
     fun isLatestResourceVersion(id: ResourceId): Boolean
-
-    suspend fun persist()
 }

app/src/main/java/dev/arkbuilders/arkmemo/repo/versions/VersionStorageRepo.kt

@@ -8,12 +8,12 @@ class VersionStorageRepo @Inject constructor(
     private val memoPreferences: MemoPreferences
 ) {
 
-    private val storageByRoot = mutableMapOf<Path, PlainVersionStorage>()
+    private val storageByRoot = mutableMapOf<Path, RootVersionStorage>()
 
     suspend fun provide(): VersionStorage {
         val root = memoPreferences.getNotesStorage()
         if (storageByRoot[root] == null) {
-            val versionStorage = PlainVersionStorage(root)
+            val versionStorage = RootVersionStorage(root)
             versionStorage.init()
             storageByRoot[root] = versionStorage
         }

app/src/main/java/dev/arkbuilders/arkmemo/repo/versions/Versions.kt

@@ -0,0 +1,20 @@
+package dev.arkbuilders.arkmemo.repo.versions
+
+import android.util.Log
+import dev.arkbuilders.arklib.ResourceId
+import dev.arkbuilders.arklib.data.storage.Monoid
+
+typealias Versions = Set<ResourceId>
+
+object VersionsMonoid : Monoid<Versions> {
+
+    override val neutral: Versions = setOf()
+
+    override fun combine(a: Versions, b: Versions): Versions {
+        val result = a.union(b)
+        Log.d(LOG_PREFIX, "merging $a and $b into $result")
+        return result
+    }
+}
+
+internal val LOG_PREFIX: String = "[versions]"

app/src/main/java/dev/arkbuilders/arkmemo/repo/versions/VersionsStorage.kt

@@ -0,0 +1,15 @@
+package dev.arkbuilders.arkmemo.repo.versions
+
+import dev.arkbuilders.arklib.ResourceId
+import dev.arkbuilders.arklib.data.storage.Storage
+
+interface VersionsStorage: Storage<Versions> {
+
+    fun setParents(child: ResourceId, parents: Versions) = setValue(child, parents)
+
+    fun getParents(child: ResourceId): Versions = getValue(child)
+
+    fun removeParents(child: ResourceId) {
+        remove(child)
+    }
+}

app/src/main/java/dev/arkbuilders/arkmemo/repo/versions/VersionsStorageRepo.kt

@@ -0,0 +1,4 @@
+package dev.arkbuilders.arkmemo.repo.versions
+
+class VersionsStorageRepo {
+}

app/src/main/java/dev/arkbuilders/arkmemo/ui/viewmodels/VersionsViewModel.kt

@@ -1,6 +1,5 @@
 package dev.arkbuilders.arkmemo.ui.viewmodels
 
-import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -10,7 +9,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
-import dev.arkbuilders.arkmemo.models.Version
+import dev.arkbuilders.arkmemo.repo.versions.Version
 import dev.arkbuilders.arkmemo.repo.versions.VersionStorage
 import dev.arkbuilders.arkmemo.repo.versions.VersionStorageRepo
 import javax.inject.Inject

app/src/test/java/dev/arkbuilders/arkmemo/VersionStorageTest.kt

@@ -1,16 +1,16 @@
 package space.taran.arkmemo
 
 import space.taran.arklib.ResourceId
-import dev.arkbuilders.arkmemo.models.Version
-import dev.arkbuilders.arkmemo.repo.versions.PlainVersionStorage
+import dev.arkbuilders.arkmemo.repo.versions.Version
+import dev.arkbuilders.arkmemo.repo.versions.RootVersionStorage
 import org.junit.Test
 import org.junit.Assert.*
 import java.io.File
 
 
 class VersionStorageTest {
     private val path = File(ROOT_PATH).toPath()
-    private val versionStorage = PlainVersionStorage(path)
+    private val versionStorage = RootVersionStorage(path)
 
     @Test
     fun versions_size_is_correct() {