From 671b367957f6a34b25addee1d109e5309947c24d Mon Sep 17 00:00:00 2001 From: bskjon Date: Wed, 19 Mar 2025 23:20:54 +0100 Subject: [PATCH] log append --- .../iktdev/mediaprocessing/processer/ProcesserEnv.kt | 2 ++ .../mediaprocessing/processer/ffmpeg/FfmpegRunner.kt | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ProcesserEnv.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ProcesserEnv.kt index 7f55e117..5ca0385c 100644 --- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ProcesserEnv.kt +++ b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ProcesserEnv.kt @@ -15,5 +15,7 @@ class ProcesserEnv { val encodeLogDirectory = logDirectory.using("encode") val extractLogDirectory = logDirectory.using("extract") + + val fullLogging = System.getenv("FullLogging").toBoolean() } } \ No newline at end of file diff --git a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/FfmpegRunner.kt b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/FfmpegRunner.kt index 625d79bd..e747332c 100644 --- a/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/FfmpegRunner.kt +++ b/apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/FfmpegRunner.kt @@ -1,5 +1,6 @@ package no.iktdev.mediaprocessing.processer.ffmpeg +import com.fasterxml.jackson.core.io.UTF8Writer import com.github.pgreze.process.Redirect import com.github.pgreze.process.process import kotlinx.coroutines.* @@ -9,6 +10,7 @@ import no.iktdev.mediaprocessing.processer.ProcesserEnv import no.iktdev.mediaprocessing.processer.ffmpeg.progress.FfmpegDecodedProgress import no.iktdev.mediaprocessing.processer.ffmpeg.progress.FfmpegProgressDecoder import java.io.File +import java.io.FileOutputStream import java.time.LocalDateTime import java.time.format.DateTimeFormatter import java.util.* @@ -72,7 +74,9 @@ class FfmpegRunner( stdout = Redirect.CAPTURE, stderr = Redirect.CAPTURE, consumer = { - //log.info { it } + if (ProcesserEnv.fullLogging) { + log.info { it } + } onOutputChanged(it) }, destroyForcibly = true @@ -107,7 +111,7 @@ class FfmpegRunner( fun onOutputChanged(line: String) { outputCache.add(line) writeToLog(line) - // toList is needed to prevent mutability. + decoder.parseVideoProgress(outputCache.toList())?.let { decoded -> try { val _progress = decoder.getProgress(decoded) @@ -123,7 +127,7 @@ class FfmpegRunner( } fun writeToLog(line: String) { - logFile.printWriter().use { + FileOutputStream(logFile, true).bufferedWriter(Charsets.UTF_8).use { it.appendLine(line) } }