diff --git a/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/TaskPoller.kt b/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/TaskPoller.kt index 758ab6ec..f1d43d54 100644 --- a/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/TaskPoller.kt +++ b/apps/converter/src/main/kotlin/no/iktdev/mediaprocessing/converter/TaskPoller.kt @@ -57,6 +57,10 @@ class DefaultTaskReporter() : TaskReporter { TaskStore.markConsumed(taskId, TaskStatus.Failed) } + override fun markCancelled(taskId: UUID) { + TaskStore.markConsumed(taskId, TaskStatus.Cancelled) + } + override fun updateProgress(taskId: UUID, progress: Int) { // Not to be implemented for this application diff --git a/apps/converter/src/test/kotlin/no/iktdev/mediaprocessing/converter/listeners/ConvertTaskListenerTest.kt b/apps/converter/src/test/kotlin/no/iktdev/mediaprocessing/converter/listeners/ConvertTaskListenerTest.kt index de887413..0b7aa85d 100644 --- a/apps/converter/src/test/kotlin/no/iktdev/mediaprocessing/converter/listeners/ConvertTaskListenerTest.kt +++ b/apps/converter/src/test/kotlin/no/iktdev/mediaprocessing/converter/listeners/ConvertTaskListenerTest.kt @@ -109,7 +109,7 @@ class ConvertTaskListenerTest { override fun updateLastSeen(taskId: UUID) {} override fun markCompleted(taskId: UUID) {} override fun markFailed(taskId: UUID) {} - + override fun markCancelled(taskId: UUID) {} override fun updateProgress(taskId: UUID, progress: Int) {} override fun log(taskId: UUID, message: String) {} override fun publishEvent(event: Event) { diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/TaskPoller.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/TaskPoller.kt index 12269d78..88983326 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/TaskPoller.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/TaskPoller.kt @@ -56,6 +56,10 @@ class DefaultTaskReporter() : TaskReporter { TaskStore.markConsumed(taskId, TaskStatus.Failed) } + override fun markCancelled(taskId: UUID) { + TaskStore.markConsumed(taskId, TaskStatus.Cancelled) + } + override fun updateProgress(taskId: UUID, progress: Int) { // Not to be implemented for this application } diff --git a/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/tasks/DownloadCoverTaskListenerTest.kt b/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/tasks/DownloadCoverTaskListenerTest.kt index 7458d7b2..42c2d0ff 100644 --- a/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/tasks/DownloadCoverTaskListenerTest.kt +++ b/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/tasks/DownloadCoverTaskListenerTest.kt @@ -39,6 +39,7 @@ class DownloadCoverTaskListenerTest: TestBase() { override fun markClaimed(taskId: UUID, workerId: String) {} override fun updateLastSeen(taskId: UUID) {} override fun markCompleted(taskId: UUID) {} + override fun markCancelled(taskId: UUID) {} override fun markFailed(taskId: UUID) {} override fun updateProgress(taskId: UUID, progress: Int) {} override fun log(taskId: UUID, message: String) {} diff --git a/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/tasks/MediaStreamReadTaskListenerTest.kt b/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/tasks/MediaStreamReadTaskListenerTest.kt index b790a1d7..07be4afe 100644 --- a/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/tasks/MediaStreamReadTaskListenerTest.kt +++ b/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/tasks/MediaStreamReadTaskListenerTest.kt @@ -46,6 +46,7 @@ class MediaStreamReadTaskListenerTest: TestBase() { override fun updateLastSeen(taskId: UUID) {} override fun markCompleted(taskId: UUID) {} override fun markFailed(taskId: UUID) {} + override fun markCancelled(taskId: UUID) {} override fun updateProgress(taskId: UUID, progress: Int) {} override fun log(taskId: UUID, message: String) {} override fun publishEvent(event: Event) { diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/TaskPoller.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/TaskPoller.kt index 846c8de4..27d79a00 100644 --- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/TaskPoller.kt +++ b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/TaskPoller.kt @@ -62,6 +62,11 @@ class DefaultTaskReporter() : TaskReporter { TaskStore.markConsumed(taskId, TaskStatus.Failed) } + override fun markCancelled(taskId: UUID) { + log.info { "Margin task $taskId as cancelled"} + TaskStore.markConsumed(taskId, TaskStatus.Cancelled) + } + override fun updateProgress(taskId: UUID, progress: Int) { // Not to be implemented for this application } diff --git a/apps/processer/src/test/kotlin/no/iktdev/mediaprocessing/processer/listeners/SubtitleTaskListenerTest.kt b/apps/processer/src/test/kotlin/no/iktdev/mediaprocessing/processer/listeners/SubtitleTaskListenerTest.kt index 05fedb0c..7a9bccdc 100644 --- a/apps/processer/src/test/kotlin/no/iktdev/mediaprocessing/processer/listeners/SubtitleTaskListenerTest.kt +++ b/apps/processer/src/test/kotlin/no/iktdev/mediaprocessing/processer/listeners/SubtitleTaskListenerTest.kt @@ -40,6 +40,8 @@ class SubtitleTaskListenerTest { override fun updateLastSeen(taskId: UUID) {} override fun markCompleted(taskId: UUID) {} override fun markFailed(taskId: UUID) {} + override fun markCancelled(taskId: UUID) {} + override fun updateProgress(taskId: UUID, progress: Int) {} override fun log(taskId: UUID, message: String) {} override fun publishEvent(event: Event) { diff --git a/apps/processer/src/test/kotlin/no/iktdev/mediaprocessing/processer/listeners/VideoTaskListenerTest.kt b/apps/processer/src/test/kotlin/no/iktdev/mediaprocessing/processer/listeners/VideoTaskListenerTest.kt index ce6ffeef..917d7495 100644 --- a/apps/processer/src/test/kotlin/no/iktdev/mediaprocessing/processer/listeners/VideoTaskListenerTest.kt +++ b/apps/processer/src/test/kotlin/no/iktdev/mediaprocessing/processer/listeners/VideoTaskListenerTest.kt @@ -42,6 +42,7 @@ class VideoTaskListenerTest { override fun updateLastSeen(taskId: UUID) {} override fun markCompleted(taskId: UUID) {} override fun markFailed(taskId: UUID) {} + override fun markCancelled(taskId: UUID) {} override fun updateProgress(taskId: UUID, progress: Int) {} override fun log(taskId: UUID, message: String) {} override fun publishEvent(event: Event) { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 43da9a38..59264837 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -eventi = "1.0-rc31" +eventi = "1.0-rc33" exfl = "1.0-rc1" [libraries]