#11: Re-implementation of version tracking

README.md

@@ -0,0 +1,3 @@
+# ARK Memo: Notes App by ARK Builders
+
+_Implementation in progress_

app/build.gradle

@@ -10,6 +10,8 @@ android {
     namespace 'dev.arkbuilders.arkmemo'
     compileSdk 33
 
+    namespace 'dev.arkbuilders.arkmemo'
+
     defaultConfig {
         applicationId "dev.arkbuilders.arkmemo"
         minSdk 26
@@ -69,13 +71,12 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_17.toString()
     }
-    buildFeatures{
+    buildFeatures {
         buildConfig true
         viewBinding true
     }
 }
 
-
 dependencies {
 
     implementation 'androidx.core:core-ktx:1.7.0'
@@ -90,19 +91,16 @@ dependencies {
     implementation 'dev.arkbuilders:arklib:0.3.3'
 
     implementation 'androidx.preference:preference:1.2.0'
-    implementation "com.google.dagger:hilt-android:2.42"
-    kapt "com.google.dagger:hilt-compiler:2.42"
-    kapt 'androidx.hilt:hilt-compiler:1.0.0'
+    implementation "com.google.dagger:hilt-android:2.57"
+    kapt "com.google.dagger:hilt-compiler:2.57"
+    kapt 'androidx.hilt:hilt-compiler:1.2.0'
 
     implementation 'com.github.kirich1409:viewbindingpropertydelegate-noreflection:1.5.6'
 
-    implementation 'com.google.code.gson:gson:2.10.1'
-
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     implementation 'ch.acra:acra-http:5.9.6'
     implementation 'ch.acra:acra-dialog:5.9.6'
-    implementation 'com.simplemobiletools:commons:5.29.20'
 }

app/src/main/java/dev/arkbuilders/arkmemo/di/RepositoryModule.kt

@@ -13,6 +13,7 @@ import dev.arkbuilders.arkmemo.models.GraphicNote
 import dev.arkbuilders.arkmemo.models.TextNote
 import dev.arkbuilders.arkmemo.preferences.MemoPreferences
 import dev.arkbuilders.arkmemo.repo.NotesRepoHelper
+import dev.arkbuilders.arkmemo.repo.versions.VersionStorageRepo
 
 
 @InstallIn(SingletonComponent::class)
@@ -30,5 +31,10 @@ abstract class RepositoryModule {
             memoPreferences: MemoPreferences,
             propertiesStorageRepo: PropertiesStorageRepo
         ) = NotesRepoHelper(memoPreferences, propertiesStorageRepo)
+
+        @Provides
+        fun provideVersionStorageRepo(
+            memoPreferences: MemoPreferences
+        ) = VersionStorageRepo(memoPreferences)
     }
 }

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

