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

fix: add default config

Browse Source
This commit is contained in:
JellyBrick
2023-11-11 19:32:05 +09:00
parent 1f96b6b44d
commit b470dbd6b9
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/index.ts
View File

@ -103,7 +103,7 @@ if (is.windows()) {
ipcMain.handle('get-main-plugin-names', () => Object.keys(mainPlugins));
const initHook = (win: BrowserWindow) => {
ipcMain.handle('get-config', (_, id: keyof PluginBuilderList) => config.get(`plugins.${id}` as never) ?? pluginBuilders[id].config);
ipcMain.handle('get-config', (_, id: keyof PluginBuilderList) => deepmerge(pluginBuilders[id].config, config.get(`plugins.${id}`)) as PluginBuilderList[typeof id]['config']);
ipcMain.handle('set-config', (_, name: string, obj: object) => config.setPartial(`plugins.${name}`, obj));
config.watch((newValue) => {
@ -148,7 +148,7 @@ async function loadPlugins(win: BrowserWindow) {
Key extends keyof PluginBuilderList,
Config extends PluginBaseConfig = PluginBuilderList[Key]['config'],
>(name: Key): MainPluginContext<Config> => ({
getConfig: () => config.get(`plugins.${name}`) as unknown as Config,
getConfig: () => deepmerge(pluginBuilders[name].config, config.get(`plugins.${name}`)) as Config,
setConfig: (newConfig) => {
config.setPartial(`plugins.${name}`, newConfig);
},

6
src/menu.ts
View File

@ -2,6 +2,8 @@ import is from 'electron-is';
import { app, BrowserWindow, clipboard, dialog, Menu } from 'electron';
import prompt from 'custom-electron-prompt';
import { deepmerge as createDeepmerge } from '@fastify/deepmerge';
import { restart } from './providers/app-controls';
import config from './config';
import { startingPages } from './providers/extracted-data';
@ -22,6 +24,8 @@ const inAppMenuActive = config.plugins.isEnabled('in-app-menu');
const betaPlugins = ['crossfade', 'lumiastream'];
const deepmerge = createDeepmerge();
const pluginEnabledMenu = (plugin: string, label = '', hasSubmenu = false, refreshMenu: (() => void ) | undefined = undefined): Electron.MenuItemConstructorOptions => ({
label: label || plugin,
type: 'checkbox',
@ -52,7 +56,7 @@ export const mainMenuTemplate = async (win: BrowserWindow): Promise<MenuTemplate
Key extends keyof PluginBuilderList,
Config extends PluginBaseConfig = PluginBuilderList[Key]['config'],
>(name: Key): MenuPluginContext<Config> => ({
getConfig: () => config.get(`plugins.${name}`) as unknown as Config,
getConfig: () => deepmerge(pluginBuilders[name].config, config.get(`plugins.${name}`)) as Config,
setConfig: (newConfig) => {
config.setPartial(`plugins.${name}`, newConfig);
},

2
src/preload.ts
View File

@ -17,7 +17,7 @@ const createContext = <
Key extends keyof PluginBuilderList,
Config extends PluginBaseConfig = PluginBuilderList[Key]['config'],
>(name: Key): PluginContext<Config> => ({
getConfig: () => config.get(`plugins.${name}`) as unknown as Config,
getConfig: () => deepmerge(pluginBuilders[name].config, config.get(`plugins.${name}`)) as Config,
setConfig: (newConfig) => {
config.setPartial(`plugins.${name}`, newConfig);
},