From dc8d5c44e48d0f1512e9cd26dc4a5a272ecbbf8c Mon Sep 17 00:00:00 2001 From: Brage Date: Tue, 25 Jul 2023 01:07:59 +0200 Subject: [PATCH] Fixed some issues --- .../streamit/content/common/dto/reader/SubtitleInfo.kt | 2 +- .../no/iktdev/streamit/content/convert/ConvertRunner.kt | 8 +++++--- .../no/iktdev/streamit/content/convert/SubtitleInfo.kt | 9 --------- .../streamit/content/convert/kafka/SubtitleConsumer.kt | 4 ++-- .../streamit/content/encode/runner/EncodeDaemon.kt | 1 - 5 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 Convert/src/main/kotlin/no/iktdev/streamit/content/convert/SubtitleInfo.kt diff --git a/CommonCode/src/main/java/no/iktdev/streamit/content/common/dto/reader/SubtitleInfo.kt b/CommonCode/src/main/java/no/iktdev/streamit/content/common/dto/reader/SubtitleInfo.kt index 76697a5b..1883dfb0 100644 --- a/CommonCode/src/main/java/no/iktdev/streamit/content/common/dto/reader/SubtitleInfo.kt +++ b/CommonCode/src/main/java/no/iktdev/streamit/content/common/dto/reader/SubtitleInfo.kt @@ -3,7 +3,7 @@ package no.iktdev.streamit.content.common.dto.reader import java.io.File data class SubtitleInfo( - val inputFile: File, + val inputFile: String, val collection: String, val language: String ) \ No newline at end of file diff --git a/Convert/src/main/kotlin/no/iktdev/streamit/content/convert/ConvertRunner.kt b/Convert/src/main/kotlin/no/iktdev/streamit/content/convert/ConvertRunner.kt index c4c7e555..bdb4906a 100644 --- a/Convert/src/main/kotlin/no/iktdev/streamit/content/convert/ConvertRunner.kt +++ b/Convert/src/main/kotlin/no/iktdev/streamit/content/convert/ConvertRunner.kt @@ -6,6 +6,7 @@ import no.iktdev.library.subtitle.Syncro import no.iktdev.library.subtitle.export.Export import no.iktdev.library.subtitle.reader.BaseReader import no.iktdev.library.subtitle.reader.Reader +import no.iktdev.streamit.content.common.dto.reader.SubtitleInfo import no.iktdev.streamit.content.common.dto.reader.work.ConvertWork import no.iktdev.streamit.content.common.dto.reader.work.ExtractWork import java.io.File @@ -17,7 +18,8 @@ class ConvertRunner(val referenceId: String, val listener: IConvertListener) { } suspend fun readAndConvert (subtitleInfo: SubtitleInfo) { - val reader = getReade(subtitleInfo.inputFile) + val inFile = File(subtitleInfo.inputFile) + val reader = getReade(inFile) val dialogs = reader?.read() if (dialogs.isNullOrEmpty()) { withContext(Dispatchers.Default) { @@ -32,10 +34,10 @@ class ConvertRunner(val referenceId: String, val listener: IConvertListener) { val syncedDialogs = Syncro().sync(dialogs) - val converted = Export(subtitleInfo.inputFile, syncedDialogs).write() + val converted = Export(inFile, syncedDialogs).write() converted.forEach { val item = ConvertWork( - inFile = subtitleInfo.inputFile.absolutePath, + inFile = inFile.absolutePath, collection = subtitleInfo.collection, language = subtitleInfo.language, outFile = it.absolutePath diff --git a/Convert/src/main/kotlin/no/iktdev/streamit/content/convert/SubtitleInfo.kt b/Convert/src/main/kotlin/no/iktdev/streamit/content/convert/SubtitleInfo.kt deleted file mode 100644 index aa411491..00000000 --- a/Convert/src/main/kotlin/no/iktdev/streamit/content/convert/SubtitleInfo.kt +++ /dev/null @@ -1,9 +0,0 @@ -package no.iktdev.streamit.content.convert - -import java.io.File - -data class SubtitleInfo( - val inputFile: File, - val collection: String, - val language: String -) \ No newline at end of file diff --git a/Convert/src/main/kotlin/no/iktdev/streamit/content/convert/kafka/SubtitleConsumer.kt b/Convert/src/main/kotlin/no/iktdev/streamit/content/convert/kafka/SubtitleConsumer.kt index e115d02d..9d04b0c8 100644 --- a/Convert/src/main/kotlin/no/iktdev/streamit/content/convert/kafka/SubtitleConsumer.kt +++ b/Convert/src/main/kotlin/no/iktdev/streamit/content/convert/kafka/SubtitleConsumer.kt @@ -5,11 +5,11 @@ import mu.KotlinLogging import no.iktdev.exfl.coroutines.Coroutines import no.iktdev.streamit.content.common.CommonConfig import no.iktdev.streamit.content.common.DefaultKafkaReader +import no.iktdev.streamit.content.common.dto.reader.SubtitleInfo import no.iktdev.streamit.content.common.dto.reader.work.ConvertWork import no.iktdev.streamit.content.common.dto.reader.work.ExtractWork import no.iktdev.streamit.content.convert.ConvertRunner import no.iktdev.streamit.content.convert.IConvertListener -import no.iktdev.streamit.content.convert.SubtitleInfo import no.iktdev.streamit.library.kafka.KafkaEvents import no.iktdev.streamit.library.kafka.dto.Message import no.iktdev.streamit.library.kafka.dto.Status @@ -36,7 +36,7 @@ class SubtitleConsumer: DefaultKafkaReader("convertHandlerSubtitle"), IConvertLi if (workResult?.produceConvertEvent == true) { logger.info { "Using ${data.value().referenceId} ${workResult.outFile} as it is a convert candidate" } val convertWork = SubtitleInfo( - inputFile = File(workResult.outFile), + inputFile = workResult.outFile, collection = workResult.collection, language = workResult.language, ) 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 2430c2c0..03602932 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 @@ -64,7 +64,6 @@ class EncodeDaemon(val referenceId: String, val work: EncodeWork, val daemonInte } override fun onOutputChanged(line: String) { super.onOutputChanged(line) - logger.info { line } outputCache.add(line) }