Skip to content

Commit 840a79b

Browse files
Alex313031Alex313031
committed
3.3.4
1 parent b188143 commit 840a79b

11 files changed

Lines changed: 516 additions & 176 deletions

patches/@cliqz+adblocker-electron+1.26.15.patch renamed to assets/@cliqz+adblocker-electron+1.26.15.patch

File renamed without changes.

‎package-lock.json‎

Lines changed: 367 additions & 69 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"appName": "quark-player",
44
"productName": "Quark Player",
55
"applicationId": "com.alex313031.quark-player",
6-
"version": "3.3.3",
6+
"version": "3.3.4",
77
"description": "Electron based Web Video Services Player. Supporting Netflix, Youtube, Twitch, Floatplane and More.",
88
"main": "./src/main.js",
99
"engines": {
@@ -52,11 +52,11 @@
5252
"stylelint-config-standard": "29.0.0"
5353
},
5454
"dependencies": {
55-
"@cliqz/adblocker": "1.26.15",
56-
"@cliqz/adblocker-content": "1.26.15",
57-
"@cliqz/adblocker-electron": "1.26.15",
58-
"@cliqz/adblocker-electron-preload": "1.26.15",
59-
"@cliqz/adblocker-extended-selectors": "1.26.15",
55+
"@cliqz/adblocker": "1.26.16",
56+
"@cliqz/adblocker-content": "1.26.16",
57+
"@cliqz/adblocker-electron": "1.26.16",
58+
"@cliqz/adblocker-electron-preload": "1.26.16",
59+
"@cliqz/adblocker-extended-selectors": "1.26.16",
6060
"@electron/remote": "2.1.2",
6161
"electron-context-menu": "3.6.1",
6262
"electron-localshortcut": "3.2.1",

assets/@cliqz+adblocker-electron+1.26.12.patch renamed to patches/@cliqz+adblocker-electron+1.26.16.patch

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
diff --git a/node_modules/@cliqz/adblocker-electron/dist/cjs/adblocker.js b/node_modules/@cliqz/adblocker-electron/dist/cjs/adblocker.js
2-
index cb3d3fd..47e08a8 100644
2+
index 2269579..bb31400 100644
33
--- a/node_modules/@cliqz/adblocker-electron/dist/cjs/adblocker.js
44
+++ b/node_modules/@cliqz/adblocker-electron/dist/cjs/adblocker.js
5-
@@ -25,7 +25,7 @@ exports.ElectronBlocker = exports.BlockingContext = exports.fromElectronDetails
5+
@@ -26,7 +26,7 @@ const path_1 = require("path");
66
const electron_1 = require("electron");
77
const tldts_experimental_1 = require("tldts-experimental");
88
const adblocker_1 = require("@cliqz/adblocker");
9-
-const PRELOAD_PATH = require.resolve('@cliqz/adblocker-electron-preload');
10-
+// const PRELOAD_PATH = require.resolve('@cliqz/adblocker-electron-preload');
9+
-const PRELOAD_PATH = (0, path_1.resolve)(require.resolve('@cliqz/adblocker-electron-preload'));
10+
+// const PRELOAD_PATH = (0, path_1.resolve)(require.resolve('@cliqz/adblocker-electron-preload'));
1111
// https://stackoverflow.com/questions/48854265/why-do-i-see-an-electron-security-warning-after-updating-my-electron-project-t
1212
process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true';
1313
/**
14-
@@ -66,7 +66,7 @@ class BlockingContext {
14+
@@ -67,7 +67,7 @@ class BlockingContext {
1515
}
1616
enable() {
1717
if (this.blocker.config.loadCosmeticFilters === true) {
@@ -20,7 +20,7 @@ index cb3d3fd..47e08a8 100644
2020
electron_1.ipcMain.on('get-cosmetic-filters-first', this.onGetCosmeticFiltersFirst);
2121
electron_1.ipcMain.on('get-cosmetic-filters', this.onGetCosmeticFiltersUpdated);
2222
electron_1.ipcMain.on('is-mutation-observer-enabled', this.onIsMutationObserverEnabled);
23-
@@ -90,7 +90,7 @@ class BlockingContext {
23+
@@ -91,7 +91,7 @@ class BlockingContext {
2424
this.session.webRequest.onBeforeRequest(null);
2525
}
2626
if (this.blocker.config.loadCosmeticFilters === true) {
@@ -30,19 +30,19 @@ index cb3d3fd..47e08a8 100644
3030
}
3131
}
3232
diff --git a/node_modules/@cliqz/adblocker-electron/dist/es6/adblocker.js b/node_modules/@cliqz/adblocker-electron/dist/es6/adblocker.js
33-
index d8a658e..11669b3 100644
33+
index d9bb84e..a83611d 100644
3434
--- a/node_modules/@cliqz/adblocker-electron/dist/es6/adblocker.js
3535
+++ b/node_modules/@cliqz/adblocker-electron/dist/es6/adblocker.js
36-
@@ -8,7 +8,7 @@
36+
@@ -9,7 +9,7 @@ import { resolve } from 'path';
3737
import { ipcMain } from 'electron';
3838
import { parse } from 'tldts-experimental';
3939
import { FiltersEngine, Request } from '@cliqz/adblocker';
40-
-const PRELOAD_PATH = require.resolve('@cliqz/adblocker-electron-preload');
41-
+// const PRELOAD_PATH = require.resolve('@cliqz/adblocker-electron-preload');
40+
-const PRELOAD_PATH = resolve(require.resolve('@cliqz/adblocker-electron-preload'));
41+
+// const PRELOAD_PATH = resolve(require.resolve('@cliqz/adblocker-electron-preload'));
4242
// https://stackoverflow.com/questions/48854265/why-do-i-see-an-electron-security-warning-after-updating-my-electron-project-t
4343
process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true';
4444
/**
45-
@@ -48,7 +48,7 @@ export class BlockingContext {
45+
@@ -49,7 +49,7 @@ export class BlockingContext {
4646
}
4747
enable() {
4848
if (this.blocker.config.loadCosmeticFilters === true) {
@@ -51,7 +51,7 @@ index d8a658e..11669b3 100644
5151
ipcMain.on('get-cosmetic-filters-first', this.onGetCosmeticFiltersFirst);
5252
ipcMain.on('get-cosmetic-filters', this.onGetCosmeticFiltersUpdated);
5353
ipcMain.on('is-mutation-observer-enabled', this.onIsMutationObserverEnabled);
54-
@@ -72,7 +72,7 @@ export class BlockingContext {
54+
@@ -73,7 +73,7 @@ export class BlockingContext {
5555
this.session.webRequest.onBeforeRequest(null);
5656
}
5757
if (this.blocker.config.loadCosmeticFilters === true) {

‎src/default-services.js‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,13 @@ module.exports = [
124124
url: 'https://www.hbomax.com',
125125
color: '#4306BA',
126126
style: {},
127+
userAgent: 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.5359.215 Safari/537.36',
127128
permissions: []
128129
},
129130
{
130131
name: 'HDFull TV',
131132
title: 'HDFull',
133+
hidden: true,
132134
logo: 'imgs/hd_full.png',
133135
url: 'https://hdfull.sbs',
134136
color: '#129ED9',
@@ -145,6 +147,16 @@ module.exports = [
145147
userAgent: 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.5359.215 Safari/537.36',
146148
permissions: []
147149
},
150+
{
151+
name: 'JioCinema',
152+
title: 'JioCinema',
153+
hidden: true,
154+
logo: 'imgs/jiocinema.svg',
155+
url: 'https://www.jiocinema.com',
156+
color: '#D9008D',
157+
style: {},
158+
permissions: []
159+
},
148160
{
149161
name: 'Netflix',
150162
title: 'Netflix',
@@ -233,6 +245,16 @@ module.exports = [
233245
style: {},
234246
permissions: []
235247
},
248+
{
249+
name: 'SiriusXM',
250+
title: 'SiriusXM',
251+
hidden: true,
252+
logo: 'imgs/siriusxm.svg',
253+
url: 'https://www.siriusxm.com/player/home',
254+
color: '#0000EB',
255+
style: {},
256+
permissions: []
257+
},
236258
{
237259
name: 'Sling',
238260
title: 'Sling TV',

‎src/main.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ async function createWindow() {
105105
const engineCachePath = path.join(userDataDir, 'adblock-engine-cache.txt');
106106
// Only load cache if there is no version mismatch
107107
let engine;
108-
if (fs.existsSync(engineCachePath) && (store.get('version') === '3.2.8')) {
108+
if (fs.existsSync(engineCachePath) && (store.get('version') === '3.3.4')) {
109109
electronLog.info('Adblock engine cache found. Loading it into main process...');
110110
engine = await ElectronBlocker.deserialize(
111111
fs.readFileSync(engineCachePath)
@@ -339,7 +339,7 @@ async function createNewWindow() {
339339
const engineCachePath = path.join(userDataDir, 'adblock-engine-cache.txt');
340340
// Only load cache if there is no version mismatch
341341
let engine;
342-
if (fs.existsSync(engineCachePath) && (store.get('version') === '3.2.8')) {
342+
if (fs.existsSync(engineCachePath) && (store.get('version') === '3.3.4')) {
343343
electronLog.info('Adblock engine cache found. Loading it into main process...');
344344
engine = await ElectronBlocker.deserialize(
345345
fs.readFileSync(engineCachePath)

0 commit comments

Comments
 (0)