From 8ea7c4ce7ebe32be741241ae8d1533cdd2b39c5f Mon Sep 17 00:00:00 2001 From: Brage Date: Mon, 24 Jul 2023 00:26:28 +0200 Subject: [PATCH] Adjusted stringing --- .../no/iktdev/streamit/content/encode/runner/EncodeDaemon.kt | 2 +- .../no/iktdev/streamit/content/encode/runner/ExtractDaemon.kt | 2 +- 2 files changed, 2 insertions(+), 2 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 c847d075..0a98ca22 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 @@ -41,7 +41,7 @@ class EncodeDaemon(val referenceId: String, val work: EncodeWork, val daemonInte File(work.outFile).parentFile.mkdirs() } val adjustedArgs = listOf( - "-hide_banner", "-i", work.inFile, *work.arguments.toTypedArray(), work.outFile, + "-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(" ")}" } 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 fd36722f..15f71f95 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 @@ -19,7 +19,7 @@ class ExtractDaemon(val referenceId: String, val work: ExtractWork, val daemonIn File(work.outFile).parentFile.mkdirs() } val adjustedArgs = listOf( - "-hide_banner", "-i", work.inFile, *work.arguments.toTypedArray(), work.outFile, + "-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(" ")}" }