The swiss army knife of lossless video/audio editing
Merge master into migrate-to-oxlint
Claude2f2fab0f35f3
diff --cc package.jsonindex 1ef083ca,f638f44b..0f8815ec--- a/package.json+++ b/package.json@@@ -90,9 -92,16 +90,9 @@@"csv-parse": "^7.0.2","csv-stringify": "^6.7.0","data-uri-to-buffer": "^8.0.0",- "electron": "^42.11.15",+ "electron": "^45.0.0","electron-builder": "26.16.1","electron-vite": "^5.0.0",- "eslint": "^8.57.1",- "eslint-config-mifi": "^0.1.1",- "eslint-plugin-import": "^2.32.0",- "eslint-plugin-jsx-a11y": "^6.10.2",- "eslint-plugin-react": "^7.37.5",- "eslint-plugin-react-hooks": "^7.1.1",- "eslint-plugin-unicorn": "56.0.1","fast-xml-parser": "^5.8.0","i18next-cli": "^1.58.1","immer": "^11.1.8",diff --cc src/main/ffmpeg.tsindex dd805c58,0007ba78..e7b99b58--- a/src/main/ffmpeg.ts+++ b/src/main/ffmpeg.ts@@@ -6,8 -6,8 +6,8 @@@ import type { Options as ExecaOptions,import { execa } from 'execa';import assert from 'node:assert';import type { Readable } from 'node:stream';-// eslint-disable-next-line import/no-extraneous-dependencies+// eslint-disable-next-line import-js/no-extraneous-dependencies- import { app, clipboard, nativeImage } from 'electron';+ import { app, clipboard, ClipboardItem, nativeImage } from 'electron';import { platform, arch, isWindows, isLinux } from './util.js';import type { AudioStreamInfo, CaptureFormat, FfmpegHwAccel } from '../common/types.js';diff --cc src/renderer/src/dialogs/index.tsxindex e5bb5831,81941b60..9054f972--- a/src/renderer/src/dialogs/index.tsx+++ b/src/renderer/src/dialogs/index.tsx@@@ -17,10 -18,20 +18,20 @@@ import getSwal from '../swal'import isDev from '../isDev';import mainApi from '../mainApi';- const { lstat } = window.require('node:fs/promises');- const { dialog } = window.require('@electron/remote');+ const { lstat, stat } = window.require('node:fs/promises');+ const remote = window.require('@electron/remote');+ const { dialog } = remote;+ const { configStore } = remote.require('./index.js');+ // Without a defaultPath, Electron (since v43) opens dialogs in Downloads, and the OS no longer remembers the last used folder, so we remember it ourselves+ async function getLastDialogDir() {+ const dir = configStore.get('lastDialogDir');+ // A missing folder would end up in the file name box on Windows- if (dir == null || !(await stat(dir).then((stats) => stats.isDirectory(), () => false))) return undefined;++ if (dir == null || !(await stat(dir).then((stats) => stats.isDirectory()).catch(() => false))) return undefined;+ return dir;+ }+// https://github.com/mifi/lossless-cut/issues/1495export const showOpenDialog = async ({filters = isWindows ? [{ name: i18n.t('All Files'), extensions: ['*'] }] : undefined,diff --cc src/renderer/src/ffmpeg.tsindex 15cabe26,d116a1c8..068ae169--- a/src/renderer/src/ffmpeg.ts+++ b/src/renderer/src/ffmpeg.ts@@@ -82,9 -73,9 +73,9 @@@ export async function readFrames({ fileconst intervalsArgs = from != null && to != null ? ['-read_intervals', `${from}%${to}`] : [];const { stdout } = await runFfprobe(['-v', 'error', ...intervalsArgs, '-show_packets', '-select_streams', String(streamIndex), '-show_entries', 'packet=pts_time,flags', '-of', 'json', filePath], { logCli: false });const createdAt = new Date();- const packetsFiltered: Frame[] = (JSON.parse(new TextDecoder().decode(stdout)).packets as { flags: string, pts_time: string }[])+ const packetsFiltered: Frame[] = (JSON.parse(decodeText(stdout)).packets as { flags: string, pts_time: string }[]).map((p) => ({- keyframe: p.flags[0] === 'K',+ keyframe: p.flags.startsWith('K'),time: parseFloat(p.pts_time),createdAt,}))