diff --git a/CommonCode/src/main/java/no/iktdev/streamit/content/common/dto/reader/work/ConvertWork.kt b/CommonCode/src/main/java/no/iktdev/streamit/content/common/dto/reader/work/ConvertWork.kt index 4bcdf4f8..635ec6e5 100644 --- a/CommonCode/src/main/java/no/iktdev/streamit/content/common/dto/reader/work/ConvertWork.kt +++ b/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, diff --git a/CommonCode/src/main/java/no/iktdev/streamit/content/common/dto/reader/work/EncodeWork.kt b/CommonCode/src/main/java/no/iktdev/streamit/content/common/dto/reader/work/EncodeWork.kt index b43b4d49..cc26a1ab 100644 --- a/CommonCode/src/main/java/no/iktdev/streamit/content/common/dto/reader/work/EncodeWork.kt +++ b/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, diff --git a/CommonCode/src/main/java/no/iktdev/streamit/content/common/dto/reader/work/ExtractWork.kt b/CommonCode/src/main/java/no/iktdev/streamit/content/common/dto/reader/work/ExtractWork.kt index f6c5c413..92585bd4 100644 --- a/CommonCode/src/main/java/no/iktdev/streamit/content/common/dto/reader/work/ExtractWork.kt +++ b/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, diff --git a/CommonCode/src/main/java/no/iktdev/streamit/content/common/dto/reader/work/WorkBase.kt b/CommonCode/src/main/java/no/iktdev/streamit/content/common/dto/reader/work/WorkBase.kt index 8b7a45eb..a162ebcf 100644 --- a/CommonCode/src/main/java/no/iktdev/streamit/content/common/dto/reader/work/WorkBase.kt +++ b/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 diff --git a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/EncodeDaemon.kt b/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/EncodeDaemon.kt index 57bc237c..c847d075 100644 --- a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/EncodeDaemon.kt +++ b/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() 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) } diff --git a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/ExtractDaemon.kt b/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/ExtractDaemon.kt index e9673527..fd36722f 100644 --- a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/runner/ExtractDaemon.kt +++ b/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() @@ -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) }