diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/implementations/WorkTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/implementations/WorkTaskListener.kt index c7afc451..e1c4db54 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/implementations/WorkTaskListener.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/implementations/WorkTaskListener.kt @@ -11,6 +11,10 @@ import no.iktdev.mediaprocessing.shared.common.contract.data.az abstract class WorkTaskListener: CoordinatorEventListener() { private val log = KotlinLogging.logger {} + override fun shouldIProcessAndHandleEvent(incomingEvent: Event, events: List): Boolean { + + return canStart(incomingEvent, events) + } fun canStart(incomingEvent: Event, events: List): Boolean { val autoStart = events.find { it.eventType == Events.ProcessStarted }?.az()?.data if (autoStart == null) { diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ConvertWorkTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ConvertWorkTaskListener.kt index 5bae1921..3ae29e60 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ConvertWorkTaskListener.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ConvertWorkTaskListener.kt @@ -35,6 +35,10 @@ class ConvertWorkTaskListener: WorkTaskListener() { return true } override fun shouldIProcessAndHandleEvent(incomingEvent: Event, events: List): Boolean { + if (!super.shouldIProcessAndHandleEvent(incomingEvent, events)) { + return false + } + if (!isOfEventsIListenFor(incomingEvent)) return false if (!incomingEvent.isSuccessful() && !shouldIHandleFailedEvents(incomingEvent)) { @@ -54,10 +58,6 @@ class ConvertWorkTaskListener: WorkTaskListener() { return } active = true - if (!canStart(event, events)) { - active = false - return - } var language: String? = null var storeAsFile: String? = null diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/EncodeWorkTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/EncodeWorkTaskListener.kt index b646120a..045e84de 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/EncodeWorkTaskListener.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/EncodeWorkTaskListener.kt @@ -42,10 +42,6 @@ class EncodeWorkTaskListener : WorkTaskListener() { return } active = true - if (!canStart(event, events)) { - active = false - return - } val encodeArguments = if (event.eventType == Events.ParameterEncodeCreated) { event.az()?.data diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ExtractWorkTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ExtractWorkTaskListener.kt index 6a673bbb..0ca31701 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ExtractWorkTaskListener.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ExtractWorkTaskListener.kt @@ -36,11 +36,6 @@ class ExtractWorkTaskListener: WorkTaskListener() { return true } - override fun shouldIProcessAndHandleEvent(incomingEvent: Event, events: List): Boolean { - val state = super.shouldIProcessAndHandleEvent(incomingEvent, events) - return state - } - override fun onEventsReceived(incomingEvent: ConsumableEvent, events: List) { val event = incomingEvent.consume() if (event == null) { @@ -50,12 +45,6 @@ class ExtractWorkTaskListener: WorkTaskListener() { } active = true - - if (!canStart(event, events)) { - active = false - return - } - val arguments = if (event.eventType == Events.ParameterExtractCreated) { event.az()?.data } else {