From a566509f5bd7aa4a43880949d2e2e472590b0db3 Mon Sep 17 00:00:00 2001 From: jeffvli Date: Thu, 13 Nov 2025 10:27:11 -0800 Subject: [PATCH] remove preexisting save/restore playqueue handlers --- src/main/index.ts | 77 +------------------ src/preload/utils.ts | 20 ----- .../audio-player/engine/mpv-player-engine.tsx | 3 - 3 files changed, 3 insertions(+), 97 deletions(-) diff --git a/src/main/index.ts b/src/main/index.ts index aab596b54..bb286ab0b 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -19,9 +19,8 @@ import { import electronLocalShortcut from 'electron-localshortcut'; import log from 'electron-log/main'; import { autoUpdater } from 'electron-updater'; -import { access, constants, readFile, writeFile } from 'fs'; +import { access, constants } from 'fs'; import path, { join } from 'path'; -import { deflate, inflate } from 'zlib'; import packageJson from '../../package.json'; import { disableMediaKeys, enableMediaKeys } from './features/core/player/media-keys'; @@ -372,36 +371,6 @@ async function createWindow(first = true): Promise { disableMediaKeys(); }); - ipcMain.on('player-restore-queue', () => { - if (store.get('resume')) { - const queueLocation = join(app.getPath('userData'), 'queue'); - - access(queueLocation, constants.F_OK, (accessError) => { - if (accessError) { - console.error('unable to access saved queue: ', accessError); - return; - } - - readFile(queueLocation, (readError, buffer) => { - if (readError) { - console.error('failed to read saved queue: ', readError); - return; - } - - inflate(buffer, (decompressError, data) => { - if (decompressError) { - console.error('failed to decompress queue: ', decompressError); - return; - } - - const queue = JSON.parse(data.toString()); - getMainWindow()?.webContents.send('renderer-restore-queue', queue); - }); - }); - }); - } - }); - ipcMain.on('download-url', (_event, url: string) => { mainWindow?.webContents.downloadURL(url); }); @@ -442,8 +411,6 @@ async function createWindow(first = true): Promise { mainWindow = null; }); - let saved = false; - mainWindow.on('close', (event) => { store.set('bounds', mainWindow?.getNormalBounds()); store.set('maximized', mainWindow?.isMaximized()); @@ -454,46 +421,8 @@ async function createWindow(first = true): Promise { mainWindow?.hide(); } - if (!saved && store.get('resume')) { - event.preventDefault(); - saved = true; - - ipcMain.once('player-save-queue', async (_event, data: Record) => { - const queueLocation = join(app.getPath('userData'), 'queue'); - const serialized = JSON.stringify(data); - - try { - await new Promise((resolve, reject) => { - deflate(serialized, { level: 1 }, (error, deflated) => { - if (error) { - reject(error); - } else { - writeFile(queueLocation, deflated, (writeError) => { - if (writeError) { - reject(writeError); - } else { - resolve(); - } - }); - } - }); - }); - } catch (error) { - console.error('error saving queue state: ', error); - } finally { - if (!isMacOS()) { - mainWindow?.close(); - } - if (forceQuit) { - app.exit(); - } - } - }); - getMainWindow()?.webContents.send('renderer-save-queue'); - } else { - if (forceQuit) { - app.exit(); - } + if (forceQuit) { + app.exit(); } }); diff --git a/src/preload/utils.ts b/src/preload/utils.ts index 17fcfb807..17323ee4b 100644 --- a/src/preload/utils.ts +++ b/src/preload/utils.ts @@ -2,26 +2,10 @@ import { ipcRenderer, IpcRendererEvent } from 'electron'; import { isLinux, isMacOS, isWindows } from '../main/utils'; -const saveQueue = (data: Record) => { - ipcRenderer.send('player-save-queue', data); -}; - -const restoreQueue = () => { - ipcRenderer.send('player-restore-queue'); -}; - const openItem = async (path: string) => { return ipcRenderer.invoke('open-item', path); }; -const onSaveQueue = (cb: (event: IpcRendererEvent) => void) => { - ipcRenderer.on('renderer-save-queue', cb); -}; - -const onRestoreQueue = (cb: (event: IpcRendererEvent, data: Partial) => void) => { - ipcRenderer.on('renderer-restore-queue', cb); -}; - const playerErrorListener = (cb: (event: IpcRendererEvent, data: { code: number }) => void) => { ipcRenderer.on('player-error-listener', cb); }; @@ -58,12 +42,8 @@ export const utils = { isWindows, logger, mainMessageListener, - onRestoreQueue, - onSaveQueue, openItem, playerErrorListener, - restoreQueue, - saveQueue, }; export type Utils = typeof utils; diff --git a/src/renderer/features/player/audio-player/engine/mpv-player-engine.tsx b/src/renderer/features/player/audio-player/engine/mpv-player-engine.tsx index 3a94410ac..4496619e2 100644 --- a/src/renderer/features/player/audio-player/engine/mpv-player-engine.tsx +++ b/src/renderer/features/player/audio-player/engine/mpv-player-engine.tsx @@ -26,7 +26,6 @@ interface MpvPlayerEngineProps { const mpvPlayer = isElectron() ? window.api.mpvPlayer : null; const mpvPlayerListener = isElectron() ? window.api.mpvPlayerListener : null; const ipc = isElectron() ? window.api.ipc : null; -const utils = isElectron() ? window.api.utils : null; const PROGRESS_UPDATE_INTERVAL = 250; const TRANSITION_PROGRESS_INTERVAL = 10; @@ -74,8 +73,6 @@ export const MpvPlayerEngine = (props: MpvPlayerEngineProps) => { mpvPlayer?.volume(properties.volume); } - - utils?.restoreQueue(); }; initializeMpv();