switched to moko parcelize + fixed possible crash because `FileSystem…

….SYSTEM.list(folder)` does not work if the folder does not exist
MFlisar · Nov 18, 2024 · a007eb8 · a007eb8
1 parent 5ac3f91
commit a007eb8
Show file tree

Hide file tree

Showing 17 changed files with 40 additions and 47 deletions.
diff --git a/documentation/_data/other-projects.yml b/documentation/_data/other-projects.yml
@@ -10,7 +10,7 @@ libraries:
       description: This is a very small library that allows you to <b>send feedback</b> from an app <b>without internet permission</b> via email, either directly or via an unintrusive notification.
     - name: Toolbox
       link: https://github.com/MFlisar/Toolbox
-      maven: io.github.mflisar.toolbox:core
+      maven: io.github.mflisar.toolbox/core
       description: My personal toolbox library
   Libraries:
     - name: KotBilling

diff --git a/gradle/deps.versions.toml b/gradle/deps.versions.toml
@@ -6,8 +6,11 @@ slf4j =                     "2.0.7"
 logback =                   "3.0.0"
 fastscroller =              "1.0.0"
 material =					"1.12.0"
+
+# mflisar
 feedback =                  "2.1.0"
 toolbox =                   "2.2.0"
+moko-parcelize =            "0.9.0"
 
 [libraries]
 
@@ -17,7 +20,10 @@ slf4j = 				        	{ module = "org.slf4j:slf4j-api", 							version.ref = "slf
 logback = 				        	{ module = "com.github.tony19:logback-android", 		    version.ref = "logback" }
 fastscroller = 				        { module = "com.quiph.ui:recyclerviewfastscroller", 		version.ref = "fastscroller" }
 material = 				        	{ module = "com.google.android.material:material", 		    version.ref = "material" }
+moko-parcelize =                    { module = "dev.icerock.moko:parcelize", 		                        version.ref = "moko-parcelize" }
+
+# mflisar
 feedback =                          { module = "io.github.mflisar.feedbackmanager:library",     version.ref = "feedback" }
 toolbox-core =                      { module = "io.github.mflisar.toolbox:core", 			    version.ref = "toolbox" }
 toolbox-ui =                        { module = "io.github.mflisar.toolbox:ui", 			        version.ref = "toolbox" }
-toolbox-app =                       { module = "io.github.mflisar.toolbox:android-demo-app",    version.ref = "toolbox" }
+toolbox-app =                       { module = "io.github.mflisar.toolbox:android-demo-app",    version.ref = "toolbox" }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -28,10 +28,6 @@ compose =                           { id = "org.jetbrains.compose",
 
 [libraries]
 
-#kotlin =						    { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", 			version.ref = "kotlin" }
-#kotlin-gradle-plugin =			    { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", 		version.ref = "kotlin" }
-#kotlin-serialization =			    { module = "org.jetbrains.kotlin:kotlin-serialization", 		version.ref = "kotlin" }
-
 compose-runtime =                   { module = "org.jetbrains.compose.runtime:runtime",                     version.ref = "compose" }
 compose-material-icons-core = 	    { module = "org.jetbrains.compose.material:material-icons-core",        version.ref = "compose" }
 compose-material-icons-extended = 	{ module = "org.jetbrains.compose.material:material-icons-extended",    version.ref = "compose" }

diff --git a/library/core/build.gradle.kts b/library/core/build.gradle.kts
@@ -74,6 +74,8 @@ kotlin {
             // I/O
             implementation(deps.okio)
 
+            api(deps.moko.parcelize)
+
         }
     }
 }

diff --git a/library/core/src/androidMain/kotlin/com/michaelflisar/lumberjack/core/Platform.android.kt b/library/core/src/androidMain/kotlin/com/michaelflisar/lumberjack/core/Platform.android.kt
diff --git a/library/core/src/commonMain/kotlin/com/michaelflisar/lumberjack/core/Platform.kt b/library/core/src/commonMain/kotlin/com/michaelflisar/lumberjack/core/Platform.kt
diff --git a/...core/src/commonMain/kotlin/com/michaelflisar/lumberjack/core/interfaces/IFileConverter.kt b/...core/src/commonMain/kotlin/com/michaelflisar/lumberjack/core/interfaces/IFileConverter.kt
@@ -1,9 +1,9 @@
 package com.michaelflisar.lumberjack.core.interfaces
 
-import com.michaelflisar.lumberjack.core.CommonParcelable
 import com.michaelflisar.lumberjack.core.classes.Level
+import dev.icerock.moko.parcelize.Parcelable
 
