From bd50d25b85d3a3a475968a4129704a859bb09ed5 Mon Sep 17 00:00:00 2001
From: Mikael Finstad <finstaden@gmail.com>
Date: Wed, 23 Feb 2022 22:13:07 +0800
Subject: [PATCH] refactor/reuse

---
 src/App.jsx                      | 28 ++++++++++++++++------------
 src/components/ConcatDialog.jsx  |  7 ++++---
 src/ffmpeg.js                    | 22 +++++-----------------
 src/hooks/useFfmpegOperations.js |  4 ++--
 4 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/src/App.jsx b/src/App.jsx
index e6003360..f9842e9c 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -50,8 +50,8 @@ import { controlsBackground } from './colors';
 import { captureFrameFromTag, captureFrameFfmpeg } from './capture-frame';
 import {
   defaultProcessedCodecTypes, getStreamFps, isCuttingStart, isCuttingEnd,
-  readFileMeta, getFormatData, renderThumbnails as ffmpegRenderThumbnails,
-  extractStreams, getAllStreams, runStartupCheck,
+  readFileMeta, getSmarterOutFormat, renderThumbnails as ffmpegRenderThumbnails,
+  extractStreams, runStartupCheck,
   isAudioDefinitelyNotSupported, isIphoneHevc, tryMapChaptersToEdl,
   getDuration, getTimecodeFromStreams, createChaptersFromSegments, extractSubtitleTrack,
 } from './ffmpeg';
