From a5b569a806eec7e3412ee136eee556e1300232ab Mon Sep 17 00:00:00 2001 From: Brage Date: Tue, 18 Jul 2023 17:37:32 +0200 Subject: [PATCH] Updated reader --- Reader/build.gradle.kts | 2 +- .../streamit/content/reader/ReaderApplication.kt | 2 +- .../reader/analyzer/EncodeStreamsMessageParser.kt | 4 +--- .../{EncodeStreamsProducer.kt => EncodedStreams.kt} | 10 ++++------ .../analyzer/{ => encoding}/EncodeArgumentSelector.kt | 10 +++++----- .../analyzer/{ => encoding}/EncodingPreference.kt | 3 +-- .../encoding/{ => dto}/AudioEncodeArguments.kt | 2 +- .../analyzer/encoding/{ => dto}/EncodeInformation.kt | 2 +- .../encoding/{ => dto}/SubtitleEncodeArguments.kt | 2 +- .../encoding/{ => dto}/VideoEncodeArguments.kt | 3 +-- .../streamit/content/reader/fileWatcher/FileWatcher.kt | 2 +- .../streamit/content/reader/streams/StreamsReader.kt | 2 +- 12 files changed, 19 insertions(+), 25 deletions(-) rename Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/{EncodeStreamsProducer.kt => EncodedStreams.kt} (91%) rename Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/{ => encoding}/EncodeArgumentSelector.kt (88%) rename Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/{ => encoding}/EncodingPreference.kt (98%) rename Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/{ => dto}/AudioEncodeArguments.kt (93%) rename Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/{ => dto}/EncodeInformation.kt (69%) rename Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/{ => dto}/SubtitleEncodeArguments.kt (90%) rename Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/{ => dto}/VideoEncodeArguments.kt (90%) diff --git a/Reader/build.gradle.kts b/Reader/build.gradle.kts index dc64c825..67ae5025 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-alpha16") + implementation("no.iktdev.streamit.library:streamit-library-kafka:0.0.2-alpha17") implementation("no.iktdev:exfl:0.0.4-SNAPSHOT") implementation("com.github.pgreze:kotlin-process:1.3.1") diff --git a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/ReaderApplication.kt b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/ReaderApplication.kt index 2082d64d..f1f2f167 100644 --- a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/ReaderApplication.kt +++ b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/ReaderApplication.kt @@ -1,6 +1,6 @@ package no.iktdev.streamit.content.reader -import no.iktdev.streamit.content.reader.analyzer.PreferenceReader +import no.iktdev.streamit.content.reader.analyzer.encoding.PreferenceReader import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.runApplication import org.springframework.context.ApplicationContext diff --git a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodeStreamsMessageParser.kt b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodeStreamsMessageParser.kt index b5302020..6e4920af 100644 --- a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodeStreamsMessageParser.kt +++ b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodeStreamsMessageParser.kt @@ -15,9 +15,7 @@ class EncodeStreamsMessageParser { fun getFileNameFromEvent(records: MutableList>): FileWatcher.FileResult? { val file = records.find { it.key() == KnownEvents.EVENT_READER_RECEIVED_FILE.event } ?: return null if (file.value().status.statusType != StatusType.SUCCESS) return null - return if (file.value().data is String) { - return Gson().fromJson(file.value().data as String, FileWatcher.FileResult::class.java) - } else null + return file.value().dataAs(FileWatcher.FileResult::class.java) } fun getMediaStreamsFromEvent(records: MutableList>): MediaStreams? { diff --git a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodeStreamsProducer.kt b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodedStreams.kt similarity index 91% rename from Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodeStreamsProducer.kt rename to Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodedStreams.kt index 25dffeec..1c1c807e 100644 --- a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodeStreamsProducer.kt +++ b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodedStreams.kt @@ -1,10 +1,8 @@ package no.iktdev.streamit.content.reader.analyzer -import com.google.gson.Gson import no.iktdev.streamit.content.common.CommonConfig -import no.iktdev.streamit.content.common.streams.MediaStreams -import no.iktdev.streamit.content.reader.analyzer.encoding.EncodeInformation -import no.iktdev.streamit.content.reader.fileWatcher.FileWatcher +import no.iktdev.streamit.content.reader.analyzer.encoding.EncodeArgumentSelector +import no.iktdev.streamit.content.reader.analyzer.encoding.dto.EncodeInformation import no.iktdev.streamit.library.kafka.KnownEvents import no.iktdev.streamit.library.kafka.dto.Message import no.iktdev.streamit.library.kafka.dto.Status @@ -18,11 +16,11 @@ import org.springframework.stereotype.Service import java.io.File @Service -class EncodeStreamsProducer: IPooledEvents.OnEventsReceived { +class EncodedStreams: IPooledEvents.OnEventsReceived { val messageProducer = DefaultProducer(CommonConfig.kafkaTopic) - val defaultConsumer = DefaultConsumer(subId = "0m").apply { + val defaultConsumer = DefaultConsumer(subId = "encodedStreams").apply { autoCommit = false } diff --git a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodeArgumentSelector.kt b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/EncodeArgumentSelector.kt similarity index 88% rename from Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodeArgumentSelector.kt rename to Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/EncodeArgumentSelector.kt index 64d1f1cd..e31ed2f8 100644 --- a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodeArgumentSelector.kt +++ b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/EncodeArgumentSelector.kt @@ -1,13 +1,13 @@ -package no.iktdev.streamit.content.reader.analyzer +package no.iktdev.streamit.content.reader.analyzer.encoding import no.iktdev.streamit.content.common.streams.AudioStream import no.iktdev.streamit.content.common.streams.MediaStreams import no.iktdev.streamit.content.common.streams.SubtitleStream import no.iktdev.streamit.content.common.streams.VideoStream -import no.iktdev.streamit.content.reader.analyzer.encoding.AudioEncodeArguments -import no.iktdev.streamit.content.reader.analyzer.encoding.EncodeInformation -import no.iktdev.streamit.content.reader.analyzer.encoding.SubtitleEncodeArguments -import no.iktdev.streamit.content.reader.analyzer.encoding.VideoEncodeArguments +import no.iktdev.streamit.content.reader.analyzer.encoding.dto.AudioEncodeArguments +import no.iktdev.streamit.content.reader.analyzer.encoding.dto.EncodeInformation +import no.iktdev.streamit.content.reader.analyzer.encoding.dto.SubtitleEncodeArguments +import no.iktdev.streamit.content.reader.analyzer.encoding.dto.VideoEncodeArguments import no.iktdev.streamit.content.reader.preference class EncodeArgumentSelector(val inputFile: String, val streams: MediaStreams, val outFileName: String) { diff --git a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodingPreference.kt b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/EncodingPreference.kt similarity index 98% rename from Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodingPreference.kt rename to Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/EncodingPreference.kt index 409d0494..31395bd4 100644 --- a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodingPreference.kt +++ b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/EncodingPreference.kt @@ -1,9 +1,8 @@ -package no.iktdev.streamit.content.reader.analyzer +package no.iktdev.streamit.content.reader.analyzer.encoding import com.google.gson.Gson import no.iktdev.streamit.content.reader.ReaderEnv import org.slf4j.LoggerFactory -import java.io.File data class EncodingPreference( val video: VideoPreference, diff --git a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/AudioEncodeArguments.kt b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/dto/AudioEncodeArguments.kt similarity index 93% rename from Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/AudioEncodeArguments.kt rename to Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/dto/AudioEncodeArguments.kt index fff4b7d7..87c9c907 100644 --- a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/AudioEncodeArguments.kt +++ b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/dto/AudioEncodeArguments.kt @@ -1,4 +1,4 @@ -package no.iktdev.streamit.content.reader.analyzer.encoding +package no.iktdev.streamit.content.reader.analyzer.encoding.dto import no.iktdev.streamit.content.common.streams.AudioStream import no.iktdev.streamit.content.reader.preference diff --git a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/EncodeInformation.kt b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/dto/EncodeInformation.kt similarity index 69% rename from Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/EncodeInformation.kt rename to Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/dto/EncodeInformation.kt index 9aab2ee0..d45a44f8 100644 --- a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/EncodeInformation.kt +++ b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/dto/EncodeInformation.kt @@ -1,4 +1,4 @@ -package no.iktdev.streamit.content.reader.analyzer.encoding +package no.iktdev.streamit.content.reader.analyzer.encoding.dto data class EncodeInformation( val inputFile: String, diff --git a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/SubtitleEncodeArguments.kt b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/dto/SubtitleEncodeArguments.kt similarity index 90% rename from Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/SubtitleEncodeArguments.kt rename to Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/dto/SubtitleEncodeArguments.kt index 5bea26df..3999bc7d 100644 --- a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/SubtitleEncodeArguments.kt +++ b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/dto/SubtitleEncodeArguments.kt @@ -1,4 +1,4 @@ -package no.iktdev.streamit.content.reader.analyzer.encoding +package no.iktdev.streamit.content.reader.analyzer.encoding.dto import no.iktdev.streamit.content.common.streams.SubtitleStream diff --git a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/VideoEncodeArguments.kt b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/dto/VideoEncodeArguments.kt similarity index 90% rename from Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/VideoEncodeArguments.kt rename to Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/dto/VideoEncodeArguments.kt index cffc35a1..3bb1f34f 100644 --- a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/VideoEncodeArguments.kt +++ b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/dto/VideoEncodeArguments.kt @@ -1,6 +1,5 @@ -package no.iktdev.streamit.content.reader.analyzer.encoding +package no.iktdev.streamit.content.reader.analyzer.encoding.dto -import no.iktdev.streamit.content.common.streams.AudioStream import no.iktdev.streamit.content.common.streams.VideoStream import no.iktdev.streamit.content.reader.preference diff --git a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/fileWatcher/FileWatcher.kt b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/fileWatcher/FileWatcher.kt index 39c96ffb..f21974f0 100644 --- a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/fileWatcher/FileWatcher.kt +++ b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/fileWatcher/FileWatcher.kt @@ -26,7 +26,7 @@ private val logger = KotlinLogging.logger {} @Service class FileWatcher: FileWatcherEvents { val messageProducer = DefaultProducer(CommonConfig.kafkaTopic) - val defaultConsumer = DefaultConsumer(subId = "0a") + val defaultConsumer = DefaultConsumer(subId = "fileWatcher") val queue = FileWatcherQueue() diff --git a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/streams/StreamsReader.kt b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/streams/StreamsReader.kt index fbdacf77..6e63bbcc 100644 --- a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/streams/StreamsReader.kt +++ b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/streams/StreamsReader.kt @@ -24,7 +24,7 @@ private val logger = KotlinLogging.logger {} class StreamsReader { val messageProducer = DefaultProducer(CommonConfig.kafkaTopic) - val defaultConsumer = DefaultConsumer(subId = "0a").apply { + val defaultConsumer = DefaultConsumer(subId = "streamReader").apply { // autoCommit = false } init {