From f35d192650d5b2ed285cc003ec4405b4b708a404 Mon Sep 17 00:00:00 2001 From: Su-Yong Date: Sat, 11 Nov 2023 18:11:24 +0900 Subject: [PATCH] fix(downloader): fix downloader plugin --- src/plugins/downloader/main/index.ts | 7 ++++--- src/plugins/downloader/renderer.ts | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/plugins/downloader/main/index.ts b/src/plugins/downloader/main/index.ts index 2e945441..9443489e 100644 --- a/src/plugins/downloader/main/index.ts +++ b/src/plugins/downloader/main/index.ts @@ -93,7 +93,8 @@ let config: DownloaderPluginConfig = builder.config; export default builder.createMain(({ handle, getConfig, on }) => { return { - async onLoad(win) { + async onLoad(_win) { + win = _win; config = await getConfig(); yt = await Innertube.create({ @@ -102,8 +103,8 @@ export default builder.createMain(({ handle, getConfig, on }) => { generate_session_locally: true, fetch: getNetFetchAsFetch(), }); - handle('download-song', (_, url: string) => downloadSong(url)); - on('video-src-changed', (_, data: GetPlayerResponse) => { + handle('download-song', (url: string) => downloadSong(url)); + on('video-src-changed', (data: GetPlayerResponse) => { playingUrl = data.microformat.microformatDataRenderer.urlCanonical; }); handle('download-playlist-request', async (_event, url: string) => downloadPlaylist(url)); diff --git a/src/plugins/downloader/renderer.ts b/src/plugins/downloader/renderer.ts index 49518e75..94325eb6 100644 --- a/src/plugins/downloader/renderer.ts +++ b/src/plugins/downloader/renderer.ts @@ -13,7 +13,7 @@ const downloadButton = ElementFromHtml(downloadHTML); let doneFirstLoad = false; -export default builder.createRenderer(() => { +export default builder.createRenderer(({ invoke, on }) => { return { onLoad() { const menuObserver = new MutationObserver(() => { @@ -54,14 +54,14 @@ export default builder.createRenderer(() => { } if (videoUrl.includes('?playlist=')) { - window.ipcRenderer.send('download-playlist-request', videoUrl); + invoke('download-playlist-request', videoUrl); return; } } else { videoUrl = getSongInfo().url || window.location.href; } - window.ipcRenderer.send('download-song', videoUrl); + invoke('download-song', videoUrl); }; document.addEventListener('apiLoaded', () => { @@ -71,7 +71,7 @@ export default builder.createRenderer(() => { }); }, { once: true, passive: true }); - window.ipcRenderer.on('downloader-feedback', (_, feedback: string) => { + on('downloader-feedback', (feedback: string) => { if (progress) { progress.innerHTML = feedback || 'Download'; } else {