From 98179263f8bf0bcd5f5fc652a6eeb4563c72d625 Mon Sep 17 00:00:00 2001 From: Brage Date: Mon, 24 Jul 2023 01:26:07 +0200 Subject: [PATCH] Adjustment --- .../iktdev/streamit/content/encode/runner/EncodeDaemon.kt | 7 ++++--- .../iktdev/streamit/content/encode/runner/ExtractDaemon.kt | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) 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 2e809e20..769570f1 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 @@ -37,11 +37,12 @@ class EncodeDaemon(val referenceId: String, val work: EncodeWork, val daemonInte } suspend fun runUsingWorkItem(): Int { - if (!File(work.outFile).parentFile.exists()) { - File(work.outFile).parentFile.mkdirs() + val outFile = File(work.outFile) + if (!outFile.parentFile.exists()) { + outFile.parentFile.mkdirs() } val adjustedArgs = listOf( - "-hide_banner", "-i", "'${work.inFile}'", *work.arguments.toTypedArray(), "'${work.outFile}'", + "-hide_banner", "-i", File(work.inFile).absolutePath, *work.arguments.toTypedArray(), outFile.absolutePath, "-progress", "pipe:1" ) + if (EncodeEnv.allowOverwrite) listOf("-y") else emptyList() logger.info { "$referenceId @ ${work.workId} ${adjustedArgs.joinToString(" ")}" } 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 15f71f95..e573a3fc 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 @@ -15,11 +15,12 @@ class ExtractDaemon(val referenceId: String, val work: ExtractWork, val daemonIn suspend fun runUsingWorkItem(): Int { - if (!File(work.outFile).parentFile.exists()) { - File(work.outFile).parentFile.mkdirs() + val outFile = File(work.outFile) + if (!outFile.parentFile.exists()) { + outFile.parentFile.mkdirs() } val adjustedArgs = listOf( - "-hide_banner", "-i", "'${work.inFile}'", *work.arguments.toTypedArray(), "'${work.outFile}'", + "-hide_banner", "-i", File(work.inFile).absolutePath, *work.arguments.toTypedArray(), outFile.absolutePath, "-progress", "pipe:1" ) + if (EncodeEnv.allowOverwrite) listOf("-y") else emptyList() logger.info { "$referenceId @ ${work.workId} ${adjustedArgs.joinToString(" ")}" }