Merge pull request #92 from th-ch/dependabot/npm_and_yarn/ini-1.3.7

Bump ini from 1.3.5 to 1.3.7

config/defaults.js

@@ -0,0 +1,38 @@
+const defaultConfig = {
+	"window-size": {
+		width: 1100,
+		height: 550,
+	},
+	url: "https://music.youtube.com",
+	options: {
+		tray: false,
+		appVisible: true,
+		autoUpdates: true,
+		hideMenu: false,
+		startAtLogin: false,
+		disableHardwareAcceleration: false,
+		restartOnConfigChanges: false,
+	},
+	plugins: {
+		// Enabled plugins
+		navigation: {
+			enabled: true,
+		},
+		shortcuts: {
+			enabled: true,
+		},
+		adblocker: {
+			enabled: true,
+			cache: true,
+			additionalBlockLists: [], // Additional list of filters, e.g "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt"
+		},
+		// Disabled plugins
+		downloader: {
+			enabled: false,
+			ffmpegArgs: [], // e.g. ["-b:a", "192k"] for an audio bitrate of 192kb/s
+			downloadFolder: undefined, // Custom download folder (absolute path)
+		},
+	},
+};
+
+module.exports = defaultConfig;

config/index.js

@@ -0,0 +1,21 @@
+const plugins = require("./plugins");
+const store = require("./store");
+
+const set = (key, value) => {
+	store.set(key, value);
+};
+
+const get = (key) => {
+	return store.get(key);
+};
+
+module.exports = {
+	get,
+	set,
+	edit: () => store.openInEditor(),
+	watch: (cb) => {
+		store.onDidChange("options", cb);
+		store.onDidChange("plugins", cb);
+	},
+	plugins,
+};

config/plugins.js

@@ -0,0 +1,41 @@
+const store = require("./store");
+
+function getEnabled() {
+	const plugins = store.get("plugins");
+	const enabledPlugins = Object.entries(plugins).filter(([plugin, options]) =>
+		isEnabled(plugin)
+	);
+	return enabledPlugins;
+}
+
+function isEnabled(plugin) {
+	const pluginConfig = store.get("plugins")[plugin];
+	return pluginConfig !== undefined && pluginConfig.enabled;
+}
+
+function setOptions(plugin, options) {
+	const plugins = store.get("plugins");
+	store.set("plugins", {
+		...plugins,
+		[plugin]: {
+			...plugins[plugin],
+			...options,
+		},
+	});
+}
+
+function enable(plugin) {
+	setOptions(plugin, { enabled: true });
+}
+
+function disable(plugin) {
+	setOptions(plugin, { enabled: false });
+}
+
+module.exports = {
+	isEnabled,
+	getEnabled,
+	enable,
+	disable,
+	setOptions,
+};

config/store.js

@@ -0,0 +1,40 @@
+const Store = require("electron-store");
+
+const defaults = require("./defaults");
+
+const migrations = {
+	">=1.7.0": (store) => {
+		const enabledPlugins = store.get("plugins");
+		if (!Array.isArray(enabledPlugins)) {
+			console.warn("Plugins are not in array format, cannot migrate");
+			return;
+		}
+
+		// Include custom options
+		const plugins = {
+			adblocker: {
+				enabled: true,
+				cache: true,
+				additionalBlockLists: [],
+			},
+			downloader: {
+				enabled: false,
+				ffmpegArgs: [], // e.g. ["-b:a", "192k"] for an audio bitrate of 192kb/s
+				downloadFolder: undefined, // Custom download folder (absolute path)
+			},
+		};
+		enabledPlugins.forEach((enabledPlugin) => {
+			plugins[enabledPlugin] = {
+				...plugins[enabledPlugin],
+				enabled: true,
+			};
+		});
+		store.set("plugins", plugins);
+	},
+};
+
+module.exports = new Store({
+	defaults,
+	clearInvalidConfig: false,
+	migrations,
+});

index.js