-interface IFileConverter : CommonParcelable {
+interface IFileConverter : Parcelable {
 
     fun parseFile(lines: List<String>) : List<Entry>
     fun formatLog(

diff --git a/...e/src/commonMain/kotlin/com/michaelflisar/lumberjack/core/interfaces/IFileLoggingSetup.kt b/...e/src/commonMain/kotlin/com/michaelflisar/lumberjack/core/interfaces/IFileLoggingSetup.kt
@@ -1,9 +1,9 @@
 package com.michaelflisar.lumberjack.core.interfaces
 
-import com.michaelflisar.lumberjack.core.CommonParcelable
+import dev.icerock.moko.parcelize.Parcelable
 import okio.Path
 
-interface IFileLoggingSetup : CommonParcelable {
+interface IFileLoggingSetup : Parcelable {
 
     val fileConverter: IFileConverter
 

diff --git a/library/core/src/jvmMain/kotlin/com/michaelflisar/lumberjack/core/Platform.jvm.kt b/library/core/src/jvmMain/kotlin/com/michaelflisar/lumberjack/core/Platform.jvm.kt
diff --git a/library/core/src/nativeMain/kotlin/com/michaelflisar/lumberjack/core/Platform.native.kt b/library/core/src/nativeMain/kotlin/com/michaelflisar/lumberjack/core/Platform.native.kt
diff --git a/library/extensions/composeviewer/build.gradle.kts b/library/extensions/composeviewer/build.gradle.kts
@@ -79,6 +79,8 @@ kotlin {
             // Dependencies
             implementation(deps.okio)
 
+            implementation(deps.moko.parcelize)
+
         }
 
         androidMain.dependencies {

diff --git a/library/extensions/core/build.gradle.kts b/library/extensions/core/build.gradle.kts
@@ -38,8 +38,7 @@ kotlin {
         commonMain.dependencies {
 
             // Kotlin
-            implementation(libs.kotlin)
-            implementation(libs.kotlinx.io.core)
+            implementation(kotlinx.io.core)
 
         }
     }

diff --git a/library/loggers/lumberjack/file/build.gradle.kts b/library/loggers/lumberjack/file/build.gradle.kts
@@ -80,6 +80,8 @@ kotlin {
             implementation(project(":Lumberjack:Core"))
             implementation(project(":Lumberjack:Implementations:Lumberjack"))
 
+            implementation(deps.moko.parcelize)
+
         }
     }
 }

diff --git a/...le/src/commonMain/kotlin/com/michaelflisar/lumberjack/loggers/file/BaseFileLoggerSetup.kt b/...le/src/commonMain/kotlin/com/michaelflisar/lumberjack/loggers/file/BaseFileLoggerSetup.kt
@@ -1,7 +1,7 @@
 package com.michaelflisar.lumberjack.loggers.file
 
-import com.michaelflisar.lumberjack.core.CommonIgnoredOnParcel
 import com.michaelflisar.lumberjack.implementation.LumberjackLogger
+import dev.icerock.moko.parcelize.IgnoredOnParcel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -16,13 +16,13 @@ abstract class BaseFileLoggerSetup : FileLoggerSetup() {
     abstract val fileBaseName: String
     abstract val fileExtension: String
 
-    @CommonIgnoredOnParcel
+    @IgnoredOnParcel
     override val fileConverter = FileConverter
 
-    @CommonIgnoredOnParcel
+    @IgnoredOnParcel
     private var lastFileKey: String = ""
 
-    @CommonIgnoredOnParcel
+    @IgnoredOnParcel
     private var lastFileKeyChanged: Boolean = false
 
     override fun filePath(data: FileLogger.Event.Data): String {
@@ -61,9 +61,11 @@ abstract class BaseFileLoggerSetup : FileLoggerSetup() {
     }
 
     override fun getAllExistingLogFilePaths(): List<Path> {
-        return FileSystem.SYSTEM.list(folder.toPath()).filter {
-            it.name.startsWith(fileBaseName) && it.name.endsWith(".$fileExtension")
-        }.sortedByDescending { it.name }
+        return if (FileSystem.SYSTEM.exists(folder.toPath())) {
+             FileSystem.SYSTEM.list(folder.toPath()).filter {
+                it.name.startsWith(fileBaseName) && it.name.endsWith(".$fileExtension")
+            }.sortedByDescending { it.name }
+        } else emptyList()
     }
 
     override fun getLatestLogFilePath(): Path? {

diff --git a/...ack/file/src/commonMain/kotlin/com/michaelflisar/lumberjack/loggers/file/FileConverter.kt b/...ack/file/src/commonMain/kotlin/com/michaelflisar/lumberjack/loggers/file/FileConverter.kt
@@ -1,17 +1,17 @@
 package com.michaelflisar.lumberjack.loggers.file
 
-import com.michaelflisar.lumberjack.core.CommonIgnoredOnParcel
-import com.michaelflisar.lumberjack.core.CommonParcelize
 import com.michaelflisar.lumberjack.core.classes.Level
 import com.michaelflisar.lumberjack.core.interfaces.IFileConverter
+import dev.icerock.moko.parcelize.IgnoredOnParcel
+import dev.icerock.moko.parcelize.Parcelize
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.format.char
 
-@CommonParcelize
+@Parcelize
 object FileConverter : IFileConverter {
 
     // "yyyy-MM-dd HH:mm:ss.SSS"
-    @CommonIgnoredOnParcel
+    @IgnoredOnParcel
     private val timeFormatter = LocalDateTime.Format {
         year()
         char('-')

diff --git a/...k/file/src/commonMain/kotlin/com/michaelflisar/lumberjack/loggers/file/FileLoggerSetup.kt b/...k/file/src/commonMain/kotlin/com/michaelflisar/lumberjack/loggers/file/FileLoggerSetup.kt
@@ -1,8 +1,8 @@
 package com.michaelflisar.lumberjack.loggers.file
 
-import com.michaelflisar.lumberjack.core.CommonIgnoredOnParcel
-import com.michaelflisar.lumberjack.core.CommonParcelize
 import com.michaelflisar.lumberjack.core.interfaces.IFileLoggingSetup
+import dev.icerock.moko.parcelize.IgnoredOnParcel
+import dev.icerock.moko.parcelize.Parcelize
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.format
@@ -21,7 +21,7 @@ sealed class FileLoggerSetup : IFileLoggingSetup {
     abstract fun filePath(data: FileLogger.Event.Data): String
     abstract fun onLogged(scope: CoroutineScope)
 
-    @CommonParcelize
+    @Parcelize
     class Daily internal constructor(
         override val folder: String,
         override val fileBaseName: String,
@@ -32,7 +32,7 @@ sealed class FileLoggerSetup : IFileLoggingSetup {
         companion object
 
         // "yyyy_MM_dd"
-        @CommonIgnoredOnParcel
+        @IgnoredOnParcel
         private val timeFormatter = LocalDateTime.Format {
             year()
             char('_')
@@ -52,7 +52,7 @@ sealed class FileLoggerSetup : IFileLoggingSetup {
         }
     }
 
-    @CommonParcelize
+    @Parcelize
     class FileSize internal constructor(
         override val folder: String,
         override val fileBaseName: String,
@@ -63,7 +63,7 @@ sealed class FileLoggerSetup : IFileLoggingSetup {
 
         companion object
 
-        @CommonIgnoredOnParcel
+        @IgnoredOnParcel
         private var fileIndex: Int? = null
 
         override fun getFileKey(data: FileLogger.Event.Data, lastPath: Path): String {
@@ -88,7 +88,7 @@ sealed class FileLoggerSetup : IFileLoggingSetup {
         }
     }
 
-    @CommonParcelize
+    @Parcelize
     class SingleFile internal constructor(
         override val folder: String,
         private val fileName: String,
@@ -97,7 +97,7 @@ sealed class FileLoggerSetup : IFileLoggingSetup {
 
         companion object
 
-        @CommonIgnoredOnParcel
+        @IgnoredOnParcel
         override val fileBaseName: String = fileName
 
         override fun getFileKey(data: FileLogger.Event.Data, lastPath: Path): String {

diff --git a/...r/file/src/main/java/com/michaelflisar/lumberjack/loggers/timber/file/FileLoggingSetup.kt b/...r/file/src/main/java/com/michaelflisar/lumberjack/loggers/timber/file/FileLoggingSetup.kt
@@ -2,7 +2,6 @@ package com.michaelflisar.lumberjack.loggers.timber.file
 
 import android.content.Context
 import android.os.Parcelable
-import com.michaelflisar.lumberjack.core.CommonParcelize
 import com.michaelflisar.lumberjack.core.interfaces.IFileConverter
 import com.michaelflisar.lumberjack.core.interfaces.IFileLoggingSetup
 import kotlinx.coroutines.Dispatchers
-Original file line number
+Diff line change
@@ Expand Up / @@ -74,6 +74,8 @@ kotlin { @@
                 // I/O
                 implementation(deps.okio)
+                api(deps.moko.parcelize)
             }
         }
     }
@@ Expand Down @@