From e48a529a775277d8359f232ed11a4a499671fe12 Mon Sep 17 00:00:00 2001
From: bskjon <bskjon@outlook.com>
Date: Thu, 4 Jul 2024 01:46:54 +0200
Subject: [PATCH] Updated ffmpeg stuff

---
 .../mediaprocessing/processer/services/EncodeServiceV2.kt     | 4 ++--
 .../mediaprocessing/processer/services/ExtractServiceV2.kt    | 4 ++--
 .../no/iktdev/mediaprocessing/shared/common/task/Task.kt      | 1 +
 .../no/iktdev/mediaprocessing/shared/common/task/TaskDoz.kt   | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/EncodeServiceV2.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/EncodeServiceV2.kt
index f886c2d3..94546ea6 100644
--- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/EncodeServiceV2.kt
+++ b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/EncodeServiceV2.kt
@@ -134,7 +134,7 @@ class EncodeServiceV2(
                 data = ProcesserEncodeWorkPerformed(
                     status = Status.COMPLETED,
                     producedBy = serviceId,
-                    derivedFromEventId = task.eventId,
+                    derivedFromEventId = task.derivedFromEventId,
                     outFile = outputFile
                 )
             )
@@ -162,7 +162,7 @@ class EncodeServiceV2(
                 status = Status.ERROR,
                 message = message,
                 producedBy = serviceId,
-                derivedFromEventId = task.eventId
+                derivedFromEventId = task.derivedFromEventId,
             )
         )
         sendProgress(
diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/ExtractServiceV2.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/ExtractServiceV2.kt
index a171ac8a..9968f048 100644
--- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/ExtractServiceV2.kt
+++ b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/services/ExtractServiceV2.kt
@@ -110,7 +110,7 @@ class ExtractServiceV2(
                 data = ProcesserExtractWorkPerformed(
                     status = Status.COMPLETED,
                     producedBy = serviceId,
-                    derivedFromEventId = task.eventId,
+                    derivedFromEventId = task.derivedFromEventId,
                     outFile = outputFile
                 )
             )
@@ -138,7 +138,7 @@ class ExtractServiceV2(
                 status = Status.ERROR,
                 message = message,
                 producedBy = serviceId,
-                derivedFromEventId = task.eventId
+                derivedFromEventId = task.derivedFromEventId,
             )
         )
         sendProgress(
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/task/Task.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/task/Task.kt
index 4a64d069..2426e607 100644
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/task/Task.kt
+++ b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/task/Task.kt
@@ -10,6 +10,7 @@ data class Task(
     val consumed: Boolean = false,
     val task: TaskType,
     val eventId: String,
+    val derivedFromEventId: String? = null,
     val data: TaskData? = null,
     val created: LocalDateTime,
     val lastCheckIn: LocalDateTime? = null
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/task/TaskDoz.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/task/TaskDoz.kt
index c4144bf6..f26c5670 100644
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/task/TaskDoz.kt
+++ b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/task/TaskDoz.kt
@@ -35,6 +35,7 @@ class TaskDoz {
             consumed = row[tasks.consumed],
             task = taskType,
             eventId = row[tasks.eventId],
+            derivedFromEventId = row[tasks.derivedFromEventId],
             data = dzdata(taskType, data),
             created = row[tasks.created],
             lastCheckIn = row[tasks.lastCheckIn]