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

Updated reader

Browse Source
This commit is contained in:
Brage 2023-07-18 17:37:32 +02:00
parent 33190a8a62
commit a5b569a806
12 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Reader/build.gradle.kts
View File

@ -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")

2
Reader/src/main/kotlin/no/iktdev/streamit/content/reader/ReaderApplication.kt
View File

@ -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

4
Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodeStreamsMessageParser.kt
View File

@ -15,9 +15,7 @@ class EncodeStreamsMessageParser {
fun getFileNameFromEvent(records: MutableList<ConsumerRecord<String, Message>>): 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<ConsumerRecord<String, Message>>): MediaStreams? {

10
Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodeStreamsProducer.kt → Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodedStreams.kt
View File

@ -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
}

10
Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodeArgumentSelector.kt → Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/EncodeArgumentSelector.kt
View File

@ -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) {

3
Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodingPreference.kt → Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/EncodingPreference.kt
View File

@ -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,

2
Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/AudioEncodeArguments.kt → Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/dto/AudioEncodeArguments.kt
View File

@ -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

2
Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/EncodeInformation.kt → Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/dto/EncodeInformation.kt
View File

@ -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,

2
Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/SubtitleEncodeArguments.kt → Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/dto/SubtitleEncodeArguments.kt
View File

@ -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

3
Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/VideoEncodeArguments.kt → Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/encoding/dto/VideoEncodeArguments.kt
View File

@ -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

2
Reader/src/main/kotlin/no/iktdev/streamit/content/reader/fileWatcher/FileWatcher.kt
View File

@ -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()

2
Reader/src/main/kotlin/no/iktdev/streamit/content/reader/streams/StreamsReader.kt
View File

@ -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 {