Adblocker: add option to disable default lists

Add AUR badge + beautify badges

package.json

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

plugins/adblocker/back.js

@@ -3,5 +3,6 @@ module.exports = (win, options) =>
 	loadAdBlockerEngine(
 		win.webContents.session,
 		options.cache,
-		options.additionalBlockLists
+		options.additionalBlockLists,
+		options.disableDefaultLists
 	);

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");
@@ -11,26 +11,24 @@ const SOURCES = [
 const loadAdBlockerEngine = (
 	session = undefined,
 	cache = true,
-	additionalBlockLists = []
+	additionalBlockLists = [],
+	disableDefaultLists = false
 ) => {
-	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;
+	const lists = [
+		...(disableDefaultLists ? [] : SOURCES),
+		...additionalBlockLists,
+	];
 
-	ElectronBlocker.fromLists(
-		fetch,
-		[...SOURCES, ...additionalBlockLists],
-		{},
-		cachingOptions
-	)
+	ElectronBlocker.fromLists(fetch, lists, {}, cachingOptions)
 		.then((blocker) => {
 			if (session) {
 				blocker.enableBlockingInSession(session);

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