mirror
/
lossless-cut
kopia lustrzana https://github.com/mifi/lossless-cut
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

refactor

pull/901/head
Mikael Finstad 2022-02-23 19:43:19 +08:00
rodzic 152b889040
commit bce1914268
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 25AB36E3E81CBC26
3 zmienionych plików z 34 dodań i 63 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
public/electron.js
Wyświetl plik

@ -38,7 +38,7 @@ let askBeforeClose = false;
let rendererReady = false;
let newVersion;
const openFiles = (paths) => mainWindow.webContents.send('file-opened', paths);
const openFiles = (paths) => mainWindow.webContents.send('openFiles', paths);
// https://github.com/electron/electron/issues/526#issuecomment-563010533

14
public/menu.js
Wyświetl plik

@ -19,20 +19,20 @@ module.exports = (app, mainWindow, newVersion) => {
async click() {
const { canceled, filePaths } = await dialog.showOpenDialog({ properties: ['openFile', 'multiSelections'] });
if (canceled) return;
mainWindow.webContents.send('file-opened', filePaths);
mainWindow.webContents.send('openFiles', filePaths);
},
},
{
label: i18n.t('Close'),
accelerator: 'CmdOrCtrl+W',
async click() {
mainWindow.webContents.send('close-file');
mainWindow.webContents.send('closeCurrentFile');
},
},
{
label: i18n.t('Close batch'),
async click() {
mainWindow.webContents.send('close-batch-files');
mainWindow.webContents.send('closeBatchFiles');
},
},
{ type: 'separator' },
@ -150,7 +150,7 @@ module.exports = (app, mainWindow, newVersion) => {
label: i18n.t('Settings'),
accelerator: 'CmdOrCtrl+,',
click() {
mainWindow.webContents.send('openSettings');
mainWindow.webContents.send('toggleSettings');
},
},
{ type: 'separator' },
@ -221,7 +221,7 @@ module.exports = (app, mainWindow, newVersion) => {
{
label: i18n.t('Extract all tracks'),
click() {
mainWindow.webContents.send('extract-all-streams');
mainWindow.webContents.send('extractAllStreams');
},
},
{
@ -257,7 +257,7 @@ module.exports = (app, mainWindow, newVersion) => {
{
label: i18n.t('Set custom start offset/timecode'),
click() {
mainWindow.webContents.send('set-start-offset', true);
mainWindow.webContents.send('askSetStartTimeOffset', true);
},
},
{ role: 'toggleDevTools', label: i18n.t('Toggle Developer Tools') },
@ -270,7 +270,7 @@ module.exports = (app, mainWindow, newVersion) => {
{
label: i18n.t('Help and shortcuts'),
click() {
mainWindow.webContents.send('openHelp');
mainWindow.webContents.send('toggleHelp');
},
},
{

81
src/App.jsx
Wyświetl plik

@ -2016,57 +2016,33 @@ const App = memo(() => {
}
}
const fileOpened = (event, filePaths) => { userOpenFiles(filePaths.map(resolvePathIfNeeded)); };
const showStreamsSelector = () => setStreamsSelectorShown(true);
const openSendReportDialog2 = () => { openSendReportDialogWithState(); };
const closeFile2 = () => { closeFileWithConfirm(); };
const closeBatch2 = () => { closeBatch(); };
electron.ipcRenderer.on('file-opened', fileOpened);
electron.ipcRenderer.on('close-file', closeFile2);
electron.ipcRenderer.on('close-batch-files', closeBatch2);
electron.ipcRenderer.on('html5ify', userHtml5ifyCurrentFile);
electron.ipcRenderer.on('set-start-offset', askSetStartTimeOffset);
electron.ipcRenderer.on('extract-all-streams', extractAllStreams);
electron.ipcRenderer.on('showStreamsSelector', showStreamsSelector);
electron.ipcRenderer.on('importEdlFile', importEdlFile);
electron.ipcRenderer.on('exportEdlFile', exportEdlFile2);
electron.ipcRenderer.on('exportEdlYouTube', exportEdlYouTube);
electron.ipcRenderer.on('openHelp', toggleHelp);
electron.ipcRenderer.on('openSettings', toggleSettings);
electron.ipcRenderer.on('openAbout', openAbout);
electron.ipcRenderer.on('openSendReportDialog', openSendReportDialog2);
electron.ipcRenderer.on('clearSegments', clearSegments);
electron.ipcRenderer.on('shuffleSegments', shuffleSegments);
electron.ipcRenderer.on('createNumSegments', createNumSegments);
electron.ipcRenderer.on('createFixedDurationSegments', createFixedDurationSegments);
electron.ipcRenderer.on('invertAllCutSegments', invertAllCutSegments);
electron.ipcRenderer.on('fixInvalidDuration', fixInvalidDuration2);
electron.ipcRenderer.on('reorderSegsByStartTime', reorderSegsByStartTime);
return () => {
electron.ipcRenderer.removeListener('file-opened', fileOpened);
electron.ipcRenderer.removeListener('close-file', closeFile2);
electron.ipcRenderer.removeListener('close-batch-files', closeBatch2);
electron.ipcRenderer.removeListener('html5ify', userHtml5ifyCurrentFile);
electron.ipcRenderer.removeListener('set-start-offset', askSetStartTimeOffset);
electron.ipcRenderer.removeListener('extract-all-streams', extractAllStreams);
electron.ipcRenderer.removeListener('showStreamsSelector', showStreamsSelector);
electron.ipcRenderer.removeListener('importEdlFile', importEdlFile);
electron.ipcRenderer.removeListener('exportEdlFile', exportEdlFile2);
electron.ipcRenderer.removeListener('exportEdlYouTube', exportEdlYouTube);
electron.ipcRenderer.removeListener('openHelp', toggleHelp);
electron.ipcRenderer.removeListener('openSettings', toggleSettings);
electron.ipcRenderer.removeListener('openAbout', openAbout);
electron.ipcRenderer.removeListener('openSendReportDialog', openSendReportDialog2);
electron.ipcRenderer.removeListener('clearSegments', clearSegments);
electron.ipcRenderer.removeListener('shuffleSegments', shuffleSegments);
electron.ipcRenderer.removeListener('createNumSegments', createNumSegments);
electron.ipcRenderer.removeListener('createFixedDurationSegments', createFixedDurationSegments);
electron.ipcRenderer.removeListener('invertAllCutSegments', invertAllCutSegments);
electron.ipcRenderer.removeListener('fixInvalidDuration', fixInvalidDuration2);
electron.ipcRenderer.removeListener('reorderSegsByStartTime', reorderSegsByStartTime);
const action = {
openFiles: (event, filePaths) => { userOpenFiles(filePaths.map(resolvePathIfNeeded)); },
closeCurrentFile: () => { closeFileWithConfirm(); },
closeBatchFiles: () => { closeBatch(); },
html5ify: userHtml5ifyCurrentFile,
askSetStartTimeOffset,
extractAllStreams,
showStreamsSelector: () => setStreamsSelectorShown(true),
importEdlFile,
exportEdlFile: exportEdlFile2,
exportEdlYouTube,
toggleHelp,
toggleSettings,
openAbout,
openSendReportDialog: () => { openSendReportDialogWithState(); },
clearSegments,
shuffleSegments,
createNumSegments,
createFixedDurationSegments,
invertAllCutSegments,
fixInvalidDuration: fixInvalidDuration2,
reorderSegsByStartTime,
};
const entries = Object.entries(action);
entries.forEach(([key, value]) => electron.ipcRenderer.on(key, value));
return () => entries.forEach(([key, value]) => electron.ipcRenderer.removeListener(key, value));
}, [apparentCutSegments, askSetStartTimeOffset, checkFileOpened, clearSegments, closeBatch, closeFileWithConfirm, createFixedDurationSegments, createNumSegments, customOutDir, cutSegments, extractAllStreams, fileFormat, filePath, fixInvalidDuration, getFrameCount, getTimeFromFrameNum, invertAllCutSegments, loadCutSegments, loadMedia, openSendReportDialogWithState, reorderSegsByStartTime, setWorking, shuffleSegments, toggleHelp, toggleSettings, userHtml5ifyCurrentFile, userOpenFiles]);
const showAddStreamSourceDialog = useCallback(async () => {
@ -2129,11 +2105,6 @@ const App = memo(() => {
runStartupCheck().catch((err) => handleError('LosslessCut is installation is broken', err));
}, []);
useEffect(() => {
// Testing:
// if (isDev) loadMedia({ filePath: '/Users/mifi/Downloads/inp.MOV', customOutDir });
}, []);
useEffect(() => {
const keyScrollPreventer = (e) => {
// https://stackoverflow.com/questions/8916620/disable-arrow-key-scrolling-in-users-browser