iktdev/MediaProcessing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated lib with collection fix

Browse Source
This commit is contained in:
Brage 2023-07-24 01:42:36 +02:00
parent 98179263f8
commit c78c48e6eb
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Encode/build.gradle.kts
View File

@ -23,7 +23,7 @@ repositories {
dependencies { dependencies {
implementation(project(":CommonCode")) 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("no.iktdev:exfl:0.0.12-SNAPSHOT")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")

3
Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/EncodeDaemon.kt
View File

@ -24,7 +24,7 @@ class EncodeDaemon(val referenceId: String, val work: EncodeWork, val daemonInte
outputCache.clear() outputCache.clear()
} }
} catch (e: Exception) { } 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) { override fun onOutputChanged(line: String) {
super.onOutputChanged(line) super.onOutputChanged(line)
outputCache.add(line) outputCache.add(line)
logger.info { "std -> $line" }
} }
} }

2
Reader/build.gradle.kts
View File

@ -23,7 +23,7 @@ repositories {
} }
dependencies { 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:exfl:0.0.12-SNAPSHOT")
implementation("no.iktdev.streamit.library:streamit-library-db:0.0.6-alpha7") implementation("no.iktdev.streamit.library:streamit-library-db:0.0.6-alpha7")

7
Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/EncodedStreams.kt
View File

@ -109,7 +109,12 @@ class EncodedStreams : DefaultKafkaReader("streamSelector"), ICollectedMessagesE
logger.warn { "referenceId is null, throwing collection" } logger.warn { "referenceId is null, throwing collection" }
return 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) createEncodeWork(referenceId, collection.getFileResult()?.title, collection.getFileResult()?.file, collection.getStreams(), outFileNameWithoutExtension)
createExtractWork(referenceId, collection.getFileResult()?.title, collection.getFileResult()?.file, collection.getStreams(), outFileNameWithoutExtension) createExtractWork(referenceId, collection.getFileResult()?.title, collection.getFileResult()?.file, collection.getStreams(), outFileNameWithoutExtension)