From ecfe2b9122c68708ccb8577bbf166aac3b1a7c5e Mon Sep 17 00:00:00 2001 From: rnentjes Date: Thu, 15 May 2025 16:14:56 +0200 Subject: [PATCH] Refactor package structure for logger to include versioning. Moved all logger-related classes to the `nl.astraeus.logger.v1` package to introduce versioning and improve maintainability. Updated logic in `StringArrayRing` to filter out blank lines during data retrieval. This change establishes a foundation for future updates without breaking compatibility. --- .../kotlin/nl/astraeus/logger/{ => v1}/Logger.kt | 2 +- .../kotlin/nl/astraeus/logger/{ => v1}/StringArrayRing.kt | 7 +++++-- src/jsMain/kotlin/nl/astraeus/logger/{ => v1}/Logger.js.kt | 2 +- .../kotlin/nl/astraeus/logger/{ => v1}/Logger.jvm.kt | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) rename src/commonMain/kotlin/nl/astraeus/logger/{ => v1}/Logger.kt (98%) rename src/commonMain/kotlin/nl/astraeus/logger/{ => v1}/StringArrayRing.kt (75%) rename src/jsMain/kotlin/nl/astraeus/logger/{ => v1}/Logger.js.kt (65%) rename src/jvmMain/kotlin/nl/astraeus/logger/{ => v1}/Logger.jvm.kt (85%) diff --git a/src/commonMain/kotlin/nl/astraeus/logger/Logger.kt b/src/commonMain/kotlin/nl/astraeus/logger/v1/Logger.kt similarity index 98% rename from src/commonMain/kotlin/nl/astraeus/logger/Logger.kt rename to src/commonMain/kotlin/nl/astraeus/logger/v1/Logger.kt index f997463..38b0e07 100644 --- a/src/commonMain/kotlin/nl/astraeus/logger/Logger.kt +++ b/src/commonMain/kotlin/nl/astraeus/logger/v1/Logger.kt @@ -1,4 +1,4 @@ -package nl.astraeus.logger +package nl.astraeus.logger.v1 enum class LogLevel( val label: String diff --git a/src/commonMain/kotlin/nl/astraeus/logger/StringArrayRing.kt b/src/commonMain/kotlin/nl/astraeus/logger/v1/StringArrayRing.kt similarity index 75% rename from src/commonMain/kotlin/nl/astraeus/logger/StringArrayRing.kt rename to src/commonMain/kotlin/nl/astraeus/logger/v1/StringArrayRing.kt index 1b386e2..5aaa95f 100644 --- a/src/commonMain/kotlin/nl/astraeus/logger/StringArrayRing.kt +++ b/src/commonMain/kotlin/nl/astraeus/logger/v1/StringArrayRing.kt @@ -1,4 +1,4 @@ -package nl.astraeus.logger +package nl.astraeus.logger.v1 class StringArrayRing( val size: Int = 1000 @@ -15,7 +15,10 @@ class StringArrayRing( var readIndex = (writeIndex + 1) % size val result = mutableListOf() repeat(size) { - result.add(array[readIndex]) + val line = array[readIndex] + if (line.isNotBlank()) { + result.add(array[readIndex]) + } readIndex = (readIndex + 1) % size } return result diff --git a/src/jsMain/kotlin/nl/astraeus/logger/Logger.js.kt b/src/jsMain/kotlin/nl/astraeus/logger/v1/Logger.js.kt similarity index 65% rename from src/jsMain/kotlin/nl/astraeus/logger/Logger.js.kt rename to src/jsMain/kotlin/nl/astraeus/logger/v1/Logger.js.kt index e1eba3a..6a6e3ce 100644 --- a/src/jsMain/kotlin/nl/astraeus/logger/Logger.js.kt +++ b/src/jsMain/kotlin/nl/astraeus/logger/v1/Logger.js.kt @@ -1,4 +1,4 @@ -package nl.astraeus.logger +package nl.astraeus.logger.v1 import kotlin.js.Date diff --git a/src/jvmMain/kotlin/nl/astraeus/logger/Logger.jvm.kt b/src/jvmMain/kotlin/nl/astraeus/logger/v1/Logger.jvm.kt similarity index 85% rename from src/jvmMain/kotlin/nl/astraeus/logger/Logger.jvm.kt rename to src/jvmMain/kotlin/nl/astraeus/logger/v1/Logger.jvm.kt index 89354fb..ffc3744 100644 --- a/src/jvmMain/kotlin/nl/astraeus/logger/Logger.jvm.kt +++ b/src/jvmMain/kotlin/nl/astraeus/logger/v1/Logger.jvm.kt @@ -1,4 +1,4 @@ -package nl.astraeus.logger +package nl.astraeus.logger.v1 import java.util.*