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

Changed Enum value

Browse Source
This commit is contained in:
Brage Skjønborg 2026-01-21 04:10:27 +01:00
parent d246403f74
commit bd89f400ce
9 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateConvertTaskListener.kt
View File

@ -30,7 +30,7 @@ class MediaCreateConvertTaskListener: EventListener() {
val startedEvent = history.filterIsInstance<StartProcessingEvent>().firstOrNull() ?: return null val startedEvent = history.filterIsInstance<StartProcessingEvent>().firstOrNull() ?: return null
if (startedEvent.data.operation.isNotEmpty()) { if (startedEvent.data.operation.isNotEmpty()) {
if (!startedEvent.data.operation.contains(OperationType.Convert)) if (!startedEvent.data.operation.contains(OperationType.ConvertSubtitles))
return null return null
} }
val selectedEvent = event as? ProcesserExtractResultEvent ?: return null val selectedEvent = event as? ProcesserExtractResultEvent ?: return null

2
apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateExtractTaskListener.kt
View File

@ -26,7 +26,7 @@ class MediaCreateExtractTaskListener: EventListener() {
val startedEvent = history.filterIsInstance<StartProcessingEvent>().firstOrNull() ?: return null val startedEvent = history.filterIsInstance<StartProcessingEvent>().firstOrNull() ?: return null
if (startedEvent.data.operation.isNotEmpty()) { if (startedEvent.data.operation.isNotEmpty()) {
if (!startedEvent.data.operation.contains(OperationType.Extract)) if (!startedEvent.data.operation.contains(OperationType.ExtractSubtitles))
return null return null
} }

4
apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/StartedListener.kt
View File

@ -20,8 +20,8 @@ class StartedListener : EventListener() {
flow = StartFlow.Auto, flow = StartFlow.Auto,
fileUri = useEvent.data.fileUri, fileUri = useEvent.data.fileUri,
operation = setOf( operation = setOf(
OperationType.Extract, OperationType.ExtractSubtitles,
OperationType.Convert, OperationType.ConvertSubtitles,
OperationType.Encode OperationType.Encode
) )
) )

2
apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/TestBase.kt
View File

@ -46,7 +46,7 @@ open class TestBase {
fun defaultStartEvent(): StartProcessingEvent { fun defaultStartEvent(): StartProcessingEvent {
val start = StartProcessingEvent( val start = StartProcessingEvent(
data = StartData( data = StartData(
operation = setOf(OperationType.Encode, OperationType.Extract, OperationType.Convert), operation = setOf(OperationType.Encode, OperationType.ExtractSubtitles, OperationType.ConvertSubtitles),
fileUri = "file:///unit/${UUID.randomUUID()}.mkv" fileUri = "file:///unit/${UUID.randomUUID()}.mkv"
) )
) )

4
apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/CollectEventsListenerTest.kt
View File

@ -75,7 +75,7 @@ class CollectEventsListenerTest : TestBase() {
) )
fun success2() { fun success2() {
val started = defaultStartEvent().let { ev -> 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( val parsed = mediaParsedEvent(
collection = "MyCollection", collection = "MyCollection",
@ -109,7 +109,7 @@ class CollectEventsListenerTest : TestBase() {
) )
fun success3() { fun success3() {
val started = defaultStartEvent().let { ev -> 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( val parsed = mediaParsedEvent(
collection = "MyCollection", collection = "MyCollection",

10
apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateConvertTaskListenerTest.kt
View File

@ -41,7 +41,7 @@ class MediaCreateConvertTaskListenerTest : TestBase() {
val startEvent = StartProcessingEvent( val startEvent = StartProcessingEvent(
data = StartData( data = StartData(
fileUri = tempFile.absolutePath, fileUri = tempFile.absolutePath,
operation = setOf(OperationType.Convert) operation = setOf(OperationType.ConvertSubtitles)
) )
) )
val extractEvent = ProcesserExtractResultEvent( val extractEvent = ProcesserExtractResultEvent(
@ -128,7 +128,7 @@ class MediaCreateConvertTaskListenerTest : TestBase() {
val startEvent = StartProcessingEvent( val startEvent = StartProcessingEvent(
data = StartData( data = StartData(
fileUri = tempFile.absolutePath, fileUri = tempFile.absolutePath,
operation = setOf(OperationType.Convert) operation = setOf(OperationType.ConvertSubtitles)
) )
) )
val extractEvent = ProcesserExtractResultEvent( val extractEvent = ProcesserExtractResultEvent(
@ -157,7 +157,7 @@ class MediaCreateConvertTaskListenerTest : TestBase() {
val startEvent = StartProcessingEvent( val startEvent = StartProcessingEvent(
data = StartData( data = StartData(
fileUri = "video.mp4", fileUri = "video.mp4",
operation = setOf(OperationType.Convert) operation = setOf(OperationType.ConvertSubtitles)
) )
) )
val extractEvent = ProcesserExtractResultEvent( val extractEvent = ProcesserExtractResultEvent(
@ -183,7 +183,7 @@ class MediaCreateConvertTaskListenerTest : TestBase() {
val startEvent = StartProcessingEvent( val startEvent = StartProcessingEvent(
data = StartData( data = StartData(
fileUri = "nonexistent.srt", fileUri = "nonexistent.srt",
operation = setOf(OperationType.Convert) operation = setOf(OperationType.ConvertSubtitles)
) )
) )
val extractEvent = ProcesserExtractResultEvent( val extractEvent = ProcesserExtractResultEvent(
@ -219,7 +219,7 @@ class MediaCreateConvertTaskListenerTest : TestBase() {
val startEvent = StartProcessingEvent( val startEvent = StartProcessingEvent(
data = StartData( data = StartData(
fileUri = "/tmp/video.srt", fileUri = "/tmp/video.srt",
operation = setOf(OperationType.Convert) operation = setOf(OperationType.ConvertSubtitles)
) )
) )

4
apps/coordinator/src/test/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/MediaCreateExtractTaskListenerTest.kt
View File

@ -183,7 +183,7 @@ class MediaCreateExtractTaskListenerTest {
""") """)
fun testOnEventCreatesTasks() { fun testOnEventCreatesTasks() {
val startEvent = StartProcessingEvent( val startEvent = StartProcessingEvent(
StartData(setOf(OperationType.Extract), fileUri = "/tmp/movie.mkv") StartData(setOf(OperationType.ExtractSubtitles), fileUri = "/tmp/movie.mkv")
) )
val parsedEvent = MediaStreamParsedEvent( val parsedEvent = MediaStreamParsedEvent(
data = ParsedMediaStreams(subtitleStream = listOf(dummyStream(0, "subrip", "eng"))) data = ParsedMediaStreams(subtitleStream = listOf(dummyStream(0, "subrip", "eng")))
@ -221,7 +221,7 @@ class MediaCreateExtractTaskListenerTest {
fun testOnEventWithMultipleSubtitles() { fun testOnEventWithMultipleSubtitles() {
// Hvis: vi har en StartProcessingEvent og to subtitle streams // Hvis: vi har en StartProcessingEvent og to subtitle streams
val startEvent = StartProcessingEvent( val startEvent = StartProcessingEvent(
StartData(setOf(OperationType.Extract), fileUri = "/tmp/movie.mkv") StartData(setOf(OperationType.ExtractSubtitles), fileUri = "/tmp/movie.mkv")
) )
val parsedEvent = MediaStreamParsedEvent( val parsedEvent = MediaStreamParsedEvent(
data = ParsedMediaStreams( data = ParsedMediaStreams(

4
shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/event_task_contract/events/StartProcessingEvent.kt
View File

@ -20,7 +20,7 @@ enum class StartFlow {
} }
enum class OperationType { enum class OperationType {
Extract, ExtractSubtitles,
Encode, Encode,
Convert ConvertSubtitles
} }

6
shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/projection/TaskProjection.kt
View File

@ -73,14 +73,14 @@ class TaskProjection(val events: List<Event>) {
?.data?.operation ?.data?.operation
?: emptySet() ?: emptySet()
val hasExtractAndConvert = operations.contains(OperationType.Extract) && val hasExtractAndConvert = operations.contains(OperationType.ExtractSubtitles) &&
operations.contains(OperationType.Convert) operations.contains(OperationType.ConvertSubtitles)
val hasCreatedConvert = events.filterIsInstance<ConvertTaskCreatedEvent>().isNotEmpty() val hasCreatedConvert = events.filterIsInstance<ConvertTaskCreatedEvent>().isNotEmpty()
return when { return when {
// Convert ikke en del av operasjonene → bruk baseStatus direkte // 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, // Sekvensregel: både Extract og Convert er planlagt,
// men ingen ConvertCreated finnes → Pending // men ingen ConvertCreated finnes → Pending