This commit is contained in:
JellyBrick
2023-10-04 22:53:25 +09:00
parent 78d8160823
commit 50117ea51b
2 changed files with 8 additions and 5 deletions

View File

@ -21,14 +21,14 @@ export const loadAdBlockerEngine = (
session: Electron.Session | undefined = undefined,
cache = true,
additionalBlockLists = [],
disableDefaultLists: boolean | string[] = false,
disableDefaultLists: boolean | unknown[] = false,
) => {
// Only use cache if no additional blocklists are passed
let cacheDirectory: string;
if (app.isPackaged) {
cacheDirectory = path.join(app.getPath('userData'), 'cache');
cacheDirectory = path.join(app.getPath('userData'), 'adblock_cache');
} else {
cacheDirectory = path.resolve(__dirname, 'cache');
cacheDirectory = path.resolve(__dirname, 'adblock_cache');
}
if (!fs.existsSync(cacheDirectory)) {
fs.mkdirSync(cacheDirectory);
@ -42,7 +42,10 @@ export const loadAdBlockerEngine = (
}
: undefined;
const lists = [
...(disableDefaultLists ? [] : SOURCES),
...(
(disableDefaultLists && !Array.isArray(disableDefaultLists)) ||
(Array.isArray(disableDefaultLists) && disableDefaultLists.length > 0) ? [] : SOURCES
),
...additionalBlockLists,
];