smueller/youtube-music
1
0
Fork 0
mirror of https://github.com/th-ch/youtube-music.git synced 2026-01-11 18:41:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: plugin config default value

Browse Source
This commit is contained in:
JellyBrick
2023-11-28 10:21:08 +09:00
parent 04d7b32d3f
commit 3e8a0ec49a
12 changed files with 44 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/loader/main.ts
View File

@ -1,7 +1,7 @@
import { BrowserWindow, ipcMain } from 'electron';
import { deepmerge } from 'deepmerge-ts';
import { mainPlugins } from 'virtual:plugins';
import { allPlugins, mainPlugins } from 'virtual:plugins';
import config from '@/config';
import { startPlugin, stopPlugin } from '@/utils';
@ -14,11 +14,11 @@ const loadedPluginMap: Record<string, PluginDef<unknown, unknown, unknown>> = {}
const createContext = (id: string, win: BrowserWindow): BackendContext<PluginConfig> => ({
getConfig: () =>
deepmerge(
mainPlugins[id].config,
config.get(`plugins.${id}`) ?? { enabled: false },
allPlugins[id].config ?? { enabled: false },
config.get(`plugins.${id}`) ?? {},
) as PluginConfig,
setConfig: (newConfig) => {
config.setPartial(`plugins.${id}`, newConfig);
config.setPartial(`plugins.${id}`, newConfig, allPlugins[id].config);
},
ipc: {
@ -102,11 +102,10 @@ export const forceLoadMainPlugin = async (
) {
loadedPluginMap[id] = plugin;
resolve();
} else {
console.log('[YTMusic]', `Cannot load "${id}" plugin`);
reject();
}
console.log('[YTMusic]', `Cannot load "${id}" plugin`);
reject();
return;
} catch (err) {
console.error(
'[YTMusic]',

10
src/loader/menu.ts
View File

@ -10,9 +10,13 @@ import type { PluginConfig } from '@/types/plugins';
const menuTemplateMap: Record<string, MenuItemConstructorOptions[]> = {};
const createContext = (id: string, win: BrowserWindow): MenuContext<PluginConfig> => ({
getConfig: () => config.plugins.getOptions(id),
getConfig: () =>
deepmerge(
allPlugins[id].config ?? { enabled: false },
config.get(`plugins.${id}`) ?? {},
) as PluginConfig,
setConfig: (newConfig) => {
config.setPartial(`plugins.${id}`, newConfig);
config.setPartial(`plugins.${id}`, newConfig, allPlugins[id].config);
},
window: win,
refresh: () => {
@ -44,7 +48,7 @@ export const loadAllMenuPlugins = (win: BrowserWindow) => {
const pluginConfigs = config.plugins.getPlugins();
for (const [pluginId, pluginDef] of Object.entries(allPlugins)) {
const config = deepmerge(pluginDef.config, pluginConfigs[pluginId] ?? {});
const config = deepmerge(pluginDef.config ?? { enabled: false }, pluginConfigs[pluginId] ?? {});
if (config.enabled) {
forceLoadMenuPlugin(pluginId, win);

10
src/loader/preload.ts
View File

@ -1,5 +1,5 @@
import { deepmerge } from 'deepmerge-ts';
import { preloadPlugins } from 'virtual:plugins';
import { allPlugins, preloadPlugins } from 'virtual:plugins';
import { startPlugin, stopPlugin } from '@/utils';
@ -10,9 +10,13 @@ import type { PluginConfig, PluginDef } from '@/types/plugins';
const loadedPluginMap: Record<string, PluginDef<unknown, unknown, unknown>> = {};
const createContext = (id: string): PreloadContext<PluginConfig> => ({
getConfig: () => config.plugins.getOptions(id),
getConfig: () =>
deepmerge(
allPlugins[id].config ?? { enabled: false },
config.get(`plugins.${id}`) ?? {},
) as PluginConfig,
setConfig: (newConfig) => {
config.setPartial(`plugins.${id}`, newConfig);
config.setPartial(`plugins.${id}`, newConfig, allPlugins[id].config);
},
});