Fix a couple of issues:

• Fix a bug where the wrong platform was reported. • Make it easier to debug the Android/JVM folder scanning.
Airthings · Apr 11, 2024 · e577af1 · e577af1
1 parent 938fb10
commit e577af1
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,7 @@
+0.2.4 - April 11, 2024
+• Fix a bug where the wrong platform was reported.
+• Make it easier to debug the Android/JVM folder scanning.
+
 0.2.3 - April 10, 2024
 • Fix a bug when extracting date from a file name.
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -18,7 +18,7 @@
  */
 
 rootProject.group = "com.airthings.lib"
-rootProject.version = "0.2.3"
+rootProject.version = "0.2.4"
 
 buildscript {
     repositories {

diff --git a/src/androidMain/kotlin/com/airthings/lib/logging/platform/PlatformFileInputOutputImpl.kt b/src/androidMain/kotlin/com/airthings/lib/logging/platform/PlatformFileInputOutputImpl.kt
@@ -90,7 +90,9 @@ internal actual class PlatformFileInputOutputImpl : PlatformFileInputOutput {
         path: String,
         date: LogDate?,
     ): Collection<String> = ArrayList<String>(INITIAL_ARRAY_SIZE).apply {
-        val iterator = File(path).walk().iterator()
+        val filePath = File(path)
+        val fileWalker = filePath.walkTopDown()
+        val iterator = fileWalker.iterator()
 
         while (iterator.hasNext()) {
             val file = iterator.next()

diff --git a/src/commonMain/kotlin/com/airthings/lib/logging/Constants.kt b/src/commonMain/kotlin/com/airthings/lib/logging/Constants.kt
@@ -23,6 +23,8 @@ internal const val PLATFORM_ANDROID: String = "Android"
 
 internal const val PLATFORM_IOS: String = "iOS"
 
+internal const val PLATFORM_JVM: String = "jvm"
+
 internal const val INITIAL_ARRAY_SIZE: Int = 50
 
 internal const val INITIAL_BLOCK_SIZE: Int = 256

diff --git a/src/jvmMain/kotlin/com/airthings/lib/logging/platform/PlatformFileInputOutputImpl.kt b/src/jvmMain/kotlin/com/airthings/lib/logging/platform/PlatformFileInputOutputImpl.kt
@@ -21,7 +21,7 @@ package com.airthings.lib.logging.platform
 
 import com.airthings.lib.logging.INITIAL_ARRAY_SIZE
 import com.airthings.lib.logging.LogDate
-import com.airthings.lib.logging.PLATFORM_ANDROID
+import com.airthings.lib.logging.PLATFORM_JVM
 import com.airthings.lib.logging.ifAfter
 import java.io.File
 import java.io.FileOutputStream
@@ -84,13 +84,15 @@ internal actual class PlatformFileInputOutputImpl : PlatformFileInputOutput {
         date = date,
     )
 
-    override fun toString(): String = PLATFORM_ANDROID
+    override fun toString(): String = PLATFORM_JVM
 
     private fun filesImpl(
         path: String,
         date: LogDate?,
     ): Collection<String> = ArrayList<String>(INITIAL_ARRAY_SIZE).apply {
-        val iterator = File(path).walk().iterator()
+        val filePath = File(path)
+        val fileWalker = filePath.walkTopDown()
+        val iterator = fileWalker.iterator()
 
         while (iterator.hasNext()) {
             val file = iterator.next()