From 06bd7e0fe2c897d890facc499b23f81bf121d84b Mon Sep 17 00:00:00 2001 From: Brage Date: Mon, 24 Jul 2023 17:49:48 +0200 Subject: [PATCH] Updated code base --- Encode/build.gradle.kts | 2 +- .../content/encode/runner/EncodeDaemon.kt | 2 +- .../content/encode/runner/ExtractDaemon.kt | 2 +- .../content/encode/runner/RunnerCoordinator.kt | 15 ++++++++------- Reader/build.gradle.kts | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Encode/build.gradle.kts b/Encode/build.gradle.kts index f196a321..b0597b7f 100644 --- a/Encode/build.gradle.kts +++ b/Encode/build.gradle.kts @@ -23,7 +23,7 @@ repositories { dependencies { implementation(project(":CommonCode")) - implementation("no.iktdev.streamit.library:streamit-library-kafka:0.0.2-alpha70") + implementation("no.iktdev.streamit.library:streamit-library-kafka:0.0.2-alpha72") implementation("no.iktdev:exfl:0.0.12-SNAPSHOT") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1") 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 96082018..2430c2c0 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 @@ -44,7 +44,7 @@ class EncodeDaemon(val referenceId: String, val work: EncodeWork, val daemonInte val adjustedArgs = listOf( "-hide_banner", "-i", File(work.inFile).absolutePath, *work.arguments.toTypedArray(), outFile.absolutePath, "-progress", "pipe:1" - ) + if (EncodeEnv.allowOverwrite) listOf("-y") else emptyList() + ) + if (EncodeEnv.allowOverwrite) listOf("-y") else listOf("-nostdin") logger.info { "$referenceId @ ${work.workId} ${adjustedArgs.joinToString(" ")}" } return Daemon(EncodeEnv.ffmpeg, this).run(adjustedArgs) } diff --git a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/ExtractDaemon.kt b/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/ExtractDaemon.kt index e573a3fc..eaaba085 100644 --- a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/ExtractDaemon.kt +++ b/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/ExtractDaemon.kt @@ -22,7 +22,7 @@ class ExtractDaemon(val referenceId: String, val work: ExtractWork, val daemonIn val adjustedArgs = listOf( "-hide_banner", "-i", File(work.inFile).absolutePath, *work.arguments.toTypedArray(), outFile.absolutePath, "-progress", "pipe:1" - ) + if (EncodeEnv.allowOverwrite) listOf("-y") else emptyList() + ) + if (EncodeEnv.allowOverwrite) listOf("-y") else listOf("-nostdin") logger.info { "$referenceId @ ${work.workId} ${adjustedArgs.joinToString(" ")}" } return Daemon(EncodeEnv.ffmpeg, this).run(adjustedArgs) } diff --git a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/RunnerCoordinator.kt b/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/RunnerCoordinator.kt index ddab79b9..21b8545c 100644 --- a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/RunnerCoordinator.kt +++ b/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/RunnerCoordinator.kt @@ -1,5 +1,6 @@ package no.iktdev.streamit.content.encode.runner +import com.google.gson.Gson import kotlinx.coroutines.* import no.iktdev.streamit.content.encode.EncodeEnv import mu.KotlinLogging @@ -82,38 +83,38 @@ class RunnerCoordinator { val encodeListener = object: IEncodeListener { override fun onStarted(referenceId: String, work: EncodeWork) { - logger.info { "$referenceId with WorkId ${work.workId} @ ${work.outFile}: Started" } + logger.info { "Work started for $referenceId with WorkId ${work.workId} @ ${work.outFile}" } producer.sendMessage(KafkaEvents.EVENT_ENCODER_STARTED_VIDEO_FILE.event, Message(referenceId, Status(StatusType.SUCCESS), work)) } override fun onError(referenceId: String, work: EncodeWork, code: Int) { - logger.info { "$referenceId with WorkId ${work.workId} @ ${work.outFile}: Error $code" } + logger.error { "Work failed for $referenceId with WorkId ${work.workId} @ ${work.outFile}: Error $code" } producer.sendMessage(KafkaEvents.EVENT_ENCODER_ENDED_VIDEO_FILE.event, Message(referenceId, Status(StatusType.ERROR, message = code.toString()), work)) } override fun onProgress(referenceId: String, work: EncodeWork, progress: Progress) { - logger.info { "$referenceId with WorkId ${work.workId} @ ${work.outFile}: Progress: ${progress.speed}" } + logger.info { "Work progress for $referenceId with WorkId ${work.workId} @ ${work.outFile}: Progress: ${Gson().toJson(progress)}" } } override fun onEnded(referenceId: String, work: EncodeWork) { - logger.info { "$referenceId with WorkId ${work.workId} @ ${work.outFile}: Ended" } + logger.info { "Work ended for $referenceId with WorkId ${work.workId} @ ${work.outFile}" } producer.sendMessage(KafkaEvents.EVENT_ENCODER_ENDED_VIDEO_FILE.event, Message(referenceId, Status(StatusType.SUCCESS), work)) } } val extractListener = object : IExtractListener { override fun onStarted(referenceId: String, work: ExtractWork) { - logger.info { "$referenceId with WorkId ${work.workId} @ ${work.outFile}: Started" } + logger.info { "Work started for $referenceId with WorkId ${work.workId} @ ${work.outFile}: Started" } producer.sendMessage(KafkaEvents.EVENT_ENCODER_STARTED_SUBTITLE_FILE.event, Message(referenceId, Status(StatusType.SUCCESS), work)) } override fun onError(referenceId: String, work: ExtractWork, code: Int) { - logger.info { "$referenceId with WorkId ${work.workId} @ ${work.outFile}: Error $code" } + logger.error { "Work failed for $referenceId with WorkId ${work.workId} @ ${work.outFile}: Error $code" } producer.sendMessage(KafkaEvents.EVENT_ENCODER_ENDED_SUBTITLE_FILE.event, Message(referenceId, Status(StatusType.ERROR), work)) } override fun onEnded(referenceId: String, work: ExtractWork) { - logger.info { "$referenceId with WorkId ${work.workId} @ ${work.outFile}: Ended" } + logger.info { "Work ended for $referenceId with WorkId ${work.workId} @ ${work.outFile}: Ended" } producer.sendMessage(KafkaEvents.EVENT_ENCODER_ENDED_SUBTITLE_FILE.event, Message(referenceId, Status(StatusType.SUCCESS), work)) } diff --git a/Reader/build.gradle.kts b/Reader/build.gradle.kts index 335088ff..ba51f4e4 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-alpha70") + implementation("no.iktdev.streamit.library:streamit-library-kafka:0.0.2-alpha72") implementation("no.iktdev:exfl:0.0.12-SNAPSHOT") implementation("no.iktdev.streamit.library:streamit-library-db:0.0.6-alpha7")