More logging

CommonCode/src/main/java/no/iktdev/streamit/content/common/dto/reader/work/ConvertWork.kt

@@ -1,6 +1,9 @@
 package no.iktdev.streamit.content.common.dto.reader.work
 
+import java.util.*
+
 data class ConvertWork(
+    override val workId: String = UUID.randomUUID().toString(),
     override val collection: String,
     val language: String,
     override val inFile: String,

CommonCode/src/main/java/no/iktdev/streamit/content/common/dto/reader/work/EncodeWork.kt

@@ -1,6 +1,9 @@
 package no.iktdev.streamit.content.common.dto.reader.work
 
+import java.util.*
+
 data class EncodeWork(
+    override val workId: String = UUID.randomUUID().toString(),
     override val collection: String,
     override val inFile: String,
     override val outFile: String,

CommonCode/src/main/java/no/iktdev/streamit/content/common/dto/reader/work/ExtractWork.kt

@@ -1,6 +1,9 @@
 package no.iktdev.streamit.content.common.dto.reader.work
 
+import java.util.*
+
 data class ExtractWork(
+    override val workId: String = UUID.randomUUID().toString(),
     override val collection: String,
     val language: String,
     override val inFile: String,

CommonCode/src/main/java/no/iktdev/streamit/content/common/dto/reader/work/WorkBase.kt

@@ -3,7 +3,7 @@ package no.iktdev.streamit.content.common.dto.reader.work
 import java.util.UUID
 
 abstract class WorkBase(
-    val workId: String = UUID.randomUUID().toString(),
+    @Transient open val workId: String = UUID.randomUUID().toString(),
     @Transient open val collection: String,
     @Transient open val inFile: String,
     @Transient open val outFile: String

Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/EncodeDaemon.kt

@@ -1,5 +1,6 @@
 package no.iktdev.streamit.content.encode.runner
 
+import mu.KotlinLogging
 import no.iktdev.streamit.content.encode.EncodeEnv
 import no.iktdev.exfl.observable.ObservableList
 import no.iktdev.exfl.observable.observableListOf
@@ -10,6 +11,8 @@ import no.iktdev.streamit.content.encode.progress.Progress
 import no.iktdev.streamit.content.encode.progress.ProgressDecoder
 import java.io.File
 
+private val logger = KotlinLogging.logger {}
+
 class EncodeDaemon(val referenceId: String, val work: EncodeWork, val daemonInterface: IEncodeListener): IDaemon {
     var outputCache = observableListOf<String>()
     private val decoder = ProgressDecoder()
@@ -41,6 +44,7 @@ class EncodeDaemon(val referenceId: String, val work: EncodeWork, val daemonInte
             "-hide_banner", "-i", work.inFile, *work.arguments.toTypedArray(), work.outFile,
             "-progress", "pipe:1"
         ) + if (EncodeEnv.allowOverwrite) listOf("-y") else emptyList()
+        logger.info { "$referenceId @ ${work.workId} ${adjustedArgs.joinToString(" ")}" }
         return Daemon(EncodeEnv.ffmpeg, this).run(adjustedArgs)
     }
 

Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/ExtractDaemon.kt

@@ -1,5 +1,6 @@
 package no.iktdev.streamit.content.encode.runner
 
+import mu.KotlinLogging
 import no.iktdev.streamit.content.encode.EncodeEnv
 import no.iktdev.exfl.observable.observableListOf
 import no.iktdev.streamit.content.common.deamon.Daemon
@@ -7,6 +8,7 @@ import no.iktdev.streamit.content.common.deamon.IDaemon
 import no.iktdev.streamit.content.common.dto.reader.work.ExtractWork
 import no.iktdev.streamit.content.encode.progress.Progress
 import java.io.File
+private val logger = KotlinLogging.logger {}
 
 class ExtractDaemon(val referenceId: String, val work: ExtractWork, val daemonInterface: IExtractListener): IDaemon {
     var outputCache = observableListOf<String>()
@@ -20,6 +22,7 @@ class ExtractDaemon(val referenceId: String, val work: ExtractWork, val daemonIn
             "-hide_banner", "-i", work.inFile, *work.arguments.toTypedArray(), work.outFile,
             "-progress", "pipe:1"
         ) + if (EncodeEnv.allowOverwrite) listOf("-y") else emptyList()
+        logger.info { "$referenceId @ ${work.workId} ${adjustedArgs.joinToString(" ")}" }
         return Daemon(EncodeEnv.ffmpeg, this).run(adjustedArgs)
     }