@@ -5,18 +5,8 @@ const electron = require("electron");
 const is = require("electron-is");
 const { autoUpdater } = require("electron-updater");
 
+const config = require("./config");
 const { setApplicationMenu } = require("./menu");
-const {
-	autoUpdate,
-	disableHardwareAcceleration,
-	getEnabledPlugins,
-	hideMenu,
-	isAppVisible,
-	isTrayEnabled,
-	setOptions,
-	store,
-	startAtLogin,
-} = require("./store");
 const { fileExists, injectCSS } = require("./plugins/utils");
 const { isTesting } = require("./utils/testing");
 const { setUpTray } = require("./tray");
@@ -28,7 +18,7 @@ app.commandLine.appendSwitch(
 	"--experimental-wasm-threads --experimental-wasm-bulk-memory"
 );
 app.allowRendererProcessReuse = true; // https://github.com/electron/electron/issues/18397
-if (disableHardwareAcceleration()) {
+if (config.get("options.disableHardwareAcceleration")) {
 	if (is.dev()) {
 		console.log("Disabling hardware acceleration");
 	}
@@ -64,19 +54,19 @@ function loadPlugins(win) {
 		}
 	});
 
-	getEnabledPlugins().forEach((plugin) => {
+	config.plugins.getEnabled().forEach(([plugin, options]) => {
 		console.log("Loaded plugin - " + plugin);
 		const pluginPath = path.join(__dirname, "plugins", plugin, "back.js");
 		fileExists(pluginPath, () => {
 			const handle = require(pluginPath);
-			handle(win);
+			handle(win, options);
 		});
 	});
 }
 
 function createMainWindow() {
-	const windowSize = store.get("window-size");
-	const windowMaximized = store.get("window-maximized");
+	const windowSize = config.get("window-size");
+	const windowMaximized = config.get("window-maximized");
 
 	const win = new electron.BrowserWindow({
 		icon: icon,
@@ -94,31 +84,34 @@ function createMainWindow() {
 		},
 		frame: !is.macOS(),
 		titleBarStyle: is.macOS() ? "hiddenInset" : "default",
-		autoHideMenuBar: hideMenu(),
+		autoHideMenuBar: config.get("options.hideMenu"),
 	});
 	if (windowMaximized) {
 		win.maximize();
 	}
 
-	win.webContents.loadURL(store.get("url"));
+	win.webContents.loadURL(config.get("url"));
 	win.on("closed", onClosed);
 
 	win.on("move", () => {
 		let position = win.getPosition();
-		store.set("window-position", { x: position[0], y: position[1] });
+		config.set("window-position", { x: position[0], y: position[1] });
 	});
 
 	win.on("resize", () => {
 		const windowSize = win.getSize();
 
-		store.set("window-maximized", win.isMaximized());
+		config.set("window-maximized", win.isMaximized());
 		if (!win.isMaximized()) {
-			store.set("window-size", { width: windowSize[0], height: windowSize[1] });
+			config.set("window-size", {
+				width: windowSize[0],
+				height: windowSize[1],
+			});
 		}
 	});
 
 	win.once("ready-to-show", () => {
-		if (isAppVisible()) {
+		if (config.get("options.appVisible")) {
 			win.show();
 		}
 	});
@@ -143,7 +136,7 @@ app.on("browser-window-created", (event, win) => {
 	win.webContents.on("did-navigate-in-page", () => {
 		const url = win.webContents.getURL();
 		if (url.startsWith("https://music.youtube.com")) {
-			store.set("url", url);
+			config.set("url", url);
 		}
 	});
 
@@ -196,14 +189,20 @@ app.on("activate", () => {
 app.on("ready", () => {
 	mainWindow = createMainWindow();
 	setApplicationMenu(mainWindow);
+	if (config.get("options.restartOnConfigChanges")) {
+		config.watch(() => {
+			app.relaunch();
+			app.exit();
+		});
+	}
 	setUpTray(app, mainWindow);
 
 	// Autostart at login
 	app.setLoginItemSettings({
-		openAtLogin: startAtLogin(),
+		openAtLogin: config.get("options.startAtLogin"),
 	});
 
-	if (!is.dev() && autoUpdate()) {
+	if (!is.dev() && config.get("options.autoUpdates")) {
 		autoUpdater.checkForUpdatesAndNotify();
 		autoUpdater.on("update-available", () => {
 			const downloadLink =
@@ -223,7 +222,7 @@ app.on("ready", () => {
 						break;
 					// Disable updates
 					case 2:
-						setOptions({ autoUpdates: false });
+						config.set("options.autoUpdates", false);
 						break;
 					default:
 						break;
@@ -234,7 +233,7 @@ app.on("ready", () => {
 
 	// Optimized for Mac OS X
 	if (is.macOS()) {
-		if (!isAppVisible()) {
+		if (!config.get("options.appVisible")) {
 			app.dock.hide();
 		}
 	}
@@ -244,7 +243,7 @@ app.on("ready", () => {
 		forceQuit = true;
 	});
 
-	if (is.macOS() || isTrayEnabled()) {
+	if (is.macOS() || config.get("options.tray")) {
 		mainWindow.on("close", (event) => {
 			// Hide the window instead of quitting (quit is available in tray options)
 			if (!forceQuit) {

menu.js

@@ -2,36 +2,34 @@ const { app, Menu } = require("electron");
 const is = require("electron-is");
 
 const { getAllPlugins } = require("./plugins/utils");
-const {
-	isPluginEnabled,
-	enablePlugin,
-	disablePlugin,
-	autoUpdate,
-	hideMenu,
-	isAppVisible,
-	isTrayEnabled,
-	setOptions,
-	startAtLogin,
-	disableHardwareAcceleration,
-} = require("./store");
+const config = require("./config");
 
 const mainMenuTemplate = (win) => [
 	{
 		label: "Plugins",
-		submenu: getAllPlugins().map((plugin) => {
-			return {
-				label: plugin,
-				type: "checkbox",
-				checked: isPluginEnabled(plugin),
-				click: (item) => {
-					if (item.checked) {
-						enablePlugin(plugin);
-					} else {
-						disablePlugin(plugin);
-					}
+		submenu: [
+			...getAllPlugins().map((plugin) => {
+				return {
+					label: plugin,
+					type: "checkbox",
+					checked: config.plugins.isEnabled(plugin),
+					click: (item) => {
+						if (item.checked) {
+							config.plugins.enable(plugin);
+						} else {
+							config.plugins.disable(plugin);
+						}
+					},
+				};
+			}),
+			{ type: "separator" },
+			{
+				label: "Advanced options",
+				click: () => {
+					config.edit();
 				},
-			};
-		}),
+			},
+		],
 	},
 	{
 		label: "Options",
@@ -39,17 +37,25 @@ const mainMenuTemplate = (win) => [
 			{
 				label: "Auto-update",
 				type: "checkbox",
-				checked: autoUpdate(),
+				checked: config.get("options.autoUpdates"),
 				click: (item) => {
-					setOptions({ autoUpdates: item.checked });
+					config.set("options.autoUpdates", item.checked);
 				},
 			},
 			{
 				label: "Disable hardware acceleration",
 				type: "checkbox",
-				checked: disableHardwareAcceleration(),
+				checked: config.get("options.disableHardwareAcceleration"),
 				click: (item) => {
-					setOptions({ disableHardwareAcceleration: item.checked });
+					config.set("options.disableHardwareAcceleration", item.checked);
+				},
+			},
+			{
+				label: "Restart on config changes",
+				type: "checkbox",
+				checked: config.get("options.restartOnConfigChanges"),
+				click: (item) => {
+					config.set("options.restartOnConfigChanges", item.checked);
 				},
 			},
 			...(is.windows() || is.linux()
@@ -57,9 +63,9 @@ const mainMenuTemplate = (win) => [
 						{
 							label: "Hide menu",
 							type: "checkbox",
-							checked: hideMenu(),
+							checked: config.get("options.hideMenu"),
 							click: (item) => {
-								setOptions({ hideMenu: item.checked });
+								config.set("options.hideMenu", item.checked);
 							},
 						},
 				  ]
@@ -71,9 +77,9 @@ const mainMenuTemplate = (win) => [
 						{
 							label: "Start at login",
 							type: "checkbox",
-							checked: startAtLogin(),
+							checked: config.get("options.startAtLogin"),
 							click: (item) => {
-								setOptions({ startAtLogin: item.checked });
+								config.set("options.startAtLogin", item.checked);
 							},
 						},
 				  ]
@@ -84,23 +90,35 @@ const mainMenuTemplate = (win) => [
 					{
 						label: "Disabled",
 						type: "radio",
-						checked: !isTrayEnabled(),
-						click: () => setOptions({ tray: false, appVisible: true }),
+						checked: !config.get("options.tray"),
+						click: () => {
+							config.set("options.tray", false);
+							config.set("options.appVisible", true);
+						},
 					},
 					{
 						label: "Enabled + app visible",
 						type: "radio",
-						checked: isTrayEnabled() && isAppVisible(),
-						click: () => setOptions({ tray: true, appVisible: true }),
+						checked:
+							config.get("options.tray") && config.get("options.appVisible"),
+						click: () => {
+							config.set("options.tray", true);
+							config.set("options.appVisible", true);
+						},
 					},
 					{
 						label: "Enabled + app hidden",
 						type: "radio",
-						checked: isTrayEnabled() && !isAppVisible(),
-						click: () => setOptions({ tray: true, appVisible: false }),
+						checked:
+							config.get("options.tray") && !config.get("options.appVisible"),
+						click: () => {
+							config.set("options.tray", true);
+							config.set("options.appVisible", false);
+						},
 					},
 				],
 			},
+			{ type: "separator" },
 			{
 				label: "Toggle DevTools",
 				// Cannot use "toggleDevTools" role in MacOS
@@ -114,6 +132,12 @@ const mainMenuTemplate = (win) => [
 					}
 				},
 			},
+			{
+				label: "Advanced options",
+				click: () => {
+					config.edit();
+				},
+			},
 		],
 	},
 ];

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "youtube-music",
 	"productName": "YouTube Music",
-	"version": "1.6.5",
+	"version": "1.7.4",
 	"description": "YouTube Music Desktop App - including custom plugins",
 	"license": "MIT",
 	"repository": "th-ch/youtube-music",
@@ -48,7 +48,7 @@
 		"npm": "Please use yarn and not npm"
 	},
 	"dependencies": {
-		"@cliqz/adblocker-electron": "^1.18.6",
+		"@cliqz/adblocker-electron": "^1.18.8",
 		"@ffmpeg/core": "^0.8.4",
 		"@ffmpeg/ffmpeg": "^0.9.5",
 		"YoutubeNonStop": "git://github.com/lawfx/YoutubeNonStop.git#v0.8.0",

plugins/adblocker/back.js

@@ -1,2 +1,8 @@
 const { loadAdBlockerEngine } = require("./blocker");
-module.exports = (win) => loadAdBlockerEngine(win.webContents.session);
+module.exports = (win, options) =>
+	loadAdBlockerEngine(
+		win.webContents.session,
+		options.cache,
+		options.additionalBlockLists,
+		options.disableDefaultLists
+	);

plugins/adblocker/blocker.js

@@ -6,19 +6,32 @@ const fetch = require("node-fetch");
 
 const SOURCES = [
 	"https://raw.githubusercontent.com/kbinani/adblock-youtube-ads/master/signed.txt",
+	// uBlock Origin
+	"https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt",
+	"https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2020.txt",
 ];
 
-const loadAdBlockerEngine = (session = undefined) =>
-	ElectronBlocker.fromLists(
-		fetch,
-		SOURCES,
-		{},
-		{
-			path: path.resolve(__dirname, "ad-blocker-engine.bin"),
-			read: promises.readFile,
-			write: promises.writeFile,
-		}
-	)
+const loadAdBlockerEngine = (
+	session = undefined,
+	cache = true,
+	additionalBlockLists = [],
+	disableDefaultLists = false
+) => {
+	// Only use cache if no additional blocklists are passed
+	const cachingOptions =
+		cache && additionalBlockLists.length === 0
+			? {
+					path: path.resolve(__dirname, "ad-blocker-engine.bin"),
+					read: promises.readFile,
+					write: promises.writeFile,
+			  }
+			: undefined;
+	const lists = [
+		...(disableDefaultLists ? [] : SOURCES),
+		...additionalBlockLists,
+	];
+
+	ElectronBlocker.fromLists(fetch, lists, {}, cachingOptions)
 		.then((blocker) => {
 			if (session) {
 				blocker.enableBlockingInSession(session);
@@ -27,6 +40,7 @@ const loadAdBlockerEngine = (session = undefined) =>
 			}
 		})
 		.catch((err) => console.log("Error loading adBlocker engine", err));
+};
 
 module.exports = { loadAdBlockerEngine };
 if (require.main === module) {

plugins/adblocker/front.js

@@ -0,0 +1,4 @@
+module.exports = () => {
+	// Preload adblocker to inject scripts/styles
+	require("@cliqz/adblocker-electron-preload/dist/preload.cjs");
+};

plugins/downloader/front.js

@@ -7,6 +7,7 @@ let progress = null;
 const downloadButton = ElementFromFile(
 	templatePath(__dirname, "download.html")
 );
+let pluginOptions = {};
 
 const observer = new MutationObserver((mutations, observer) => {
 	if (!menu) {
@@ -43,11 +44,13 @@ global.download = () => {
 			triggerAction(CHANNEL, ACTIONS.ERROR, error);
 			reinit();
 		},
-		reinit
+		reinit,
+		pluginOptions
 	);
 };
 
-function observeMenu() {
+function observeMenu(options) {
+	pluginOptions = { ...pluginOptions, ...options };
 	observer.observe(document, {
 		childList: true,
 		subtree: true,

plugins/downloader/youtube-dl.js

@@ -19,7 +19,13 @@ const ffmpeg = createFFmpeg({
 	progress: () => {}, // console.log,
 });
 
-const downloadVideoToMP3 = (videoUrl, sendFeedback, sendError, reinit) => {
+const downloadVideoToMP3 = (
+	videoUrl,
+	sendFeedback,
+	sendError,
+	reinit,
+	options
+) => {
 	sendFeedback("Downloading…");
 
 	let videoName = "YouTube Music - Unknown title";
@@ -54,11 +60,18 @@ const downloadVideoToMP3 = (videoUrl, sendFeedback, sendError, reinit) => {
 		.on("error", sendError)
 		.on("end", () => {
 			const buffer = Buffer.concat(chunks);
-			toMP3(videoName, buffer, sendFeedback, sendError, reinit);
+			toMP3(videoName, buffer, sendFeedback, sendError, reinit, options);
 		});
 };
 
-const toMP3 = async (videoName, buffer, sendFeedback, sendError, reinit) => {
+const toMP3 = async (
+	videoName,
+	buffer,
+	sendFeedback,
+	sendError,
+	reinit,
+	options
+) => {
 	const safeVideoName = randomBytes(32).toString("hex");
 
 	try {
@@ -71,11 +84,17 @@ const toMP3 = async (videoName, buffer, sendFeedback, sendError, reinit) => {
 		ffmpeg.FS("writeFile", safeVideoName, buffer);
 
 		sendFeedback("Converting…");
-		await ffmpeg.run("-i", safeVideoName, safeVideoName + ".mp3");
+		await ffmpeg.run(
+			"-i",
+			safeVideoName,
+			...options.ffmpegArgs,
+			safeVideoName + ".mp3"
+		);
 
+		const folder = options.downloadFolder || downloadsFolder();
 		const filename = filenamify(videoName + ".mp3", { replacement: "_" });
 		writeFileSync(
-			join(downloadsFolder(), filename),
+			join(folder, filename),
 			ffmpeg.FS("readFile", safeVideoName + ".mp3")
 		);
 

preload.js

@@ -2,31 +2,31 @@ const path = require("path");
 
 const { remote } = require("electron");
 
-const { getEnabledPlugins, store } = require("./store");
-const { fileExists }               = require("./plugins/utils");
+const config = require("./config");
+const { fileExists } = require("./plugins/utils");
 
-const plugins = getEnabledPlugins();
+const plugins = config.plugins.getEnabled();
 
-plugins.forEach(plugin => {
+plugins.forEach(([plugin, options]) => {
 	const pluginPath = path.join(__dirname, "plugins", plugin, "actions.js");
 	fileExists(pluginPath, () => {
 		const actions = require(pluginPath).global || {};
-		Object.keys(actions).forEach(actionName => {
+		Object.keys(actions).forEach((actionName) => {
 			global[actionName] = actions[actionName];
 		});
 	});
 });
 
 document.addEventListener("DOMContentLoaded", () => {
-	plugins.forEach(plugin => {
+	plugins.forEach(([plugin, options]) => {
 		const pluginPath = path.join(__dirname, "plugins", plugin, "front.js");
 		fileExists(pluginPath, () => {
 			const run = require(pluginPath);
-			run();
+			run(options);
 		});
 	});
 
 	// Add action for reloading
 	global.reload = () =>
-		remote.getCurrentWindow().webContents.loadURL(store.get("url"));
+		remote.getCurrentWindow().webContents.loadURL(config.get("url"));
 });

readme.md

@@ -1,11 +1,16 @@
 # YouTube Music
 
-[![GitHub release](https://img.shields.io/github/release/th-ch/youtube-music.svg)](https://GitHub.com/th-ch/youtube-music/releases/)
-[![GitHub license](https://img.shields.io/github/license/th-ch/youtube-music.svg)](https://github.com/th-ch/youtube-music/blob/master/LICENSE)
-[![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/sindresorhus/xo)
-[![Build status](https://github.com/th-ch/youtube-music/workflows/Build%20YouTube%20Music/badge.svg)](https://GitHub.com/th-ch/youtube-music/releases/)
-[![Known Vulnerabilities](https://snyk.io/test/github/th-ch/youtube-music/badge.svg)](https://snyk.io/test/github/th-ch/youtube-music)
-![GitHub All Releases](https://img.shields.io/github/downloads/th-ch/youtube-music/total)
+<div align="center">
+
+[![GitHub release](https://img.shields.io/github/release/th-ch/youtube-music.svg?style=for-the-badge&logo=youtube-music)](https://github.com/th-ch/youtube-music/releases/)
+[![GitHub license](https://img.shields.io/github/license/th-ch/youtube-music.svg?style=for-the-badge)](https://github.com/th-ch/youtube-music/blob/master/LICENSE)
+[![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg?style=for-the-badge)](https://github.com/sindresorhus/xo)
+[![Build status](https://img.shields.io/github/workflow/status/th-ch/youtube-music/Build%20YouTube%20Music?style=for-the-badge&logo=youtube-music)](https://GitHub.com/th-ch/youtube-music/releases/)
+[![Known Vulnerabilities](https://img.shields.io/snyk/vulnerabilities/github/th-ch/youtube-music?style=for-the-badge)](https://snyk.io/test/github/th-ch/youtube-music)
+[![GitHub All Releases](https://img.shields.io/github/downloads/th-ch/youtube-music/total?style=for-the-badge&logo=youtube-music)](https://GitHub.com/th-ch/youtube-music/releases/)
+[![AUR](https://img.shields.io/aur/version/youtube-music-bin?color=blueviolet&style=for-the-badge&logo=youtube-music)](https://aur.archlinux.org/packages/youtube-music-bin)
+
+</div>
 
 ![Screenshot](screenshot.jpg "Screenshot")
 
@@ -18,7 +23,7 @@
 
 You can check out the [latest release](https://github.com/th-ch/youtube-music/releases/latest) to quickly find the latest version.
 
-**Arch Linux**
+### Arch Linux
 
 Install the `youtube-music-bin` package from the AUR. For AUR installation instructions, take a look at this [wiki page](https://wiki.archlinux.org/index.php/Arch_User_Repository#Installing_packages).
 

store/index.js

@@ -1,40 +0,0 @@
-const Store = require("electron-store");
-const plugins = require("./plugins");
-
-const store = new Store({
-	defaults: {
-		"window-size": {
-			width: 1100,
-			height: 550,
-		},
-		url: "https://music.youtube.com",
-		plugins: ["navigation", "shortcuts", "adblocker"],
-		options: {
-			tray: false,
-			appVisible: true,
-			autoUpdates: true,
-			hideMenu: false,
-			startAtLogin: false,
-			disableHardwareAcceleration: false,
-		},
-	},
-});
-
-module.exports = {
-	store: store,
-	// Plugins
-	isPluginEnabled: plugin => plugins.isEnabled(store, plugin),
-	getEnabledPlugins: () => plugins.getEnabledPlugins(store),
-	enablePlugin: plugin => plugins.enablePlugin(store, plugin),
-	disablePlugin: plugin => plugins.disablePlugin(store, plugin),
-	// Options
-	setOptions: options =>
-		store.set("options", { ...store.get("options"), ...options }),
-	isTrayEnabled: () => store.get("options.tray"),
-	isAppVisible: () => store.get("options.appVisible"),
-	autoUpdate: () => store.get("options.autoUpdates"),
-	hideMenu: () => store.get("options.hideMenu"),
-	startAtLogin: () => store.get("options.startAtLogin"),
-	disableHardwareAcceleration: () =>
-		store.get("options.disableHardwareAcceleration"),
-};

store/plugins.js

@@ -1,31 +0,0 @@
-function getEnabledPlugins(store) {
-	return store.get("plugins");
-}
-
-function isEnabled(store, plugin) {
-	return store.get("plugins").indexOf(plugin) > -1;
-}
-
-function enablePlugin(store, plugin) {
-	let plugins = getEnabledPlugins(store);
-	if (plugins.indexOf(plugin) === -1) {
-		plugins.push(plugin);
-		store.set("plugins", plugins);
-	}
-}
-
-function disablePlugin(store, plugin) {
-	let plugins = getEnabledPlugins(store);
-	let index   = plugins.indexOf(plugin);
-	if (index > -1) {
-		plugins.splice(index, 1);
-		store.set("plugins", plugins);
-	}
-}
-
-module.exports = {
-	isEnabled        : isEnabled,
-	getEnabledPlugins: getEnabledPlugins,
-	enablePlugin     : enablePlugin,
-	disablePlugin    : disablePlugin
-};

tray.js

@@ -2,15 +2,15 @@ const path = require("path");
 
 const { Menu, nativeImage, Tray } = require("electron");
 
+const config = require("./config");
 const { mainMenuTemplate } = require("./menu");
-const { isTrayEnabled } = require("./store");
 const { clickInYoutubeMusic } = require("./utils/youtube-music");
 
 // Prevent tray being garbage collected
 let tray;
 
 module.exports.setUpTray = (app, win) => {
-	if (!isTrayEnabled()) {
+	if (!config.get("options.tray")) {
 		tray = undefined;
 		return;
 	}

yarn.lock

@@ -372,31 +372,31 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@cliqz/adblocker-content@^1.18.6":
-  version "1.18.6"
-  resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.18.6.tgz#a65dd518f3e6d1f2e9fee36ca5ae5615ba7b4cfd"
-  integrity sha512-OXrca20n+cMn9Ase+6oeX3fTmkauQMSb//lMLs56pHyra4foxN5o1rNiBG7qNIypdGQBFiTtGG7Vbp7YO5RQMw==
+"@cliqz/adblocker-content@^1.18.8":
+  version "1.18.8"
+  resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.18.8.tgz#96473f14c098a20091298d34a6addcd430aceebd"
+  integrity sha512-YZ1xYBVG3LmxsdTYvTs/Bc7pzCw/Dy4HFo6N+oIuGP+Le/0aGSkACUl3ue5I2+Cx0WmL0Z8I4QonTKDc06HR+A==
 
-"@cliqz/adblocker-electron-preload@^1.18.6":
-  version "1.18.6"
-  resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.18.6.tgz#57ec2dac09bbacb03b143609345638e98132f985"
-  integrity sha512-cOK6ZuN3j0qLCZUj8oCf2PmPY837VTxtZM6bZl1x5xWLy/31x7186Wk0DP3C9MXU7gUhlqYxxKpbJDLZgFJ7Qw==
+"@cliqz/adblocker-electron-preload@^1.18.8":
+  version "1.18.8"
+  resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.18.8.tgz#c2058647e015b6f61c222e7d58040347324c63b0"
+  integrity sha512-/FAzyhNUj+8fwqSGth7ndaC+8huEANvVquYkDVmjM38uryxFgcJJI6Bij1l1zABIbskAaSN4G4RI3oERyd9/KQ==
   dependencies:
-    "@cliqz/adblocker-content" "^1.18.6"
+    "@cliqz/adblocker-content" "^1.18.8"
 
-"@cliqz/adblocker-electron@^1.18.6":
-  version "1.18.6"
-  resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.18.6.tgz#e387a1dc6f3f4a4005d299b37723899be4f0967b"
-  integrity sha512-RGy003FHsvcLoGYaQIJVNWX8ZUQmK+Dbo0LeQAcsP96vOaTHHFOVj0Auhwkg7mZASiR9/XnoNepKIifO2zQVfw==
+"@cliqz/adblocker-electron@^1.18.8":
+  version "1.18.8"
+  resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.18.8.tgz#5f697c5dc65cd936b3908078a6e4516ec995567a"
+  integrity sha512-CrsFjSwenWQogsAg4sHFaXZbu7hzs9dMdsZM5wxb+5QfZ3MSH3PBYAeAUnsmP3UOTZ423+6ErOUE1vzj3UrK9w==
   dependencies:
-    "@cliqz/adblocker" "^1.18.6"
-    "@cliqz/adblocker-electron-preload" "^1.18.6"
+    "@cliqz/adblocker" "^1.18.8"
+    "@cliqz/adblocker-electron-preload" "^1.18.8"
     tldts-experimental "^5.6.21"
 
-"@cliqz/adblocker@^1.18.6":
-  version "1.18.6"
-  resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.18.6.tgz#07d075c45017db7cd2aff19afe466ad53217d318"
-  integrity sha512-+ro8DoqBaMt9nmfjJF+0Om03/9hdDhRx6NJKzwmW7Pfvd/XhqJ+NiDtdusABSERhCE3nUXCWdu5j09X9HiX6Vg==
+"@cliqz/adblocker@^1.18.8":
+  version "1.18.8"
+  resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.18.8.tgz#f6e5724fe6573c2e68f2545d90bcce3e1ecfbae9"
+  integrity sha512-19m0GhlOcdSvQ/BqVuaMgbYkgQ4ys8koBRW4K7Ua4V5fFWL0t8ckdcZ/gBOqwECS2m8agXSpEbbyJjNmHBHpMQ==
   dependencies:
     "@remusao/guess-url-type" "^1.1.2"
     "@remusao/small" "^1.1.2"
@@ -4544,9 +4544,9 @@ inherits@2.0.3:
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84"
+  integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==
 
 interpret@^1.2.0:
   version "1.2.0"