Skip to content

The swiss army knife of lossless video/audio editing

move merge / batch functionality

Mikael Finstad3c4b996e0341
diff --git a/public/menu.js b/public/menu.js
index 4aec2af6..3bd4220b 100644
--- a/public/menu.js
+++ b/public/menu.js
@@ -254,18 +254,6 @@ module.exports = (app, mainWindow, newVersion) => {
{
label: i18n.t('Tools'),
submenu: [
- {
- label: i18n.t('Merge/concatenate files'),
- click() {
- mainWindow.webContents.send('show-merge-dialog', true);
- },
- },
- {
- label: i18n.t('Batch convert to supported format'),
- click() {
- mainWindow.webContents.send('batchConvertFriendlyFormat');
- },
- },
{
label: i18n.t('Set custom start offset/timecode'),
click() {
diff --git a/src/App.jsx b/src/App.jsx
index c71f9bf3..1f63e0df 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -63,7 +63,7 @@ import {
} from './util';
import { formatDuration } from './util/duration';
import { adjustRate } from './util/rate-calculator';
-import { askForOutDir, askForImportChapters, createNumSegments, createFixedDurationSegments, promptTimeOffset, askForHtml5ifySpeed, askForFileOpenAction, confirmExtractAllStreamsDialog, cleanupFilesDialog, showDiskFull, showCutFailedDialog, labelSegmentDialog, openYouTubeChaptersDialog, showMergeFilesOpenDialog, openAbout, showEditableJsonDialog } from './dialogs';
+import { askForOutDir, askForImportChapters, createNumSegments, createFixedDurationSegments, promptTimeOffset, askForHtml5ifySpeed, askForFileOpenAction, confirmExtractAllStreamsDialog, cleanupFilesDialog, showDiskFull, showCutFailedDialog, labelSegmentDialog, openYouTubeChaptersDialog, openAbout, showEditableJsonDialog } from './dialogs';
import { openSendReportDialog } from './reporting';
import { fallbackLng } from './i18n';
import { createSegment, getCleanCutSegments, getSegApparentStart, findSegmentsAtCursor, sortSegments, invertSegments, getSegmentTags } from './segments';
@@ -676,6 +676,15 @@ const App = memo(() => {
}
}, [setWorking, ensureOutDirAccessible, customOutDir, segmentsToChapters, ffmpegMergeFiles, ffmpegExperimental, preserveMovData, movFastStart, preserveMetadataOnMerge]);
+ const onMergeFilesClick = useCallback(() => {
+ if (batchFiles.length < 2) {
+ errorToast(i18n.t('Please open at least 2 files to merge, then try again'));
+ return;
+ }
+
+ setConcatDialogVisible(true);
+ }, [batchFiles]);
+
const toggleCaptureFormat = useCallback(() => setCaptureFormat(f => (f === 'png' ? 'jpeg' : 'png')), [setCaptureFormat]);
const toggleKeyframeCut = useCallback((showMessage) => setKeyframeCut((val) => {
@@ -918,6 +927,53 @@ const App = memo(() => {
showUnsupportedFileMessage();
}, [html5ify, html5ifyDummy, showUnsupportedFileMessage]);
+ const batchConvertFormat = useCallback(async () => {
+ if (batchFiles.length < 1) return;
+ const filePaths = batchFiles.map((f) => f.path);
+
+ const failedFiles = [];
+ let i = 0;
+ const setTotalProgress = (fileProgress = 0) => setCutProgress((i + fileProgress) / filePaths.length);
+
+ const { selectedOption: speed } = await askForHtml5ifySpeed({ allowedOptions: ['fastest-audio', 'fastest-audio-remux', 'fast-audio-remux', 'fast-audio', 'fast', 'slow', 'slow-audio', 'slowest'] });
+ if (!speed) return;
+
+ if (workingRef.current) return;
+ try {
+ setWorking(i18n.t('Batch converting to supported format'));
+ setCutProgress(0);
+
+ // eslint-disable-next-line no-restricted-syntax
+ for (const path of filePaths) {
+ try {
+ // eslint-disable-next-line no-await-in-loop
+ const { newCustomOutDir, cancel } = await ensureOutDirAccessible(path);
+ if (cancel) {
+ toast.fire({ title: i18n.t('Aborted') });
+ return;
+ }
+
+ // eslint-disable-next-line no-await-in-loop
+ await html5ify({ customOutDir: newCustomOutDir, filePath: path, speed, hasAudio: true, hasVideo: true, onProgress: setTotalProgress });
+ } catch (err2) {
+ console.error('Failed to html5ify', path, err2);
+ failedFiles.push(path);
+ }
+
+ i += 1;
+ setTotalProgress();
+ }
+
+ if (failedFiles.length > 0) toast.fire({ title: `${i18n.t('Failed to convert files:')} ${failedFiles.join(' ')}`, timer: null, showConfirmButton: true });
+ } catch (err) {
+ errorToast(i18n.t('Failed to batch convert to supported format'));
+ console.error('Failed to html5ify', err);
+ } finally {
+ setWorking();
+ setCutProgress();
+ }
+ }, [batchFiles, ensureOutDirAccessible, html5ify, setWorking]);
+
const getConvertToSupportedFormat = useCallback((fallback) => rememberConvertToSupportedFormat || fallback, [rememberConvertToSupportedFormat]);
const html5ifyAndLoadWithPreferences = useCallback(async (cod, fp, speed, hv, ha) => {
@@ -1849,14 +1905,6 @@ const App = memo(() => {
}, [fileUri, usingPreviewFile, hasVideo, hasAudio, html5ifyAndLoadWithPreferences, customOutDir, filePath, setWorking]);
useEffect(() => {
- async function showOpenAndMergeDialog() {
- const files = await showMergeFilesOpenDialog(outputDir);
- if (files) {
- batchLoadPaths(files);
- setConcatDialogVisible(true);
- }
- }
-
async function setStartOffset() {
const newStartTimeOffset = await promptTimeOffset({
initialValue: startTimeOffset !== undefined ? formatDuration({ seconds: startTimeOffset }) : undefined,
@@ -1896,54 +1944,6 @@ const App = memo(() => {
}
}
- async function batchConvertFriendlyFormat() {
- const title = i18n.t('Select files to batch convert to supported format');
- const { canceled, filePaths } = await dialog.showOpenDialog({ properties: ['openFile', 'multiSelections'], title, message: title });
- if (canceled || filePaths.length < 1) return;
-
- const failedFiles = [];
- let i = 0;
- const setTotalProgress = (fileProgress = 0) => setCutProgress((i + fileProgress) / filePaths.length);
-
- const { selectedOption: speed } = await askForHtml5ifySpeed({ allowedOptions: ['fastest-audio', 'fastest-audio-remux', 'fast-audio-remux', 'fast-audio', 'fast', 'slow', 'slow-audio', 'slowest'] });
- if (!speed) return;
-
- if (workingRef.current) return;
- try {
- setWorking(i18n.t('Batch converting to supported format'));
- setCutProgress(0);
-
- // eslint-disable-next-line no-restricted-syntax
- for (const path of filePaths) {
- try {
- // eslint-disable-next-line no-await-in-loop
- const { newCustomOutDir, cancel } = await ensureOutDirAccessible(path);
- if (cancel) {
- toast.fire({ title: i18n.t('Aborted') });
- return;
- }
-
- // eslint-disable-next-line no-await-in-loop
- await html5ify({ customOutDir: newCustomOutDir, filePath: path, speed, hasAudio: true, hasVideo: true, onProgress: setTotalProgress });
- } catch (err2) {
- console.error('Failed to html5ify', path, err2);
- failedFiles.push(path);
- }
-
- i += 1;
- setTotalProgress();
- }
-
- if (failedFiles.length > 0) toast.fire({ title: `${i18n.t('Failed to convert files:')} ${failedFiles.join(' ')}`, timer: null, showConfirmButton: true });
- } catch (err) {
- errorToast(i18n.t('Failed to batch convert to supported format'));
- console.error('Failed to html5ify', err);
- } finally {
- setWorking();
- setCutProgress();
- }
- }
-
async function createNumSegments2() {
if (!checkFileOpened() || !isDurationValid(duration)) return;
const segments = await createNumSegments(duration);
@@ -1981,7 +1981,6 @@ const App = memo(() => {
electron.ipcRenderer.on('close-file', closeFile2);
electron.ipcRenderer.on('close-batch-files', closeBatch2);
electron.ipcRenderer.on('html5ify', userHtml5ifyCurrentFile);
- electron.ipcRenderer.on('show-merge-dialog', showOpenAndMergeDialog);
electron.ipcRenderer.on('set-start-offset', setStartOffset);
electron.ipcRenderer.on('extract-all-streams', extractAllStreams);
electron.ipcRenderer.on('showStreamsSelector', showStreamsSelector);
@@ -1991,7 +1990,6 @@ const App = memo(() => {
electron.ipcRenderer.on('openHelp', toggleHelp);
electron.ipcRenderer.on('openSettings', toggleSettings);
electron.ipcRenderer.on('openAbout', openAbout);
- electron.ipcRenderer.on('batchConvertFriendlyFormat', batchConvertFriendlyFormat);
electron.ipcRenderer.on('openSendReportDialog', openSendReportDialog2);
electron.ipcRenderer.on('clearSegments', clearSegments);
electron.ipcRenderer.on('shuffleSegments', shuffleSegments);
@@ -2006,7 +2004,6 @@ const App = memo(() => {
electron.ipcRenderer.removeListener('close-file', closeFile2);
electron.ipcRenderer.removeListener('close-batch-files', closeBatch2);
electron.ipcRenderer.removeListener('html5ify', userHtml5ifyCurrentFile);
- electron.ipcRenderer.removeListener('show-merge-dialog', showOpenAndMergeDialog);
electron.ipcRenderer.removeListener('set-start-offset', setStartOffset);
electron.ipcRenderer.removeListener('extract-all-streams', extractAllStreams);
electron.ipcRenderer.removeListener('showStreamsSelector', showStreamsSelector);
@@ -2016,7 +2013,6 @@ const App = memo(() => {
electron.ipcRenderer.removeListener('openHelp', toggleHelp);
electron.ipcRenderer.removeListener('openSettings', toggleSettings);
electron.ipcRenderer.removeListener('openAbout', openAbout);
- electron.ipcRenderer.removeListener('batchConvertFriendlyFormat', batchConvertFriendlyFormat);
electron.ipcRenderer.removeListener('openSendReportDialog', openSendReportDialog2);
electron.ipcRenderer.removeListener('clearSegments', clearSegments);
electron.ipcRenderer.removeListener('shuffleSegments', shuffleSegments);
@@ -2026,7 +2022,7 @@ const App = memo(() => {
electron.ipcRenderer.removeListener('fixInvalidDuration', fixInvalidDuration2);
electron.ipcRenderer.removeListener('reorderSegsByStartTime', reorderSegsByStartTime);
};
- }, [outputDir, filePath, customOutDir, startTimeOffset, userHtml5ifyCurrentFile, batchLoadPaths, extractAllStreams, userOpenFiles, openSendReportDialogWithState, setWorking, loadEdlFile, cutSegments, apparentCutSegments, edlFilePath, toggleHelp, toggleSettings, ensureOutDirAccessible, html5ifyAndLoad, loadCutSegments, duration, checkFileOpened, loadMedia, fileFormat, reorderSegsByStartTime, closeFileWithConfirm, closeBatch, clearSegments, clearSegCounter, fixInvalidDuration, invertAllCutSegments, getFrameCount, getTimeFromFrameNum, shuffleSegments, html5ify]);
+ }, [apparentCutSegments, checkFileOpened, clearSegments, closeBatch, closeFileWithConfirm, customOutDir, cutSegments, duration, extractAllStreams, fileFormat, filePath, fixInvalidDuration, getFrameCount, getTimeFromFrameNum, invertAllCutSegments, loadCutSegments, loadMedia, openSendReportDialogWithState, reorderSegsByStartTime, setWorking, shuffleSegments, startTimeOffset, toggleHelp, toggleSettings, userHtml5ifyCurrentFile, userOpenFiles]);
const showAddStreamSourceDialog = useCallback(async () => {
try {
@@ -2219,8 +2215,10 @@ const App = memo(() => {
batchFiles={batchFiles}
batchOpenSingleFile={batchOpenSingleFile}
removeBatchFile={removeBatchFile}
- setConcatDialogVisible={setConcatDialogVisible}
closeBatch={closeBatch}
+ onMergeFilesClick={onMergeFilesClick}
+ onBatchConvertToSupportedFormatClick={batchConvertFormat}
+
/>
)}
</AnimatePresence>
diff --git a/src/components/BatchFilesList.jsx b/src/components/BatchFilesList.jsx
index 96f78db7..5558c74d 100644
--- a/src/components/BatchFilesList.jsx
+++ b/src/components/BatchFilesList.jsx
@@ -1,15 +1,24 @@
-import React, { memo } from 'react';
+import React, { memo, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { motion } from 'framer-motion';
-import { FaTimes } from 'react-icons/fa';
-import { MergeColumnsIcon } from 'evergreen-ui';
-import BatchFile from './BatchFile';
+import { FaBars } from 'react-icons/fa';
+import BatchFile from './BatchFile';
+import useNativeMenu from '../hooks/useNativeMenu';
import { timelineBackground, controlsBackground } from '../colors';
-const BatchFilesList = memo(({ filePath, width, batchFiles, batchOpenSingleFile, removeBatchFile, setConcatDialogVisible, closeBatch }) => {
+const BatchFilesList = memo(({ filePath, width, batchFiles, batchOpenSingleFile, removeBatchFile, closeBatch, onMergeFilesClick, onBatchConvertToSupportedFormatClick }) => {
const { t } = useTranslation();
+ const contextMenuTemplate = useMemo(() => [
+ { label: t('Merge/concatenate files'), click: onMergeFilesClick },
+ { label: t('Convert to supported format'), click: onBatchConvertToSupportedFormatClick },
+ { type: 'separator' },
+ { label: t('Close batch'), click: closeBatch },
+ ], [closeBatch, onBatchConvertToSupportedFormatClick, onMergeFilesClick, t]);
+
+ const { openMenu } = useNativeMenu(contextMenuTemplate);
+
return (
<motion.div
className="no-user-select"
@@ -23,9 +32,7 @@ const BatchFilesList = memo(({ filePath, width, batchFiles, batchOpenSingleFile,
<div style={{ flexGrow: 1 }} />
- {batchFiles.length > 1 && <MergeColumnsIcon role="button" title={t('Merge/concatenate files')} color="white" style={{ marginRight: 10, cursor: 'pointer' }} onClick={() => setConcatDialogVisible(true)} />}
-
- <FaTimes size={18} role="button" style={{ cursor: 'pointer', color: 'white' }} onClick={() => closeBatch()} title={t('Close batch')} />
+ <FaBars size={20} role="button" title={t('Batch file list')} style={{ cursor: 'pointer', color: 'white', marginRight: 5 }} onClick={openMenu} />
</div>
<div style={{ overflowX: 'hidden', overflowY: 'auto' }}>
diff --git a/src/dialogs.jsx b/src/dialogs.jsx
index 5568c248..a2ed38cb 100644
--- a/src/dialogs.jsx
+++ b/src/dialogs.jsx
@@ -11,7 +11,6 @@ import JSON5 from 'json5';
import { parseDuration } from './util/duration';
import { parseYouTube } from './edlFormats';
import CopyClipboardButton from './components/CopyClipboardButton';
-import { errorToast } from './util';
const electron = window.require('electron'); // eslint-disable-line
@@ -350,25 +349,6 @@ export function openAbout() {
});
}
-export async function showMergeFilesOpenDialog(defaultPath) {
- const title = i18n.t('Please select files to be merged');
- const message = i18n.t('Please select files to be merged. The files need to be of the exact same format and codecs');
- const { canceled, filePaths } = await dialog.showOpenDialog({
- title,
- defaultPath,
- properties: ['openFile', 'multiSelections'],
- message,
- });
- if (canceled || !filePaths) return undefined;
-
- if (filePaths.length < 2) {
- errorToast(i18n.t('More than one file must be selected'));
- return undefined;
- }
-
- return filePaths;
-}
-
export async function showEditableJsonDialog({ text, title, inputLabel, inputValue, inputValidator }) {
const { value } = await Swal.fire({
input: 'textarea',
diff --git a/src/hooks/useContextMenu.js b/src/hooks/useContextMenu.js
index 1a3df599..1f8b163a 100644
--- a/src/hooks/useContextMenu.js
+++ b/src/hooks/useContextMenu.js
@@ -1,40 +1,23 @@
-import { useCallback, useEffect, useMemo } from 'react';
+import { useEffect } from 'react';
-// TODO pull out?
-const { remote } = window.require('electron');
-const { Menu } = remote;
+import useNativeMenu from './useNativeMenu';
// https://github.com/transflow/use-electron-context-menu
-
export default function useContextMenu(
ref,
template,
options = {},
) {
- const menu = useMemo(() => Menu.buildFromTemplate(template), [template]);
-
- const { x, y, onContext, onClose } = options;
+ const { openMenu, closeMenu } = useNativeMenu(template, options);
useEffect(() => {
- function handleContext(e) {
- menu.popup({
- window: remote.getCurrentWindow(),
- x,
- y,
- callback: onClose,
- });
-
- if (onContext) onContext(e);
- }
-
const el = ref.current;
if (el) {
- el.addEventListener('contextmenu', handleContext);
+ el.addEventListener('contextmenu', openMenu);
+ return () => el.removeEventListener('contextmenu', openMenu);
}
- return () => el.removeEventListener('contextmenu', handleContext);
- }, [menu, onClose, onContext, ref, x, y]);
-
- const closeMenu = useCallback(() => menu.closePopup(), [menu]);
+ return undefined;
+ }, [openMenu, ref]);
return { closeMenu };
}
diff --git a/src/hooks/useNativeMenu.js b/src/hooks/useNativeMenu.js
new file mode 100644
index 00000000..8abeae90
--- /dev/null
+++ b/src/hooks/useNativeMenu.js
@@ -0,0 +1,31 @@
+import { useCallback, useMemo } from 'react';
+
+// TODO pull out?
+const { remote } = window.require('electron');
+const { Menu } = remote;
+
+// https://github.com/transflow/use-electron-context-menu
+// https://www.electronjs.org/docs/latest/api/menu-item
+export default function useNativeMenu(
+ template,
+ options = {},
+) {
+ const menu = useMemo(() => Menu.buildFromTemplate(template), [template]);
+
+ const { x, y, onContext, onClose } = options;
+
+ const openMenu = useCallback((e) => {
+ menu.popup({
+ window: remote.getCurrentWindow(),
+ x,
+ y,
+ callback: onClose,
+ });
+
+ if (onContext) onContext(e);
+ }, [menu, onClose, onContext, x, y]);
+
+ const closeMenu = useCallback(() => menu.closePopup(), [menu]);
+
+ return { openMenu, closeMenu };
+}