From 412e2ef0b7b7a03c25669978bdb5fbc2f8eb228c Mon Sep 17 00:00:00 2001 From: Brage Date: Tue, 25 Jul 2023 00:54:10 +0200 Subject: [PATCH] Update --- .../streamit/content/common/dto/reader/SubtitleInfo.kt | 9 +++++++-- .../no/iktdev/streamit/content/convert/ConvertRunner.kt | 5 +++-- .../streamit/content/convert/kafka/SubtitleConsumer.kt | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) 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 8d6a5bae..76697a5b 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 @@ -1,4 +1,9 @@ package no.iktdev.streamit.content.common.dto.reader -class SubtitleInfo { -} \ No newline at end of file +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/ConvertRunner.kt b/Convert/src/main/kotlin/no/iktdev/streamit/content/convert/ConvertRunner.kt index eddf2109..c4c7e555 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 @@ -7,6 +7,7 @@ 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.work.ConvertWork +import no.iktdev.streamit.content.common.dto.reader.work.ExtractWork import java.io.File class ConvertRunner(val referenceId: String, val listener: IConvertListener) { @@ -26,7 +27,7 @@ class ConvertRunner(val referenceId: String, val listener: IConvertListener) { } withContext(Dispatchers.Default) { - listener.onStarted(referenceId, subtitleInfo) + listener.onStarted(referenceId) } val syncedDialogs = Syncro().sync(dialogs) @@ -50,7 +51,7 @@ class ConvertRunner(val referenceId: String, val listener: IConvertListener) { } interface IConvertListener { - fun onStarted(referenceId: String, info: SubtitleInfo) + fun onStarted(referenceId: String) fun onError(referenceId: String, info: SubtitleInfo, message: String) fun onEnded(referenceId: String, info: SubtitleInfo, work: ConvertWork) } \ 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 290b91e9..e115d02d 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 @@ -54,8 +54,8 @@ class SubtitleConsumer: DefaultKafkaReader("convertHandlerSubtitle"), IConvertLi listener.listen() } - override fun onStarted(referenceId: String, info: SubtitleInfo) { - produceMessage(KafkaEvents.EVENT_CONVERTER_STARTED_SUBTITLE_FILE, Message(referenceId = referenceId, Status(statusType = StatusType.SUCCESS)), info) + override fun onStarted(referenceId: String) { + produceMessage(KafkaEvents.EVENT_CONVERTER_STARTED_SUBTITLE_FILE, Message(referenceId = referenceId, Status(statusType = StatusType.SUCCESS)), null) } override fun onError(referenceId: String, info: SubtitleInfo, message: String) {