From bd89f400ce581ad357dad70d6b2b53f3f32ca94d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brage=20Skj=C3=B8nborg?= Date: Wed, 21 Jan 2026 04:10:27 +0100 Subject: [PATCH] Changed Enum value --- .../listeners/events/MediaCreateConvertTaskListener.kt | 2 +- .../listeners/events/MediaCreateExtractTaskListener.kt | 2 +- .../coordinator/listeners/events/StartedListener.kt | 4 ++-- .../test/kotlin/no/iktdev/mediaprocessing/TestBase.kt | 2 +- .../listeners/events/CollectEventsListenerTest.kt | 4 ++-- .../events/MediaCreateConvertTaskListenerTest.kt | 10 +++++----- .../events/MediaCreateExtractTaskListenerTest.kt | 4 ++-- .../event_task_contract/events/StartProcessingEvent.kt | 4 ++-- .../shared/common/projection/TaskProjection.kt | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateConvertTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateConvertTaskListener.kt index 5151f57c..0393a541 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateConvertTaskListener.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateConvertTaskListener.kt @@ -30,7 +30,7 @@ class MediaCreateConvertTaskListener: EventListener() { val startedEvent = history.filterIsInstance().firstOrNull() ?: return null if (startedEvent.data.operation.isNotEmpty()) { - if (!startedEvent.data.operation.contains(OperationType.Convert)) + if (!startedEvent.data.operation.contains(OperationType.ConvertSubtitles)) return null } val selectedEvent = event as? ProcesserExtractResultEvent ?: return null diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateExtractTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateExtractTaskListener.kt index 57f3eac7..57b5b6ed 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateExtractTaskListener.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateExtractTaskListener.kt @@ -26,7 +26,7 @@ class MediaCreateExtractTaskListener: EventListener() { val startedEvent = history.filterIsInstance().firstOrNull() ?: return null if (startedEvent.data.operation.isNotEmpty()) { - if (!startedEvent.data.operation.contains(OperationType.Extract)) + if (!startedEvent.data.operation.contains(OperationType.ExtractSubtitles)) return null } diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/StartedListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/StartedListener.kt index 326d9728..b2180ae5 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/StartedListener.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/StartedListener.kt @@ -20,8 +20,8 @@ class StartedListener : EventListener() { flow = StartFlow.Auto, fileUri = useEvent.data.fileUri, operation = setOf( - OperationType.Extract, - OperationType.Convert, + OperationType.ExtractSubtitles, + OperationType.ConvertSubtitles, OperationType.Encode ) ) diff --git a/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/TestBase.kt b/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/TestBase.kt index 5c3dd202..b9034d53 100644 --- a/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/TestBase.kt +++ b/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/TestBase.kt @@ -46,7 +46,7 @@ open class TestBase { fun defaultStartEvent(): StartProcessingEvent { val start = StartProcessingEvent( data = StartData( - operation = setOf(OperationType.Encode, OperationType.Extract, OperationType.Convert), + operation = setOf(OperationType.Encode, OperationType.ExtractSubtitles, OperationType.ConvertSubtitles), fileUri = "file:///unit/${UUID.randomUUID()}.mkv" ) ) diff --git a/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/CollectEventsListenerTest.kt b/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/CollectEventsListenerTest.kt index 172da787..6bfc89ae 100644 --- a/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/CollectEventsListenerTest.kt +++ b/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/CollectEventsListenerTest.kt @@ -75,7 +75,7 @@ class CollectEventsListenerTest : TestBase() { ) fun success2() { val started = defaultStartEvent().let { ev -> - ev.copy(data = ev.data.copy(operation = setOf(OperationType.Encode, OperationType.Extract))) + ev.copy(data = ev.data.copy(operation = setOf(OperationType.Encode, OperationType.ExtractSubtitles))) } val parsed = mediaParsedEvent( collection = "MyCollection", @@ -109,7 +109,7 @@ class CollectEventsListenerTest : TestBase() { ) fun success3() { val started = defaultStartEvent().let { ev -> - ev.copy(data = ev.data.copy(operation = setOf(OperationType.Convert))) + ev.copy(data = ev.data.copy(operation = setOf(OperationType.ConvertSubtitles))) } val parsed = mediaParsedEvent( collection = "MyCollection", diff --git a/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateConvertTaskListenerTest.kt b/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateConvertTaskListenerTest.kt index f2693882..c2ac3032 100644 --- a/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateConvertTaskListenerTest.kt +++ b/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateConvertTaskListenerTest.kt @@ -41,7 +41,7 @@ class MediaCreateConvertTaskListenerTest : TestBase() { val startEvent = StartProcessingEvent( data = StartData( fileUri = tempFile.absolutePath, - operation = setOf(OperationType.Convert) + operation = setOf(OperationType.ConvertSubtitles) ) ) val extractEvent = ProcesserExtractResultEvent( @@ -128,7 +128,7 @@ class MediaCreateConvertTaskListenerTest : TestBase() { val startEvent = StartProcessingEvent( data = StartData( fileUri = tempFile.absolutePath, - operation = setOf(OperationType.Convert) + operation = setOf(OperationType.ConvertSubtitles) ) ) val extractEvent = ProcesserExtractResultEvent( @@ -157,7 +157,7 @@ class MediaCreateConvertTaskListenerTest : TestBase() { val startEvent = StartProcessingEvent( data = StartData( fileUri = "video.mp4", - operation = setOf(OperationType.Convert) + operation = setOf(OperationType.ConvertSubtitles) ) ) val extractEvent = ProcesserExtractResultEvent( @@ -183,7 +183,7 @@ class MediaCreateConvertTaskListenerTest : TestBase() { val startEvent = StartProcessingEvent( data = StartData( fileUri = "nonexistent.srt", - operation = setOf(OperationType.Convert) + operation = setOf(OperationType.ConvertSubtitles) ) ) val extractEvent = ProcesserExtractResultEvent( @@ -219,7 +219,7 @@ class MediaCreateConvertTaskListenerTest : TestBase() { val startEvent = StartProcessingEvent( data = StartData( fileUri = "/tmp/video.srt", - operation = setOf(OperationType.Convert) + operation = setOf(OperationType.ConvertSubtitles) ) ) diff --git a/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateExtractTaskListenerTest.kt b/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateExtractTaskListenerTest.kt index 870e3ecf..4024e9b8 100644 --- a/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateExtractTaskListenerTest.kt +++ b/apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateExtractTaskListenerTest.kt @@ -183,7 +183,7 @@ class MediaCreateExtractTaskListenerTest { """) fun testOnEventCreatesTasks() { val startEvent = StartProcessingEvent( - StartData(setOf(OperationType.Extract), fileUri = "/tmp/movie.mkv") + StartData(setOf(OperationType.ExtractSubtitles), fileUri = "/tmp/movie.mkv") ) val parsedEvent = MediaStreamParsedEvent( data = ParsedMediaStreams(subtitleStream = listOf(dummyStream(0, "subrip", "eng"))) @@ -221,7 +221,7 @@ class MediaCreateExtractTaskListenerTest { fun testOnEventWithMultipleSubtitles() { // Hvis: vi har en StartProcessingEvent og to subtitle streams val startEvent = StartProcessingEvent( - StartData(setOf(OperationType.Extract), fileUri = "/tmp/movie.mkv") + StartData(setOf(OperationType.ExtractSubtitles), fileUri = "/tmp/movie.mkv") ) val parsedEvent = MediaStreamParsedEvent( data = ParsedMediaStreams( diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/event_task_contract/events/StartProcessingEvent.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/event_task_contract/events/StartProcessingEvent.kt index 00f57b73..bbcacccd 100644 --- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/event_task_contract/events/StartProcessingEvent.kt +++ b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/event_task_contract/events/StartProcessingEvent.kt @@ -20,7 +20,7 @@ enum class StartFlow { } enum class OperationType { - Extract, + ExtractSubtitles, Encode, - Convert + ConvertSubtitles } \ No newline at end of file diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/projection/TaskProjection.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/projection/TaskProjection.kt index 104518eb..5e9f4ac3 100644 --- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/projection/TaskProjection.kt +++ b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/projection/TaskProjection.kt @@ -73,14 +73,14 @@ class TaskProjection(val events: List) { ?.data?.operation ?: emptySet() - val hasExtractAndConvert = operations.contains(OperationType.Extract) && - operations.contains(OperationType.Convert) + val hasExtractAndConvert = operations.contains(OperationType.ExtractSubtitles) && + operations.contains(OperationType.ConvertSubtitles) val hasCreatedConvert = events.filterIsInstance().isNotEmpty() return when { // Convert ikke en del av operasjonene → bruk baseStatus direkte - !operations.contains(OperationType.Convert) -> baseStatus + !operations.contains(OperationType.ConvertSubtitles) -> baseStatus // Sekvensregel: både Extract og Convert er planlagt, // men ingen ConvertCreated finnes → Pending