Bugfix: only use cache with no additional blocklists

Add AUR badge + beautify badges

config/defaults.js

@@ -11,6 +11,7 @@ const defaultConfig = {
 		hideMenu: false,
 		startAtLogin: false,
 		disableHardwareAcceleration: false,
+		restartOnConfigChanges: false,
 	},
 	plugins: {
 		// Enabled plugins

config/index.js

@@ -13,6 +13,9 @@ module.exports = {
 	get,
 	set,
 	edit: () => store.openInEditor(),
-	watch: (cb) => store.onDidAnyChange(cb),
+	watch: (cb) => {
+		store.onDidChange("options", cb);
+		store.onDidChange("plugins", cb);
+	},
 	plugins,
 };

index.js

@@ -189,9 +189,12 @@ app.on("activate", () => {
 app.on("ready", () => {
 	mainWindow = createMainWindow();
 	setApplicationMenu(mainWindow);
-	config.watch(() => {
-		setApplicationMenu(mainWindow);
-	});
+	if (config.get("options.restartOnConfigChanges")) {
+		config.watch(() => {
+			app.relaunch();
+			app.exit();
+		});
+	}
 	setUpTray(app, mainWindow);
 
 	// Autostart at login

menu.js

@@ -50,6 +50,14 @@ const mainMenuTemplate = (win) => [
 					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()
 				? [
 						{

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "youtube-music",
 	"productName": "YouTube Music",
-	"version": "1.7.0",
+	"version": "1.7.2",
 	"description": "YouTube Music Desktop App - including custom plugins",
 	"license": "MIT",
 	"repository": "th-ch/youtube-music",

plugins/adblocker/blocker.js

@@ -1,4 +1,4 @@
-const { existsSync, promises, unlinkSync } = require("fs"); // used for caching
+const { promises } = require("fs"); // used for caching
 const path = require("path");
 
 const { ElectronBlocker } = require("@cliqz/adblocker-electron");
@@ -13,17 +13,15 @@ const loadAdBlockerEngine = (
 	cache = true,
 	additionalBlockLists = []
 ) => {
-	const adBlockerCache = path.resolve(__dirname, "ad-blocker-engine.bin");
-	if (!cache && existsSync(adBlockerCache)) {
-		unlinkSync(adBlockerCache);
-	}
-	const cachingOptions = cache
-		? {
-				path: adBlockerCache,
-				read: promises.readFile,
-				write: promises.writeFile,
-		  }
-		: undefined;
+	// 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;
 
 	ElectronBlocker.fromLists(
 		fetch,

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).