From c4da613344fb851e0e99f279edbe6d4fa5645da8 Mon Sep 17 00:00:00 2001 From: bskjon Date: Mon, 6 Jan 2025 02:06:06 +0100 Subject: [PATCH] Move issue --- .../tasksV2/mapping/ExtractWorkArgumentsMapping.kt | 2 +- .../tasksV2/mapping/store/ContentCompletionMover.kt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/ExtractWorkArgumentsMapping.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/ExtractWorkArgumentsMapping.kt index d8056f66..ab234450 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/ExtractWorkArgumentsMapping.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/ExtractWorkArgumentsMapping.kt @@ -21,7 +21,7 @@ class ExtractWorkArgumentsMapping( language = it.language, arguments = it.codecParameters + it.optionalParameters + listOf("-map", "0:s:${it.index}"), outputFileName = "${outFileFullName}.${it.language}.${it.format}", - storeFileName = "${outFileFullName}.${it.format}" + storeFileName = outFileFullName ) } diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentCompletionMover.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentCompletionMover.kt index 8f2673a5..34cc6e57 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentCompletionMover.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentCompletionMover.kt @@ -64,7 +64,7 @@ class ContentCompletionMover(val collection: String, val events: List) { data class MovableSubtitle( val language: String, val cachedFile: File, - val storeFile: String + val storeFileName: String ) fun getMovableSubtitles(): List { @@ -78,14 +78,14 @@ class ContentCompletionMover(val collection: String, val events: List) { extracted.map { MovableSubtitle( language = it.language, cachedFile = File(it.outputFile), - storeFile = it.storeFileName + storeFileName = it.storeFileName ) }.also { items.addAll(it) } converted.flatMap { it.outputFiles.map { outFile -> MovableSubtitle( language = it.language, cachedFile = File(outFile), - storeFile = it.baseName + storeFileName = it.baseName ) } }.also { items.addAll(it) } @@ -112,7 +112,7 @@ class ContentCompletionMover(val collection: String, val events: List) { it.mkdirs() } } - val storeFile = languageFolder.using(movable.storeFile) + val storeFile = languageFolder.using("${movable.storeFileName}.${movable.cachedFile.extension}") val success = movable.cachedFile.moveTo(storeFile) if (success) { moved.add(MovedSubtitle(movable.language, movable.cachedFile.absolutePath, storeFile.absolutePath))