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

Fixed some issues

Browse Source
This commit is contained in:
Brage 2023-07-25 01:07:59 +02:00
parent 8723b73c6e
commit dc8d5c44e4
5 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CommonCode/src/main/java/no/iktdev/streamit/content/common/dto/reader/SubtitleInfo.kt
View File

@ -3,7 +3,7 @@ package no.iktdev.streamit.content.common.dto.reader
import java.io.File import java.io.File
data class SubtitleInfo( data class SubtitleInfo(
val inputFile: File, val inputFile: String,
val collection: String, val collection: String,
val language: String val language: String
) )

8
Convert/src/main/kotlin/no/iktdev/streamit/content/convert/ConvertRunner.kt
View File

@ -6,6 +6,7 @@ import no.iktdev.library.subtitle.Syncro
import no.iktdev.library.subtitle.export.Export import no.iktdev.library.subtitle.export.Export
import no.iktdev.library.subtitle.reader.BaseReader import no.iktdev.library.subtitle.reader.BaseReader
import no.iktdev.library.subtitle.reader.Reader 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.ConvertWork
import no.iktdev.streamit.content.common.dto.reader.work.ExtractWork import no.iktdev.streamit.content.common.dto.reader.work.ExtractWork
import java.io.File import java.io.File
@ -17,7 +18,8 @@ class ConvertRunner(val referenceId: String, val listener: IConvertListener) {
} }
suspend fun readAndConvert (subtitleInfo: SubtitleInfo) { suspend fun readAndConvert (subtitleInfo: SubtitleInfo) {
val reader = getReade(subtitleInfo.inputFile) val inFile = File(subtitleInfo.inputFile)
val reader = getReade(inFile)
val dialogs = reader?.read() val dialogs = reader?.read()
if (dialogs.isNullOrEmpty()) { if (dialogs.isNullOrEmpty()) {
withContext(Dispatchers.Default) { withContext(Dispatchers.Default) {
@ -32,10 +34,10 @@ class ConvertRunner(val referenceId: String, val listener: IConvertListener) {
val syncedDialogs = Syncro().sync(dialogs) val syncedDialogs = Syncro().sync(dialogs)
val converted = Export(subtitleInfo.inputFile, syncedDialogs).write() val converted = Export(inFile, syncedDialogs).write()
converted.forEach { converted.forEach {
val item = ConvertWork( val item = ConvertWork(
inFile = subtitleInfo.inputFile.absolutePath, inFile = inFile.absolutePath,
collection = subtitleInfo.collection, collection = subtitleInfo.collection,
language = subtitleInfo.language, language = subtitleInfo.language,
outFile = it.absolutePath outFile = it.absolutePath

9
Convert/src/main/kotlin/no/iktdev/streamit/content/convert/SubtitleInfo.kt
View File

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

4
Convert/src/main/kotlin/no/iktdev/streamit/content/convert/kafka/SubtitleConsumer.kt
View File

@ -5,11 +5,11 @@ import mu.KotlinLogging
import no.iktdev.exfl.coroutines.Coroutines import no.iktdev.exfl.coroutines.Coroutines
import no.iktdev.streamit.content.common.CommonConfig import no.iktdev.streamit.content.common.CommonConfig
import no.iktdev.streamit.content.common.DefaultKafkaReader 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.ConvertWork
import no.iktdev.streamit.content.common.dto.reader.work.ExtractWork import no.iktdev.streamit.content.common.dto.reader.work.ExtractWork
import no.iktdev.streamit.content.convert.ConvertRunner import no.iktdev.streamit.content.convert.ConvertRunner
import no.iktdev.streamit.content.convert.IConvertListener 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.KafkaEvents
import no.iktdev.streamit.library.kafka.dto.Message import no.iktdev.streamit.library.kafka.dto.Message
import no.iktdev.streamit.library.kafka.dto.Status import no.iktdev.streamit.library.kafka.dto.Status
@ -36,7 +36,7 @@ class SubtitleConsumer: DefaultKafkaReader("convertHandlerSubtitle"), IConvertLi
if (workResult?.produceConvertEvent == true) { if (workResult?.produceConvertEvent == true) {
logger.info { "Using ${data.value().referenceId} ${workResult.outFile} as it is a convert candidate" } logger.info { "Using ${data.value().referenceId} ${workResult.outFile} as it is a convert candidate" }
val convertWork = SubtitleInfo( val convertWork = SubtitleInfo(
inputFile = File(workResult.outFile), inputFile = workResult.outFile,
collection = workResult.collection, collection = workResult.collection,
language = workResult.language, language = workResult.language,
) )

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

@ -64,7 +64,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)
logger.info { line }
outputCache.add(line) outputCache.add(line)
} }