The swiss army knife of lossless video/audio editing
in simple mode don't overwrite merged template
Mikael Finstad2606229013cd
diff --git a/src/renderer/src/components/ConcatDialog.tsx b/src/renderer/src/components/ConcatDialog.tsxindex d2ac3d99..54589b70 100644--- a/src/renderer/src/components/ConcatDialog.tsx+++ b/src/renderer/src/components/ConcatDialog.tsx@@ -51,7 +51,7 @@ type Problem = {values: [ProblemValue, ProblemValue],});-function ConcatDialog({ isShown, onHide, paths, mergedFileTemplate, generateMergedFileNames, onConcat, alwaysConcatMultipleFiles, setAlwaysConcatMultipleFiles, fileFormat, setFileFormat, detectedFileFormat, setDetectedFileFormat, onOutputFormatUserChange }: {+function ConcatDialog({ isShown, onHide, paths, mergedFileTemplate: storedMergedFileTemplate, generateMergedFileNames, onConcat, alwaysConcatMultipleFiles, setAlwaysConcatMultipleFiles, fileFormat, setFileFormat, detectedFileFormat, setDetectedFileFormat, onOutputFormatUserChange }: {isShown: boolean,onHide: () => void,paths: string[],@@ -67,7 +67,9 @@ function ConcatDialog({ isShown, onHide, paths, mergedFileTemplate, generateMergonOutputFormatUserChange: (newFormat: string) => void,}) {const { t } = useTranslation();- const { preserveMovData, setPreserveMovData, segmentsToChapters, setSegmentsToChapters, preserveMetadataOnMerge, setPreserveMetadataOnMerge, customOutDir, simpleMode, setMergedFileTemplate, outFormatLocked } = useUserSettings();+ const { preserveMovData, setPreserveMovData, segmentsToChapters, setSegmentsToChapters, preserveMetadataOnMerge, setPreserveMetadataOnMerge, customOutDir, simpleMode, setMergedFileTemplate: setStoredMergedFileTemplate, outFormatLocked } = useUserSettings();++ // Note: all state here is preserved when dialog is closedconst [includeAllStreams, setIncludeAllStreams] = useState(false);const [allFilesMeta, setAllFilesMeta] = useState<Record<string, { ffprobeMeta: FileFfprobeMeta, stats: FileStats }>>({});@@ -90,14 +92,28 @@ function ConcatDialog({ isShown, onHide, paths, mergedFileTemplate, generateMergreturn generateMergedFileNames({ template, sourceFiles, fileFormat, outputDir, epochMs: uniqueSuffix });}, [allFilesMeta, fileFormat, generateMergedFileNames, outputDir, paths, uniqueSuffix]);+ // for simple mode, we want to auto-generate the merged file template based on the first file, so we don't store it in user settings, as that could overwrite what they already have there+ // https://github.com/mifi/lossless-cut/issues/2927#issuecomment-4773155758+ const [tempMergedFileTemplate, setTempMergedFileTemplate] = useState<string | undefined>(defaultMergedFileTemplate);+ const mergedFileTemplate = simpleMode ? (tempMergedFileTemplate ?? defaultMergedFileTemplate) : storedMergedFileTemplate;+ const setMergedFileTemplate = simpleMode ? setTempMergedFileTemplate : setStoredMergedFileTemplate;+useEffect(() => {if (!isShown) {// todo// eslint-disable-next-line react-hooks/set-state-in-effectsetAllFilesMeta({});+ setTempMergedFileTemplate(defaultMergedFileTemplate);}}, [isShown, setDetectedFileFormat, setFileFormat]);+ useEffect(() => {+ if (simpleMode) {+ // eslint-disable-next-line react-hooks/set-state-in-effect+ setEnableReadFileMeta(true);+ }+ }, [simpleMode]);+useEffect(() => {const abortController = new AbortController();