allow locking output format

fixes #615

public/configStore.js

@@ -37,6 +37,7 @@ const defaults = {
   keyboardSeekAccFactor: 1.03,
   keyboardNormalSeekSpeed: 1,
   enableTransferTimestamps: true,
+  outFormatLocked: undefined,
 };
 
 // For portable app: https://github.com/mifi/lossless-cut/issues/645

src/App.jsx

@@ -148,7 +148,7 @@ const App = memo(() => {
   const isCustomFormatSelected = fileFormat !== detectedFileFormat;
 
   const {
-    captureFormat, setCaptureFormat, customOutDir, setCustomOutDir, keyframeCut, setKeyframeCut, preserveMovData, setPreserveMovData, movFastStart, setMovFastStart, avoidNegativeTs, setAvoidNegativeTs, autoMerge, setAutoMerge, timecodeShowFrames, setTimecodeShowFrames, invertCutSegments, setInvertCutSegments, autoExportExtraStreams, setAutoExportExtraStreams, askBeforeClose, setAskBeforeClose, enableAskForImportChapters, setEnableAskForImportChapters, enableAskForFileOpenAction, setEnableAskForFileOpenAction, muted, setMuted, autoSaveProjectFile, setAutoSaveProjectFile, wheelSensitivity, setWheelSensitivity, invertTimelineScroll, setInvertTimelineScroll, language, setLanguage, ffmpegExperimental, setFfmpegExperimental, hideNotifications, setHideNotifications, autoLoadTimecode, setAutoLoadTimecode, autoDeleteMergedSegments, setAutoDeleteMergedSegments, exportConfirmEnabled, setExportConfirmEnabled, segmentsToChapters, setSegmentsToChapters, preserveMetadataOnMerge, setPreserveMetadataOnMerge, simpleMode, setSimpleMode, outSegTemplate, setOutSegTemplate, keyboardSeekAccFactor, setKeyboardSeekAccFactor, keyboardNormalSeekSpeed, setKeyboardNormalSeekSpeed, enableTransferTimestamps, setEnableTransferTimestamps,
+    captureFormat, setCaptureFormat, customOutDir, setCustomOutDir, keyframeCut, setKeyframeCut, preserveMovData, setPreserveMovData, movFastStart, setMovFastStart, avoidNegativeTs, setAvoidNegativeTs, autoMerge, setAutoMerge, timecodeShowFrames, setTimecodeShowFrames, invertCutSegments, setInvertCutSegments, autoExportExtraStreams, setAutoExportExtraStreams, askBeforeClose, setAskBeforeClose, enableAskForImportChapters, setEnableAskForImportChapters, enableAskForFileOpenAction, setEnableAskForFileOpenAction, muted, setMuted, autoSaveProjectFile, setAutoSaveProjectFile, wheelSensitivity, setWheelSensitivity, invertTimelineScroll, setInvertTimelineScroll, language, setLanguage, ffmpegExperimental, setFfmpegExperimental, hideNotifications, setHideNotifications, autoLoadTimecode, setAutoLoadTimecode, autoDeleteMergedSegments, setAutoDeleteMergedSegments, exportConfirmEnabled, setExportConfirmEnabled, segmentsToChapters, setSegmentsToChapters, preserveMetadataOnMerge, setPreserveMetadataOnMerge, simpleMode, setSimpleMode, outSegTemplate, setOutSegTemplate, keyboardSeekAccFactor, setKeyboardSeekAccFactor, keyboardNormalSeekSpeed, setKeyboardNormalSeekSpeed, enableTransferTimestamps, setEnableTransferTimestamps, outFormatLocked, setOutFormatLocked,
   } = useUserPreferences();
 
   const {
@@ -177,6 +177,15 @@ const App = memo(() => {
 
   const isFileOpened = !!filePath;
 
+  const onOutFormatLockedClick = () => setOutFormatLocked((v) => (v ? undefined : fileFormat));
+
+  function onOutputFormatUserChange(newFormat) {
+    setFileFormat(newFormat);
+    if (outFormatLocked) {
+      setOutFormatLocked(newFormat === detectedFileFormat ? undefined : newFormat);
+    }
+  }
+
   function setTimelineMode(newMode) {
     if (newMode === 'waveform') {
       setWaveformEnabled(v => !v);
@@ -1286,7 +1295,7 @@ const App = memo(() => {
       ])));
 
       setFileNameTitle(fp);
-      setFileFormat(ff);
+      setFileFormat(outFormatLocked || ff);
       setDetectedFileFormat(ff);
       setFileFormatData(fd);
 
@@ -1340,7 +1349,7 @@ const App = memo(() => {
     } finally {
       setWorking();
     }
-  }, [resetState, working, createDummyVideo, loadEdlFile, getEdlFilePath, getHtml5ifiedPath, loadCutSegments, enableAskForImportChapters, showUnsupportedFileMessage, autoLoadTimecode]);
+  }, [resetState, working, createDummyVideo, loadEdlFile, getEdlFilePath, getHtml5ifiedPath, loadCutSegments, enableAskForImportChapters, showUnsupportedFileMessage, autoLoadTimecode, outFormatLocked]);
 
   const toggleHelp = useCallback(() => setHelpVisible(val => !val), []);
   const toggleSettings = useCallback(() => setSettingsVisible(val => !val), []);
@@ -1905,7 +1914,7 @@ const App = memo(() => {
 
   const renderOutFmt = useCallback((props) => (
     // eslint-disable-next-line react/jsx-props-no-spreading
-    <Select value={fileFormat || ''} title={i18n.t('Output format')} onChange={withBlur(e => setFileFormat(e.target.value))} {...props}>
+    <Select value={fileFormat || ''} title={i18n.t('Output format')} onChange={withBlur(e => onOutputFormatUserChange(e.target.value))} {...props}>
       <option key="disabled1" value="" disabled>{i18n.t('Format')}</option>
 
       {detectedFileFormat && (
@@ -2094,6 +2103,7 @@ const App = memo(() => {
           toggleStripAudio={toggleStripAudio}
           customOutDir={customOutDir}
           changeOutDir={changeOutDir}
+          isCustomFormatSelected={isCustomFormatSelected}
           renderOutFmt={renderOutFmt}
           toggleHelp={toggleHelp}
           toggleSettings={toggleSettings}
@@ -2105,6 +2115,9 @@ const App = memo(() => {
           setAutoMerge={setAutoMerge}
           autoDeleteMergedSegments={autoDeleteMergedSegments}
           setAutoDeleteMergedSegments={setAutoDeleteMergedSegments}
+          outFormatLocked={outFormatLocked}
+          onOutFormatLockedClick={onOutFormatLockedClick}
+          simpleMode={simpleMode}
         />
       </div>
 

src/TopMenu.jsx

@@ -1,20 +1,27 @@
 import React, { memo } from 'react';
 import { IoIosHelpCircle, IoIosSettings } from 'react-icons/io';
+import { FaLock, FaUnlock } from 'react-icons/fa';
 import { Button } from 'evergreen-ui';
 import { useTranslation } from 'react-i18next';
 
 import MergeExportButton from './components/MergeExportButton';
 
 import { withBlur } from './util';
+import { primaryTextColor } from './colors';
 
 
 const TopMenu = memo(({
   filePath, copyAnyAudioTrack, toggleStripAudio, customOutDir, changeOutDir,
   renderOutFmt, toggleHelp, numStreamsToCopy, numStreamsTotal, setStreamsSelectorShown, toggleSettings,
-  enabledOutSegments, autoMerge, setAutoMerge, autoDeleteMergedSegments, setAutoDeleteMergedSegments,
+  enabledOutSegments, autoMerge, setAutoMerge, autoDeleteMergedSegments, setAutoDeleteMergedSegments, isCustomFormatSelected, onOutFormatLockedClick, simpleMode, outFormatLocked,
 }) => {
   const { t } = useTranslation();
 
+  function renderFormatLock() {
+    const Icon = outFormatLocked ? FaLock : FaUnlock;
+    return <Icon onClick={onOutFormatLockedClick} title={t('Lock/unlock output format')} size={14} style={{ marginRight: 7, marginLeft: 2, color: outFormatLocked ? primaryTextColor : undefined }} />;
+  }
+
   return (
     <>
       {filePath && (
@@ -45,9 +52,15 @@ const TopMenu = memo(({
         {customOutDir ? t('Working dir set') : t('Working dir unset')}
       </Button>
 
-      {filePath && renderOutFmt({ height: 20, maxWidth: 100 })}
+      {filePath && (
+        <>
+          {renderOutFmt({ height: 20, maxWidth: 100 })}
+
+          {!simpleMode && (isCustomFormatSelected || outFormatLocked) && renderFormatLock()}
 
-      {filePath && <MergeExportButton autoMerge={autoMerge} enabledOutSegments={enabledOutSegments} setAutoMerge={setAutoMerge} autoDeleteMergedSegments={autoDeleteMergedSegments} setAutoDeleteMergedSegments={setAutoDeleteMergedSegments} />}
+          <MergeExportButton autoMerge={autoMerge} enabledOutSegments={enabledOutSegments} setAutoMerge={setAutoMerge} autoDeleteMergedSegments={autoDeleteMergedSegments} setAutoDeleteMergedSegments={setAutoDeleteMergedSegments} />
+        </>
+      )}
 
       <IoIosHelpCircle size={24} role="button" onClick={toggleHelp} style={{ verticalAlign: 'middle', marginLeft: 5 }} />
       <IoIosSettings size={24} role="button" onClick={toggleSettings} style={{ verticalAlign: 'middle', marginLeft: 5 }} />

src/hooks/useUserPreferences.js

@@ -84,11 +84,16 @@ export default () => {
   useEffect(() => safeSetConfig('keyboardNormalSeekSpeed', keyboardNormalSeekSpeed), [keyboardNormalSeekSpeed]);
   const [enableTransferTimestamps, setEnableTransferTimestamps] = useState(configStore.get('enableTransferTimestamps'));
   useEffect(() => safeSetConfig('enableTransferTimestamps', enableTransferTimestamps), [enableTransferTimestamps]);
+  const [outFormatLocked, setOutFormatLocked] = useState(configStore.get('outFormatLocked'));
+  useEffect(() => safeSetConfig('outFormatLocked', outFormatLocked), [outFormatLocked]);
 
 
   // NOTE! This useEffect must be placed after all usages of firstUpdateRef.current (safeSetConfig)
   useEffect(() => {
     firstUpdateRef.current = false;
+    return () => {
+      firstUpdateRef.current = true;
+    };
   }, []);
 
   return {
@@ -152,5 +157,7 @@ export default () => {
     setKeyboardNormalSeekSpeed,
     enableTransferTimestamps,
     setEnableTransferTimestamps,
+    outFormatLocked,
+    setOutFormatLocked,
   };
 };