aiden
/
lossless-cut
mirror of https://github.com/mifi/lossless-cut
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove `open`

Browse Source 
use instead shell.showItemInFolder #714
pull/1401/head
Mikael Finstad 4 years ago
parent df5c6e5c8a
commit 65a0b9e138
6 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File

1
package.json
Unescape Escape View File

@ -110,7 +110,6 @@
"json5": "^2.2.0", "json5": "^2.2.0",
"lodash": "^4.17.19", "lodash": "^4.17.19",
"mime-types": "^2.1.14", "mime-types": "^2.1.14",
"open": "^7.0.3",
"semver": "^7.1.3", "semver": "^7.1.3",
"string-to-stream": "^1.1.1", "string-to-stream": "^1.1.1",
"strtok3": "^6.0.0", "strtok3": "^6.0.0",

28
src/App.jsx
Unescape Escape View File

@ -1115,7 +1115,7 @@ const App = memo(() => {
const metadataFromPath = paths[0]; const metadataFromPath = paths[0];
await concatFiles({ paths, outPath, outDir, outFormat, metadataFromPath, includeAllStreams, streams, ffmpegExperimental, onProgress: setCutProgress, preserveMovData, movFastStart, preserveMetadataOnMerge, chapters: chaptersFromSegments, appendFfmpegCommandLog }); await concatFiles({ paths, outPath, outDir, outFormat, metadataFromPath, includeAllStreams, streams, ffmpegExperimental, onProgress: setCutProgress, preserveMovData, movFastStart, preserveMetadataOnMerge, chapters: chaptersFromSegments, appendFfmpegCommandLog });
if (clearBatchFilesAfterConcat) closeBatch(); if (clearBatchFilesAfterConcat) closeBatch();
openDirToast({ icon: 'success', dirPath: outDir, text: i18n.t('Files merged!') }); openDirToast({ icon: 'success', filePath: outPath, text: i18n.t('Files merged!') });
} catch (err) { } catch (err) {
if (isOutOfSpaceError(err)) { if (isOutOfSpaceError(err)) {
showDiskFull(); showDiskFull();
@ -1325,13 +1325,14 @@ const App = memo(() => {
enableOverwriteOutput, enableOverwriteOutput,
}); });
let concatOutPath;
if (willMerge) { if (willMerge) {
setCutProgress(0); setCutProgress(0);
setWorking(i18n.t('Merging')); setWorking(i18n.t('Merging'));
const chapterNames = segmentsToChapters && !invertCutSegments ? segmentsToExport.map((s) => s.name) : undefined; const chapterNames = segmentsToChapters && !invertCutSegments ? segmentsToExport.map((s) => s.name) : undefined;
await autoConcatCutSegments({ concatOutPath = await autoConcatCutSegments({
customOutDir, customOutDir,
outFormat: fileFormat, outFormat: fileFormat,
isCustomFormatSelected, isCustomFormatSelected,
@ -1361,7 +1362,8 @@ const App = memo(() => {
} }
} }
if (!hideAllNotifications) openDirToast({ dirPath: outputDir, text: msgs.join(' '), timer: 15000 }); const revealPath = concatOutPath || outFiles[0];
if (!hideAllNotifications) openDirToast({ filePath: revealPath, text: msgs.join(' '), timer: 15000 });
} catch (err) { } catch (err) {
if (err instanceof RefuseOverwriteError) { if (err instanceof RefuseOverwriteError) {
showRefuseToOverwrite(); showRefuseToOverwrite();
@ -1409,12 +1411,12 @@ const App = memo(() => {
? await captureFramesFfmpeg({ customOutDir, filePath, fromTime: currentTime, captureFormat, enableTransferTimestamps, numFrames: 1 }) ? await captureFramesFfmpeg({ customOutDir, filePath, fromTime: currentTime, captureFormat, enableTransferTimestamps, numFrames: 1 })
: await captureFrameFromTag({ customOutDir, filePath, currentTime, captureFormat, video, enableTransferTimestamps }); : await captureFrameFromTag({ customOutDir, filePath, currentTime, captureFormat, video, enableTransferTimestamps });
if (!hideAllNotifications) openDirToast({ dirPath: outputDir, text: `${i18n.t('Screenshot captured to:')} ${outPath}` }); if (!hideAllNotifications) openDirToast({ filePath: outPath, text: `${i18n.t('Screenshot captured to:')} ${outPath}` });
} catch (err) { } catch (err) {
console.error(err); console.error(err);
errorToast(i18n.t('Failed to capture frame')); errorToast(i18n.t('Failed to capture frame'));
} }
}, [filePath, getCurrentTime, usingPreviewFile, customOutDir, captureFormat, enableTransferTimestamps, hideAllNotifications, outputDir]); }, [filePath, getCurrentTime, usingPreviewFile, customOutDir, captureFormat, enableTransferTimestamps, hideAllNotifications]);
const extractSegmentFramesAsImages = useCallback(async (index) => { const extractSegmentFramesAsImages = useCallback(async (index) => {
if (!filePath) return; if (!filePath) return;
@ -1425,8 +1427,8 @@ const App = memo(() => {
try { try {
setWorking(i18n.t('Extracting frames')); setWorking(i18n.t('Extracting frames'));
await captureFramesFfmpeg({ customOutDir, filePath, fromTime: start, captureFormat, enableTransferTimestamps, numFrames }); const outPath = await captureFramesFfmpeg({ customOutDir, filePath, fromTime: start, captureFormat, enableTransferTimestamps, numFrames });
if (!hideAllNotifications) openDirToast({ dirPath: outputDir, text: i18n.t('Frames extracted to: {{path}}', { path: outputDir }) }); if (!hideAllNotifications) openDirToast({ filePath: outPath, text: i18n.t('Frames extracted to: {{path}}', { path: outputDir }) });
} catch (err) { } catch (err) {
handleError(err); handleError(err);
} finally { } finally {
@ -1742,8 +1744,8 @@ const App = memo(() => {
try { try {
setWorking(i18n.t('Extracting all streams')); setWorking(i18n.t('Extracting all streams'));
setStreamsSelectorShown(false); setStreamsSelectorShown(false);
await extractStreams({ customOutDir, filePath, streams: mainStreams, enableOverwriteOutput }); const extractedPaths = await extractStreams({ customOutDir, filePath, streams: mainStreams, enableOverwriteOutput });
openDirToast({ dirPath: outputDir, text: i18n.t('All streams have been extracted as separate files') }); openDirToast({ filePath: extractedPaths[0], text: i18n.t('All streams have been extracted as separate files') });
} catch (err) { } catch (err) {
if (err instanceof RefuseOverwriteError) { if (err instanceof RefuseOverwriteError) {
showRefuseToOverwrite(); showRefuseToOverwrite();
@ -1754,7 +1756,7 @@ const App = memo(() => {
} finally { } finally {
setWorking(); setWorking();
} }
}, [customOutDir, enableOverwriteOutput, filePath, mainStreams, outputDir, setWorking]); }, [customOutDir, enableOverwriteOutput, filePath, mainStreams, setWorking]);
const detectBlackScenes = useCallback(async () => { const detectBlackScenes = useCallback(async () => {
if (!filePath) return; if (!filePath) return;
@ -2161,8 +2163,8 @@ const App = memo(() => {
try { try {
setWorking(i18n.t('Extracting track')); setWorking(i18n.t('Extracting track'));
// setStreamsSelectorShown(false); // setStreamsSelectorShown(false);
await extractStreams({ customOutDir, filePath, streams: mainStreams.filter((s) => s.index === index), enableOverwriteOutput }); const extractedPaths = await extractStreams({ customOutDir, filePath, streams: mainStreams.filter((s) => s.index === index), enableOverwriteOutput });
openDirToast({ dirPath: outputDir, text: i18n.t('Track has been extracted') }); openDirToast({ filePath: extractedPaths[0], text: i18n.t('Track has been extracted') });
} catch (err) { } catch (err) {
if (err instanceof RefuseOverwriteError) { if (err instanceof RefuseOverwriteError) {
showRefuseToOverwrite(); showRefuseToOverwrite();
@ -2173,7 +2175,7 @@ const App = memo(() => {
} finally { } finally {
setWorking(); setWorking();
} }
}, [customOutDir, enableOverwriteOutput, filePath, mainStreams, outputDir, setWorking]); }, [customOutDir, enableOverwriteOutput, filePath, mainStreams, setWorking]);
const batchFilePaths = useMemo(() => batchFiles.map((f) => f.path), [batchFiles]); const batchFilePaths = useMemo(() => batchFiles.map((f) => f.path), [batchFiles]);

21
src/ffmpeg.js
Unescape Escape View File

@ -338,12 +338,12 @@ function getPreferredCodecFormat({ codec_name: codec, codec_type: type }) {
} }
async function extractNonAttachmentStreams({ customOutDir, filePath, streams, enableOverwriteOutput }) { async function extractNonAttachmentStreams({ customOutDir, filePath, streams, enableOverwriteOutput }) {
if (streams.length === 0) return; if (streams.length === 0) return [];
console.log('Extracting', streams.length, 'normal streams'); console.log('Extracting', streams.length, 'normal streams');
let streamArgs = []; let streamArgs = [];
await pMap(streams, async ({ index, codec, type, format: { format, ext } }) => { const outPaths = await pMap(streams, async ({ index, codec, type, format: { format, ext } }) => {
const outPath = getSuffixedOutPath({ customOutDir, filePath, nameSuffix: `stream-${index}-${type}-${codec}.${ext}` }); const outPath = getSuffixedOutPath({ customOutDir, filePath, nameSuffix: `stream-${index}-${type}-${codec}.${ext}` });
if (!enableOverwriteOutput && await pathExists(outPath)) throw new RefuseOverwriteError(); if (!enableOverwriteOutput && await pathExists(outPath)) throw new RefuseOverwriteError();
@ -351,6 +351,7 @@ async function extractNonAttachmentStreams({ customOutDir, filePath, streams, en
...streamArgs, ...streamArgs,
'-map', `0:${index}`, '-c', 'copy', '-f', format, '-y', outPath, '-map', `0:${index}`, '-c', 'copy', '-f', format, '-y', outPath,
]; ];
return outPath;
}, { concurrency: 1 }); }, { concurrency: 1 });
const ffmpegArgs = [ const ffmpegArgs = [
@ -362,15 +363,17 @@ async function extractNonAttachmentStreams({ customOutDir, filePath, streams, en
const { stdout } = await runFfmpeg(ffmpegArgs); const { stdout } = await runFfmpeg(ffmpegArgs);
console.log(stdout); console.log(stdout);
return outPaths;
} }
async function extractAttachmentStreams({ customOutDir, filePath, streams, enableOverwriteOutput }) { async function extractAttachmentStreams({ customOutDir, filePath, streams, enableOverwriteOutput }) {
if (streams.length === 0) return; if (streams.length === 0) return [];
console.log('Extracting', streams.length, 'attachment streams'); console.log('Extracting', streams.length, 'attachment streams');
let streamArgs = []; let streamArgs = [];
await pMap(streams, async ({ index, codec_name: codec, codec_type: type }) => { const outPaths = await pMap(streams, async ({ index, codec_name: codec, codec_type: type }) => {
const ext = codec || 'bin'; const ext = codec || 'bin';
const outPath = getSuffixedOutPath({ customOutDir, filePath, nameSuffix: `stream-${index}-${type}-${codec}.${ext}` }); const outPath = getSuffixedOutPath({ customOutDir, filePath, nameSuffix: `stream-${index}-${type}-${codec}.${ext}` });
if (!enableOverwriteOutput && await pathExists(outPath)) throw new RefuseOverwriteError(); if (!enableOverwriteOutput && await pathExists(outPath)) throw new RefuseOverwriteError();
@ -379,6 +382,7 @@ async function extractAttachmentStreams({ customOutDir, filePath, streams, enabl
...streamArgs, ...streamArgs,
`-dump_attachment:${index}`, outPath, `-dump_attachment:${index}`, outPath,
]; ];
return outPath;
}, { concurrency: 1 }); }, { concurrency: 1 });
const ffmpegArgs = [ const ffmpegArgs = [
@ -395,9 +399,10 @@ async function extractAttachmentStreams({ customOutDir, filePath, streams, enabl
} catch (err) { } catch (err) {
// Unfortunately ffmpeg will exit with code 1 even though it's a success // Unfortunately ffmpeg will exit with code 1 even though it's a success
// Note: This is kind of hacky: // Note: This is kind of hacky:
if (err.exitCode === 1 && typeof err.stderr === 'string' && err.stderr.includes('At least one output file must be specified')) return; if (err.exitCode === 1 && typeof err.stderr === 'string' && err.stderr.includes('At least one output file must be specified')) return outPaths;
throw err; throw err;
} }
return outPaths;
} }
// https://stackoverflow.com/questions/32922226/extract-every-audio-and-subtitles-from-a-video-with-ffmpeg // https://stackoverflow.com/questions/32922226/extract-every-audio-and-subtitles-from-a-video-with-ffmpeg
@ -418,8 +423,10 @@ export async function extractStreams({ filePath, customOutDir, streams, enableOv
// TODO progress // TODO progress
// Attachment streams are handled differently from normal streams // Attachment streams are handled differently from normal streams
await extractNonAttachmentStreams({ customOutDir, filePath, streams: outStreams, enableOverwriteOutput }); return [
await extractAttachmentStreams({ customOutDir, filePath, streams: attachmentStreams, enableOverwriteOutput }); ...(await extractNonAttachmentStreams({ customOutDir, filePath, streams: outStreams, enableOverwriteOutput })),
...(await extractAttachmentStreams({ customOutDir, filePath, streams: attachmentStreams, enableOverwriteOutput })),
];
} }
async function renderThumbnail(filePath, timestamp) { async function renderThumbnail(filePath, timestamp) {

2
src/hooks/useFfmpegOperations.js
Unescape Escape View File

@ -453,6 +453,8 @@ function useFfmpegOperations({ filePath, enableTransferTimestamps }) {
const { streams } = await readFileMeta(metadataFromPath); const { streams } = await readFileMeta(metadataFromPath);
await concatFiles({ paths: segmentPaths, outDir, outPath, metadataFromPath, outFormat, includeAllStreams: true, streams, ffmpegExperimental, onProgress, preserveMovData, movFastStart, chapters, preserveMetadataOnMerge, appendFfmpegCommandLog }); await concatFiles({ paths: segmentPaths, outDir, outPath, metadataFromPath, outFormat, includeAllStreams: true, streams, ffmpegExperimental, onProgress, preserveMovData, movFastStart, chapters, preserveMetadataOnMerge, appendFfmpegCommandLog });
if (autoDeleteMergedSegments) await tryDeleteFiles(segmentPaths); if (autoDeleteMergedSegments) await tryDeleteFiles(segmentPaths);
return outPath;
}, [concatFiles, filePath]); }, [concatFiles, filePath]);
const html5ify = useCallback(async ({ customOutDir, filePath: filePathArg, speed, hasAudio, hasVideo, onProgress }) => { const html5ify = useCallback(async ({ customOutDir, filePath: filePathArg, speed, hasAudio, hasVideo, onProgress }) => {

5
src/util.js
Unescape Escape View File

@ -5,7 +5,6 @@ import pMap from 'p-map';
const { dirname, parse: parsePath, join, basename, extname, isAbsolute, resolve } = window.require('path'); const { dirname, parse: parsePath, join, basename, extname, isAbsolute, resolve } = window.require('path');
const fs = window.require('fs-extra'); const fs = window.require('fs-extra');
const open = window.require('open');
const os = window.require('os'); const os = window.require('os');
const { shell } = window.require('electron'); const { shell } = window.require('electron');
@ -128,9 +127,9 @@ export function handleError(arg1, arg2) {
} }
export const openDirToast = async ({ dirPath, ...props }) => { export const openDirToast = async ({ filePath, ...props }) => {
const { value } = await toast.fire({ icon: 'success', timer: 5000, showConfirmButton: true, confirmButtonText: i18n.t('Show'), showCancelButton: true, cancelButtonText: i18n.t('Close'), ...props }); const { value } = await toast.fire({ icon: 'success', timer: 5000, showConfirmButton: true, confirmButtonText: i18n.t('Show'), showCancelButton: true, cancelButtonText: i18n.t('Close'), ...props });
if (value) open(dirPath); if (value) shell.showItemInFolder(filePath);
}; };
export function setFileNameTitle(filePath) { export function setFileNameTitle(filePath) {

3
yarn.lock
Unescape Escape View File

@ -10694,7 +10694,6 @@ __metadata:
mkdirp: ^1.0.3 mkdirp: ^1.0.3
moment: ^2.29.4 moment: ^2.29.4
mousetrap: ^1.6.5 mousetrap: ^1.6.5
open: ^7.0.3
p-map: ^4.0.0 p-map: ^4.0.0
patch-package: ^6.2.1 patch-package: ^6.2.1
pify: ^5.0.0 pify: ^5.0.0
@ -11714,7 +11713,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"open@npm:^7.0.3, open@npm:^7.4.2": "open@npm:^7.4.2":
version: 7.4.2 version: 7.4.2
resolution: "open@npm:7.4.2" resolution: "open@npm:7.4.2"
dependencies: dependencies:

Write Preview
Loading…
Cancel
Save