From c78c48e6ebf6bd22d441b1386a99febe08ebbd67 Mon Sep 17 00:00:00 2001 From: Brage Date: Mon, 24 Jul 2023 01:42:36 +0200 Subject: [PATCH] Updated lib with collection fix --- Encode/build.gradle.kts | 2 +- .../iktdev/streamit/content/encode/runner/EncodeDaemon.kt | 3 +-- Reader/build.gradle.kts | 2 +- .../content/reader/analyzer/encoding/EncodedStreams.kt | 7 ++++++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Encode/build.gradle.kts b/Encode/build.gradle.kts index a1e0b30c..bf4893f4 100644 --- a/Encode/build.gradle.kts +++ b/Encode/build.gradle.kts @@ -23,7 +23,7 @@ repositories { dependencies { implementation(project(":CommonCode")) - implementation("no.iktdev.streamit.library:streamit-library-kafka:0.0.2-alpha69") + implementation("no.iktdev.streamit.library:streamit-library-kafka:0.0.2-alpha70") implementation("no.iktdev:exfl:0.0.12-SNAPSHOT") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1") diff --git a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/EncodeDaemon.kt b/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/EncodeDaemon.kt index 769570f1..6a4faf35 100644 --- a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/EncodeDaemon.kt +++ b/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/EncodeDaemon.kt @@ -24,7 +24,7 @@ class EncodeDaemon(val referenceId: String, val work: EncodeWork, val daemonInte outputCache.clear() } } catch (e: Exception) { - e.message + logger.error { e.message } } } @@ -65,7 +65,6 @@ class EncodeDaemon(val referenceId: String, val work: EncodeWork, val daemonInte override fun onOutputChanged(line: String) { super.onOutputChanged(line) outputCache.add(line) - logger.info { "std -> $line" } } } diff --git a/Reader/build.gradle.kts b/Reader/build.gradle.kts index 1dc0e690..335088ff 100644 --- a/Reader/build.gradle.kts +++ b/Reader/build.gradle.kts @@ -23,7 +23,7 @@ repositories { } dependencies { - implementation("no.iktdev.streamit.library:streamit-library-kafka:0.0.2-alpha69") + implementation("no.iktdev.streamit.library:streamit-library-kafka:0.0.2-alpha70") implementation("no.iktdev:exfl:0.0.12-SNAPSHOT") implementation("no.iktdev.streamit.library:streamit-library-db:0.0.6-alpha7") diff --git a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/EncodedStreams.kt b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/EncodedStreams.kt index 1318525f..0f3f413f 100644 --- a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/EncodedStreams.kt +++ b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/EncodedStreams.kt @@ -109,7 +109,12 @@ class EncodedStreams : DefaultKafkaReader("streamSelector"), ICollectedMessagesE logger.warn { "referenceId is null, throwing collection" } return } - val outFileNameWithoutExtension: String? = collection.getFileName()?.baseName ?: collection.getFileResult()?.sanitizedName + val outFileNameWithoutExtension: String? = if (collection.getFileName() != null) { + collection.getFileName()?.baseName + } else { + logger.info { "Getting filename from ${KafkaEvents.EVENT_READER_DETERMINED_FILENAME.event} resulted in null. Falling back to sanitized name" } + collection.getFileResult()?.sanitizedName + } createEncodeWork(referenceId, collection.getFileResult()?.title, collection.getFileResult()?.file, collection.getStreams(), outFileNameWithoutExtension) createExtractWork(referenceId, collection.getFileResult()?.title, collection.getFileResult()?.file, collection.getStreams(), outFileNameWithoutExtension)