@@ -199,7 +199,7 @@ const App = memo(() => {
   } = useUserPreferences();
 
   const {
-    concatFiles, html5ifyDummy, cutMultiple, autoMergeSegments, html5ify, fixInvalidDuration,
+    concatFiles, html5ifyDummy, cutMultiple, autoConcatCutSegments, html5ify, fixInvalidDuration,
   } = useFfmpegOperations({ filePath, enableTransferTimestamps });
 
   const outSegTemplateOrDefault = outSegTemplate || defaultOutSegTemplate;
@@ -1227,7 +1227,7 @@ const App = memo(() => {
 
         const chapterNames = segmentsToChapters && !invertCutSegments ? segmentsToExport.map((s) => s.name) : undefined;
 
-        await autoMergeSegments({
+        await autoConcatCutSegments({
           customOutDir,
           outFormat: fileFormat,
           isCustomFormatSelected,
@@ -1275,7 +1275,7 @@ const App = memo(() => {
       setWorking();
       setCutProgress();
     }
-  }, [numStreamsToCopy, setWorking, segmentsToChaptersOnly, enabledSegments, outSegTemplateOrDefault, generateOutSegFileNames, segmentsToExport, getOutSegError, cutMultiple, outputDir, fileFormat, duration, isRotationSet, effectiveRotation, copyFileStreams, keyframeCut, shortestFlag, ffmpegExperimental, preserveMovData, movFastStart, avoidNegativeTs, customTagsByFile, customTagsByStreamId, dispositionByStreamId, willMerge, fileFormatData, mainStreams, exportExtraStreams, hideAllNotifications, segmentsToChapters, invertCutSegments, autoMergeSegments, customOutDir, isCustomFormatSelected, autoDeleteMergedSegments, preserveMetadataOnMerge, filePath, nonCopiedExtraStreams, handleCutFailed]);
+  }, [numStreamsToCopy, setWorking, segmentsToChaptersOnly, enabledSegments, outSegTemplateOrDefault, generateOutSegFileNames, segmentsToExport, getOutSegError, cutMultiple, outputDir, fileFormat, duration, isRotationSet, effectiveRotation, copyFileStreams, keyframeCut, shortestFlag, ffmpegExperimental, preserveMovData, movFastStart, avoidNegativeTs, customTagsByFile, customTagsByStreamId, dispositionByStreamId, willMerge, fileFormatData, mainStreams, exportExtraStreams, hideAllNotifications, segmentsToChapters, invertCutSegments, autoConcatCutSegments, customOutDir, isCustomFormatSelected, autoDeleteMergedSegments, preserveMetadataOnMerge, filePath, nonCopiedExtraStreams, handleCutFailed]);
 
   const onExportPress = useCallback(async () => {
     if (!filePath || workingRef.current) return;
@@ -1405,8 +1405,13 @@ const App = memo(() => {
       const fileMeta = await readFileMeta(fp);
       // console.log('file meta read', fileMeta);
 
+      const fileFormatNew = await getSmarterOutFormat(fp, fileMeta.format);
+
       const { streams } = fileMeta;
-      if (!fileMeta.fileFormat) throw new Error('Unable to determine file format');
+
+      // console.log(streams, fileMeta.format, fileFormat);
+
+      if (!fileFormatNew) throw new Error('Unable to determine file format');
 
       const timecode = autoLoadTimecode ? getTimecodeFromStreams(streams) : undefined;
 
@@ -1440,7 +1445,7 @@ const App = memo(() => {
         toast.fire({ icon: 'info', text: i18n.t('The audio track is not supported. You can convert to a supported format from the menu') });
       }
 
-      const validDuration = isDurationValid(parseFloat(fileMeta.formatData.duration));
+      const validDuration = isDurationValid(parseFloat(fileMeta.format.duration));
       const hasLoadedExistingHtml5FriendlyFile = await checkAndSetExistingHtml5FriendlyFile();
 
       // 'fastest' works with almost all video files
@@ -1480,9 +1485,9 @@ const App = memo(() => {
         setMainAudioStream(audioStream);
         setCopyStreamIdsForPath(fp, () => copyStreamIdsForPathNew);
         setFileNameTitle(fp);
-        setFileFormat(outFormatLocked || fileMeta.fileFormat);
-        setDetectedFileFormat(fileMeta.fileFormat);
-        setFileFormatData(fileMeta.formatData);
+        setFileFormat(outFormatLocked || fileFormatNew);
+        setDetectedFileFormat(fileFormatNew);
+        setFileFormatData(fileMeta.format);
         setChapters(fileMeta.chapters);
 
         // This needs to be last, because it triggers <video> to load the video
@@ -1832,8 +1837,7 @@ const App = memo(() => {
 
   const addStreamSourceFile = useCallback(async (path) => {
     if (externalStreamFiles[path]) return;
-    const { streams } = await getAllStreams(path);
-    const formatData = await getFormatData(path);
+    const { streams, format: formatData } = await readFileMeta(path);
     // console.log('streams', streams);
     setExternalStreamFiles(old => ({ ...old, [path]: { streams, formatData } }));
     setCopyStreamIdsForPath(path, () => fromPairs(streams.map(({ index }) => [index, true])));
diff --git a/src/components/ConcatDialog.jsx b/src/components/ConcatDialog.jsx
index 4a2633fd..ef3fb809 100644
--- a/src/components/ConcatDialog.jsx
+++ b/src/components/ConcatDialog.jsx
@@ -5,7 +5,7 @@ import { sortableContainer, sortableElement } from 'react-sortable-hoc';
 import arrayMove from 'array-move';
 import { AiOutlineMergeCells } from 'react-icons/ai';
 
-import { readFileMeta } from '../ffmpeg';
+import { readFileMeta, getSmarterOutFormat } from '../ffmpeg';
 import useFileFormatState from '../hooks/useFileFormatState';
 import OutputFormatSelect from './OutputFormatSelect';
 
@@ -59,9 +59,10 @@ const ConcatDialog = memo(({
       setFileFormat();
       setDetectedFileFormat();
       const fileMeta = await readFileMeta(firstPath);
+      const fileFormatNew = await getSmarterOutFormat(firstPath, fileMeta.format);
       if (aborted) return;
-      setFileFormat(fileMeta.fileFormat);
-      setDetectedFileFormat(fileMeta.fileFormat);
+      setFileFormat(fileFormatNew);
+      setDetectedFileFormat(fileFormatNew);
     })().catch(console.error);
     return () => {
       aborted = true;
diff --git a/src/ffmpeg.js b/src/ffmpeg.js
index a67049c3..1242cb34 100644
--- a/src/ffmpeg.js
+++ b/src/ffmpeg.js
@@ -191,8 +191,8 @@ export async function tryMapChaptersToEdl(chapters) {
   }
 }
 
-export async function getFormatData(filePath) {
-  console.log('getFormatData', filePath);
+async function readFormatData(filePath) {
+  console.log('readFormatData', filePath);
 
   const { stdout } = await runFfprobe([
     '-of', 'json', '-show_format', '-i', filePath, '-hide_banner',
@@ -202,7 +202,7 @@ export async function getFormatData(filePath) {
 
 
 export async function getDuration(filePath) {
-  return parseFloat((await getFormatData(filePath)).duration);
+  return parseFloat((await readFormatData(filePath)).duration);
 }
 
 export async function createChaptersFromSegments({ segmentPaths, chapterNames }) {
@@ -262,26 +262,14 @@ export async function getSmarterOutFormat(filePath, formatData) {
   return mapFormat(assumedFormat);
 }
 
-export async function getAllStreams(filePath) {
-  const { stdout } = await runFfprobe([
-    '-of', 'json', '-show_entries', 'stream', '-i', filePath, '-hide_banner',
-  ]);
-
-  return JSON.parse(stdout);
-}
-
 export async function readFileMeta(filePath) {
   try {
     const { stdout } = await runFfprobe([
       '-of', 'json', '-show_chapters', '-show_format', '-show_entries', 'stream', '-i', filePath, '-hide_banner',
     ]);
 
-    const { streams, format: formatData, chapters } = JSON.parse(stdout);
-
-    const fileFormat = await getSmarterOutFormat(filePath, formatData);
-    // console.log(streams, formatData, fileFormat);
-
-    return { formatData, fileFormat, streams, chapters };
+    const { streams, format, chapters } = JSON.parse(stdout);
+    return { format, streams, chapters };
   } catch (err) {
     // Windows will throw error with code ENOENT if format detection fails.
     if (err.exitCode === 1 || (isWindows && err.code === 'ENOENT')) {
diff --git a/src/hooks/useFfmpegOperations.js b/src/hooks/useFfmpegOperations.js
index 5c97c054..9967b5eb 100644
--- a/src/hooks/useFfmpegOperations.js
+++ b/src/hooks/useFfmpegOperations.js
@@ -342,7 +342,7 @@ function useFfmpegOperations({ filePath, enableTransferTimestamps }) {
     await optionalTransferTimestamps(paths[0], outPath);
   }, [optionalTransferTimestamps]);
 
-  const autoMergeSegments = useCallback(async ({ customOutDir, isCustomFormatSelected, outFormat, segmentPaths, ffmpegExperimental, onProgress, preserveMovData, movFastStart, autoDeleteMergedSegments, chapterNames, preserveMetadataOnMerge }) => {
+  const autoConcatCutSegments = useCallback(async ({ customOutDir, isCustomFormatSelected, outFormat, segmentPaths, ffmpegExperimental, onProgress, preserveMovData, movFastStart, autoDeleteMergedSegments, chapterNames, preserveMetadataOnMerge }) => {
     const ext = getOutFileExtension({ isCustomFormatSelected, outFormat, filePath });
     const outPath = getOutPath({ customOutDir, filePath, nameSuffix: `cut-merged-${new Date().getTime()}${ext}` });
     const outDir = getOutDir(customOutDir, filePath);
@@ -512,7 +512,7 @@ function useFfmpegOperations({ filePath, enableTransferTimestamps }) {
   }, [filePath, optionalTransferTimestamps]);
 
   return {
-    cutMultiple, concatFiles, html5ify, html5ifyDummy, fixInvalidDuration, autoMergeSegments,
+    cutMultiple, concatFiles, html5ify, html5ifyDummy, fixInvalidDuration, autoConcatCutSegments,
   };
 }