@@ -9,7 +9,8 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 data class GraphicNote(
     override val title: String = "",
-    val description: String = "",
+    override val description: String = "",
+    override var isForked: Boolean = false,
     @IgnoredOnParcel
     val svg: SVG? = null,
     @IgnoredOnParcel

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

@@ -1,8 +1,11 @@
 package dev.arkbuilders.arkmemo.models
 
+import android.os.Parcelable
 import dev.arkbuilders.arklib.data.index.Resource
 
-interface Note {
+interface Note: Parcelable {
     val title: String
+    val description: String
     var resource: Resource?
+    var isForked: Boolean
 }

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

@@ -8,8 +8,9 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 data class TextNote (
     override val title: String = "",
-    val description: String = "",
+    override val description: String = "",
     val text: String = "",
+    override var isForked: Boolean = false,
     @IgnoredOnParcel
     override var resource: Resource? = null
-): Note, Parcelable
+): Note, Parcelable

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

@@ -0,0 +1,10 @@
+package dev.arkbuilders.arkmemo.models
+
+import dev.arkbuilders.arklib.ResourceId
+import dev.arkbuilders.arkmemo.repo.versions.Version
+
+data class VersionsResult (
+    val versions: List<Version>,
+    val parents: Set<ResourceId>,
+    val children: List<ResourceId>
+)

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

@@ -0,0 +1,213 @@
+package dev.arkbuilders.arkmemo.repo.versions
+
+import android.util.Log
+import dev.arkbuilders.arklib.ResourceId
+import dev.arkbuilders.arklib.arkFolder
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+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 RootVersionStorage(private val root: Path) : VersionStorage {
+
+    private val storageFile = root.arkFolder().arkVersions()
+    private var lastModified = FileTime.fromMillis(0L)
+    private val versions = mutableListOf<Version>()
+    private val parents = mutableSetOf<ResourceId>()
+    private val children = mutableListOf<ResourceId>()
+
+
+    suspend fun init() =
+        withContext(Dispatchers.IO) {
+            if (Files.exists(storageFile)) {
+                val result = readStorage()
+                lastModified = Files.getLastModifiedTime(storageFile)
+                Log.d(
+                    VERSIONS_STORAGE,
+                    "file $storageFile exists," +
+                            " last modified at $lastModified"
+                )
+                versions.addAll(result.versions)
+                parents.addAll(result.parents)
+                children.addAll(result.children)
+            } else Log.d(
+                VERSIONS_STORAGE,
+                "file $storageFile doesn't exists"
+            )
+        }
+
+    override fun isLatestResourceVersion(id: ResourceId): Boolean =
+        childrenNotParents().contains(id)
+
+    private fun replace(oldVersion: Version, newVersion: Version) {
+        val replaceIndex = versions.indexOf(oldVersion)
+        versions[replaceIndex] = newVersion
+    }
+
+    override fun contains(id: ResourceId): Boolean {
+        return parents.contains(id) || children.contains(id)
+    }
+
+    override suspend fun add(version: Version) {
+        versions.add(version)
+        parents.add(version.parent)
+        children.add(version.child)
+        persist()
+    }
+
+    override suspend fun forget(id: ResourceId) {
+        if (!parents.contains(id)) {
+            val myParents = parentsTreeByChild(id)
+            myParents[id]?.forEach { parent ->
+                val version = versions
+                    .find { it.parent == parent }
+                versions.remove(version)
+                parents.remove(version?.parent)
+                children.remove(version?.child)
+            }
+        }
+        if (parents.contains(id) && !children.contains(id)) {
+            val version = versions.find {
+                it.parent == id
+            }
+            versions.remove(version)
+            parents.remove(id)
+        }
+        if (parents.contains(id) && children.contains(id)) {
+            val versionIdIsChild = versions.find {
+                it.child == id
+            }
+            val versionIdIsParent = versions.find {
+                it.parent == id
+            }
+            val newVersion = Version(
+                versionIdIsChild?.parent!!,
+                versionIdIsParent?.child!!
+            )
+            replace(versionIdIsChild, newVersion)
+            versions.remove(versionIdIsParent)
+            parents.remove(id)
+            children.remove(id)
+        }
+        persist()
+    }
+
+    override fun versions() = versions
+
+    override fun parentsTreeByChild(
+        child: ResourceId
+    ): Map<ResourceId, List<ResourceId>> {
+        var localChild = child
+        var parent: ResourceId?
+        val parents = mutableListOf<ResourceId>()
+        for (version in versions) {
+            parent = versions.find {
+                it.child == localChild
+            }?.parent
+            if (parent != null && children.contains(parent))
+                localChild = parent
+            if (parent != null) parents.add(parent)
+            if (!children.contains(parent))
+                break
+        }
+        return mapOf(child to parents)
+    }
+
+    override fun childrenNotParents(): List<ResourceId> {
+        return children.filter {
+            !parents.contains(it)
+        }
+    }
+
+    private suspend fun writeToStorage() =
+        withContext(Dispatchers.IO) {
+            val lines = mutableListOf<String>()
+            lines.add(
+                "$STORAGE_VERSION_PREFIX$STORAGE_VERSION"
+            )
+            lines.addAll(
+                versions.map {
+                    "${it.parent}$KEY_VALUE_SEPARATOR${it.child}"
+                }
+            )
+            storageFile.writeLines(lines, Charsets.UTF_8)
+        }
+
+    private suspend fun readStorage(): VersionsResult =
+        withContext(Dispatchers.IO) {
+            val lines = Files.readAllLines(storageFile)
+            val storageVersion = lines.removeAt(0)
+            verifyVersion(storageVersion)
+            val versions = lines.map {
+                val parts = it.split(KEY_VALUE_SEPARATOR)
+                val parent = ResourceId.fromString(parts[0])
+                val child = ResourceId.fromString(parts[1])
+                Log.d(
+                    VERSIONS_STORAGE,
+                    it
+                )
+                Version(parent, child)
+            }
+            val parents = versions.map {
+                Log.d(
+                    VERSIONS_STORAGE,
+                    "parent: ${it.parent}"
+                )
+                it.parent
+            }.toSet()
+            val children = versions.map {
+                Log.d(
+                    VERSIONS_STORAGE,
+                    "child: ${it.child}"
+                )
+                it.child
+            }
+            return@withContext VersionsResult(
+                versions,
+                parents,
+                children
+            )
+        }
+
+    override fun getValue(id: ResourceId): Version2 {
+        TODO("Not yet implemented")
+    }
+
+    override suspend fun persist() =
+        withContext(Dispatchers.IO) {
+            writeToStorage()
+            return@withContext
+        }
+
+    override fun remove(id: ResourceId) {
+        TODO("Not yet implemented")
+    }
+
+    override fun setValue(
+        id: ResourceId,
+        value: Version2
+    ) {
+        TODO("Not yet implemented")
+    }
+
+    companion object {
+        private const val VERSIONS_STORAGE = "versions"
+        private const val STORAGE_VERSION_PREFIX = "version "
+        private const val STORAGE_VERSION = 1
+        private const val KEY_VALUE_SEPARATOR = "->"
+
+        private fun verifyVersion(header: String) {
+            if (!header.startsWith(STORAGE_VERSION_PREFIX))
+                throw IllegalStateException("Unknown storage version")
+            val version = header.removePrefix(STORAGE_VERSION_PREFIX).toInt()
+            if (version > STORAGE_VERSION)
+                throw IllegalStateException("Storage version is newer than app")
+            if (version < STORAGE_VERSION)
+                throw IllegalStateException("Storage version is older than app")
+        }
+    }
+}

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/repo/versions/Version.kt

@@ -0,0 +1,10 @@
+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

@@ -0,0 +1,23 @@
+package dev.arkbuilders.arkmemo.repo.versions
+
+import dev.arkbuilders.arklib.ResourceId
+import dev.arkbuilders.arklib.data.storage.Storage
+
+interface VersionStorage: Storage<Version2> {
+
+    suspend fun add(version: Version)
+
+    suspend fun forget(id: ResourceId)
+
+    fun versions(): List<Version>
+
+    fun contains(id: ResourceId): Boolean
+
+    fun parentsTreeByChild(
+        child: ResourceId
+    ): Map<ResourceId, List<ResourceId>>
+
+    fun childrenNotParents(): List<ResourceId>
+
+    fun isLatestResourceVersion(id: ResourceId): Boolean
+}