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

Fixed

Browse Source
This commit is contained in:
Brage 2024-03-26 03:06:42 +01:00
parent 6fd490689e
commit 0c2a6f3c1c
2 changed files with 57 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/converter/build.gradle.kts
View File

@ -40,7 +40,6 @@ dependencies {
implementation("io.github.microutils:kotlin-logging-jvm:2.0.11")
implementation("com.google.code.gson:gson:2.8.9")
implementation("org.json:json:20210307")
//implementation(project(mapOf("path" to ":shared")))
implementation("no.iktdev:exfl:0.0.13-SNAPSHOT")
implementation("no.iktdev.library:subtitle:1.7.8-SNAPSHOT")

58
apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/tasks/ConvertService.kt
View File

@ -1,6 +1,5 @@
package no.iktdev.mediaprocessing.converter.tasks
import com.google.gson.Gson
import kotlinx.coroutines.delay
import kotlinx.coroutines.runBlocking
import mu.KotlinLogging
@ -53,10 +52,23 @@ class ConvertService(@Autowired override var coordinator: ConverterCoordinator)
event: PersistentProcessDataMessage,
events: List<PersistentProcessDataMessage>
): MessageDataWrapper? {
try {
if (event.data !is ConvertWorkerRequest)
val convertEvent = events.find { it.event == KafkaEvents.EVENT_WORK_CONVERT_CREATED && it.data is ConvertWorkerRequest }
if (convertEvent == null) {
// No convert here..
return null
log.info { Gson().toJson(event) }
}
val convertRequest = convertEvent.data as ConvertWorkerRequest? ?: return null
val requiredEventId = convertRequest.requiresEventId
if (requiredEventId != null) {
// Requires the eventId to be defined as consumed
val requiredEventToBeCompleted =
getRequiredExtractProcessForContinuation(referenceId = event.referenceId, requiresEventId = requiredEventId)
?: return SimpleMessageData(Status.SKIPPED, "Required event: $requiredEventId is not found. Skipping convert work for referenceId: ${event.referenceId}")
if (!canConvert(requiredEventToBeCompleted)) {
// Waiting for required event to be completed
return null
}
}
val isAlreadyClaimed = PersistentDataReader().isProcessEventAlreadyClaimed(referenceId = event.referenceId, eventId = event.eventId)
if (isAlreadyClaimed) {
@ -64,32 +76,16 @@ class ConvertService(@Autowired override var coordinator: ConverterCoordinator)
return null
}
val payload = event.data as ConvertWorkerRequest
val requiresEventId: String? = payload.requiresEventId
val awaitingFor: PersistentProcessDataMessage? = if (requiresEventId != null) {
val existing = getRequiredExtractProcessForContinuation(referenceId = event.referenceId, requiresEventId = requiresEventId)
if (existing == null) {
skipConvertEvent(event, requiresEventId)
return null
}
existing
} else null
val converter = if (requiresEventId.isNullOrBlank() || canConvert(awaitingFor)) {
Converter(referenceId = event.referenceId, eventId = event.eventId, data = payload)
} else null
val setClaim = PersistentDataStore().setProcessEventClaim(referenceId = event.referenceId, eventId = event.eventId, claimedBy = serviceId)
if (!setClaim) {
return null
}
if (converter == null || !converter.canRead()) {
val payload = event.data as ConvertWorkerRequest
val converter = Converter(referenceId = event.referenceId, eventId = event.eventId, data = payload)
if (!converter.canRead()) {
// Make claim regardless but push to schedule
return null
return SimpleMessageData(Status.ERROR, "Can't read the file..")
}
val result = try {
@ -113,22 +109,8 @@ class ConvertService(@Autowired override var coordinator: ConverterCoordinator)
}
}
return result
} catch (e: Exception) {
e.printStackTrace()
}
return null
}
fun skipConvertEvent(event: PersistentProcessDataMessage, requiresEventId: String) {
if (event.event == KafkaEvents.EVENT_WORK_CONVERT_CREATED)
return
val producesPayload = SimpleMessageData(status = Status.COMPLETED, message = "Convert event contains a payload stating that it waits for eventId: $requiresEventId with referenceId: ${event.referenceId}")
coordinator.producer.sendMessage(
referenceId = event.referenceId,
event = KafkaEvents.EVENT_WORK_CONVERT_SKIPPED,
data = producesPayload
)
}
fun performConvert(converter: Converter): ConvertWorkPerformed {
return try {