This commit is contained in:
Brage 2023-07-23 22:14:07 +02:00
parent b57ea20e3a
commit 64eeda69fc
4 changed files with 32 additions and 19 deletions

View File

@ -23,7 +23,7 @@ repositories {
dependencies { dependencies {
implementation(project(":CommonCode")) implementation(project(":CommonCode"))
implementation("no.iktdev.streamit.library:streamit-library-kafka:0.0.2-alpha63") implementation("no.iktdev.streamit.library:streamit-library-kafka:0.0.2-alpha69")
implementation("no.iktdev:exfl:0.0.12-SNAPSHOT") implementation("no.iktdev:exfl:0.0.12-SNAPSHOT")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")

View File

@ -14,10 +14,14 @@ class EncodeDaemon(val referenceId: String, val work: EncodeWork, val daemonInte
var outputCache = observableListOf<String>() var outputCache = observableListOf<String>()
private val decoder = ProgressDecoder() private val decoder = ProgressDecoder()
private fun produceProgress(items: List<String>) { private fun produceProgress(items: List<String>) {
val progress = decoder.parseVideoProgress(items) try {
if (progress != null) { val progress = decoder.parseVideoProgress(items)
daemonInterface.onProgress(referenceId, work, progress) if (progress != null) {
outputCache.clear() daemonInterface.onProgress(referenceId, work, progress)
outputCache.clear()
}
} catch (e: Exception) {
e.message
} }
} }

View File

@ -40,15 +40,20 @@ class RunnerCoordinator {
fun addEncodeMessageToQueue(message: Message) { fun addEncodeMessageToQueue(message: Message) {
encodeExecutor.execute { encodeExecutor.execute {
runBlocking { try {
if (message.data is EncodeWork) { runBlocking {
val data: EncodeWork = message.data as EncodeWork if (message.data is EncodeWork) {
val encodeDaemon = EncodeDaemon(message.referenceId, data, encodeListener) val data: EncodeWork = message.data as EncodeWork
encodeDaemon.runUsingWorkItem() val encodeDaemon = EncodeDaemon(message.referenceId, data, encodeListener)
} else { encodeDaemon.runUsingWorkItem()
producer.sendMessage(KafkaEvents.EVENT_ENCODER_STARTED_VIDEO_FILE.event, message.withNewStatus(Status(StatusType.ERROR, "Data is not an instance of EncodeWork"))) } else {
producer.sendMessage(KafkaEvents.EVENT_ENCODER_STARTED_VIDEO_FILE.event, message.withNewStatus(Status(StatusType.ERROR, "Data is not an instance of EncodeWork")))
}
} }
} catch (e: Exception) {
producer.sendMessage(KafkaEvents.EVENT_ENCODER_ENDED_VIDEO_FILE.event, message.withNewStatus(Status(StatusType.ERROR, e.message)))
} }
} }
producer.sendMessage(KafkaEvents.EVENT_ENCODER_STARTED_VIDEO_FILE.event, message.withNewStatus(Status(StatusType.PENDING))) producer.sendMessage(KafkaEvents.EVENT_ENCODER_STARTED_VIDEO_FILE.event, message.withNewStatus(Status(StatusType.PENDING)))
} }
@ -56,12 +61,16 @@ class RunnerCoordinator {
fun addExtractMessageToQueue(message: Message) { fun addExtractMessageToQueue(message: Message) {
extractExecutor.execute { extractExecutor.execute {
runBlocking { runBlocking {
if (message.data is ExtractWork) { try {
val data: ExtractWork = message.data as ExtractWork if (message.data is ExtractWork) {
val extractDaemon = ExtractDaemon(message.referenceId, data, extractListener) val data: ExtractWork = message.data as ExtractWork
extractDaemon.runUsingWorkItem() val extractDaemon = ExtractDaemon(message.referenceId, data, extractListener)
} else { extractDaemon.runUsingWorkItem()
producer.sendMessage(KafkaEvents.EVENT_ENCODER_STARTED_SUBTITLE_FILE.event, message.withNewStatus(Status(StatusType.ERROR, "Data is not an instance of ExtractWork"))) } else {
producer.sendMessage(KafkaEvents.EVENT_ENCODER_STARTED_SUBTITLE_FILE.event, message.withNewStatus(Status(StatusType.ERROR, "Data is not an instance of ExtractWork")))
}
} catch (e: Exception) {
producer.sendMessage(KafkaEvents.EVENT_ENCODER_ENDED_SUBTITLE_FILE.event, message.withNewStatus(Status(StatusType.ERROR, e.message)))
} }
} }
} }

View File

@ -23,7 +23,7 @@ repositories {
} }
dependencies { dependencies {
implementation("no.iktdev.streamit.library:streamit-library-kafka:0.0.2-alpha68") implementation("no.iktdev.streamit.library:streamit-library-kafka:0.0.2-alpha69")
implementation("no.iktdev:exfl:0.0.12-SNAPSHOT") implementation("no.iktdev:exfl:0.0.12-SNAPSHOT")
implementation("no.iktdev.streamit.library:streamit-library-db:0.0.6-alpha7") implementation("no.iktdev.streamit.library:streamit-library-db:0.0.6-alpha7")