3.3.4

Alex313031 · Feb 22, 2024 · 840a79b · 840a79b
1 parent b188143
commit 840a79b
Show file tree

Hide file tree

Showing 11 changed files with 516 additions and 176 deletions.
diff --git a/...s/@cliqz+adblocker-electron+1.26.15.patch → ...s/@cliqz+adblocker-electron+1.26.15.patch b/...s/@cliqz+adblocker-electron+1.26.15.patch → ...s/@cliqz+adblocker-electron+1.26.15.patch
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "appName": "quark-player",
   "productName": "Quark Player",
   "applicationId": "com.alex313031.quark-player",
-  "version": "3.3.3",
+  "version": "3.3.4",
   "description": "Electron based Web Video Services Player. Supporting Netflix, Youtube, Twitch, Floatplane and More.",
   "main": "./src/main.js",
   "engines": {
@@ -52,11 +52,11 @@
     "stylelint-config-standard": "29.0.0"
   },
   "dependencies": {
-    "@cliqz/adblocker": "1.26.15",
-    "@cliqz/adblocker-content": "1.26.15",
-    "@cliqz/adblocker-electron": "1.26.15",
-    "@cliqz/adblocker-electron-preload": "1.26.15",
-    "@cliqz/adblocker-extended-selectors": "1.26.15",
+    "@cliqz/adblocker": "1.26.16",
+    "@cliqz/adblocker-content": "1.26.16",
+    "@cliqz/adblocker-electron": "1.26.16",
+    "@cliqz/adblocker-electron-preload": "1.26.16",
+    "@cliqz/adblocker-extended-selectors": "1.26.16",
     "@electron/remote": "2.1.2",
     "electron-context-menu": "3.6.1",
     "electron-localshortcut": "3.2.1",

diff --git a/...s/@cliqz+adblocker-electron+1.26.12.patch → ...s/@cliqz+adblocker-electron+1.26.16.patch b/...s/@cliqz+adblocker-electron+1.26.12.patch → ...s/@cliqz+adblocker-electron+1.26.16.patch
@@ -1,17 +1,17 @@
 diff --git a/node_modules/@cliqz/adblocker-electron/dist/cjs/adblocker.js b/node_modules/@cliqz/adblocker-electron/dist/cjs/adblocker.js
-index cb3d3fd..47e08a8 100644
+index 2269579..bb31400 100644
 --- a/node_modules/@cliqz/adblocker-electron/dist/cjs/adblocker.js
 +++ b/node_modules/@cliqz/adblocker-electron/dist/cjs/adblocker.js
-@@ -25,7 +25,7 @@ exports.ElectronBlocker = exports.BlockingContext = exports.fromElectronDetails
+@@ -26,7 +26,7 @@ const path_1 = require("path");
  const electron_1 = require("electron");
  const tldts_experimental_1 = require("tldts-experimental");
  const adblocker_1 = require("@cliqz/adblocker");
--const PRELOAD_PATH = require.resolve('@cliqz/adblocker-electron-preload');
-+// const PRELOAD_PATH = require.resolve('@cliqz/adblocker-electron-preload');
+-const PRELOAD_PATH = (0, path_1.resolve)(require.resolve('@cliqz/adblocker-electron-preload'));
++// const PRELOAD_PATH = (0, path_1.resolve)(require.resolve('@cliqz/adblocker-electron-preload'));
  // https://stackoverflow.com/questions/48854265/why-do-i-see-an-electron-security-warning-after-updating-my-electron-project-t
  process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true';
  /**
-@@ -66,7 +66,7 @@ class BlockingContext {
+@@ -67,7 +67,7 @@ class BlockingContext {
      }
      enable() {
          if (this.blocker.config.loadCosmeticFilters === true) {
@@ -20,7 +20,7 @@ index cb3d3fd..47e08a8 100644
              electron_1.ipcMain.on('get-cosmetic-filters-first', this.onGetCosmeticFiltersFirst);
              electron_1.ipcMain.on('get-cosmetic-filters', this.onGetCosmeticFiltersUpdated);
              electron_1.ipcMain.on('is-mutation-observer-enabled', this.onIsMutationObserverEnabled);
-@@ -90,7 +90,7 @@ class BlockingContext {
+@@ -91,7 +91,7 @@ class BlockingContext {
              this.session.webRequest.onBeforeRequest(null);
          }
          if (this.blocker.config.loadCosmeticFilters === true) {
@@ -30,19 +30,19 @@ index cb3d3fd..47e08a8 100644
          }
      }
 diff --git a/node_modules/@cliqz/adblocker-electron/dist/es6/adblocker.js b/node_modules/@cliqz/adblocker-electron/dist/es6/adblocker.js
-index d8a658e..11669b3 100644
+index d9bb84e..a83611d 100644
 --- a/node_modules/@cliqz/adblocker-electron/dist/es6/adblocker.js
 +++ b/node_modules/@cliqz/adblocker-electron/dist/es6/adblocker.js
-@@ -8,7 +8,7 @@
+@@ -9,7 +9,7 @@ import { resolve } from 'path';
  import { ipcMain } from 'electron';
  import { parse } from 'tldts-experimental';
  import { FiltersEngine, Request } from '@cliqz/adblocker';
--const PRELOAD_PATH = require.resolve('@cliqz/adblocker-electron-preload');
-+// const PRELOAD_PATH = require.resolve('@cliqz/adblocker-electron-preload');
+-const PRELOAD_PATH = resolve(require.resolve('@cliqz/adblocker-electron-preload'));
++// const PRELOAD_PATH = resolve(require.resolve('@cliqz/adblocker-electron-preload'));
  // https://stackoverflow.com/questions/48854265/why-do-i-see-an-electron-security-warning-after-updating-my-electron-project-t
  process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true';
  /**
-@@ -48,7 +48,7 @@ export class BlockingContext {
+@@ -49,7 +49,7 @@ export class BlockingContext {
      }
      enable() {
          if (this.blocker.config.loadCosmeticFilters === true) {
@@ -51,7 +51,7 @@ index d8a658e..11669b3 100644
              ipcMain.on('get-cosmetic-filters-first', this.onGetCosmeticFiltersFirst);
              ipcMain.on('get-cosmetic-filters', this.onGetCosmeticFiltersUpdated);
              ipcMain.on('is-mutation-observer-enabled', this.onIsMutationObserverEnabled);
-@@ -72,7 +72,7 @@ export class BlockingContext {
+@@ -73,7 +73,7 @@ export class BlockingContext {
              this.session.webRequest.onBeforeRequest(null);
          }
          if (this.blocker.config.loadCosmeticFilters === true) {

diff --git a/src/default-services.js b/src/default-services.js
@@ -124,11 +124,13 @@ module.exports = [
     url: 'https://www.hbomax.com',
     color: '#4306BA',
     style: {},
+    userAgent: 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.5359.215 Safari/537.36',
     permissions: []
   },
   {
     name: 'HDFull TV',
     title: 'HDFull',
+    hidden: true,
     logo: 'imgs/hd_full.png',
     url: 'https://hdfull.sbs',
     color: '#129ED9',
@@ -145,6 +147,16 @@ module.exports = [
     userAgent: 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.5359.215 Safari/537.36',
     permissions: []
   },
+  {
+    name: 'JioCinema',
+    title: 'JioCinema',
+    hidden: true,
+    logo: 'imgs/jiocinema.svg',
+    url: 'https://www.jiocinema.com',
+    color: '#D9008D',
+    style: {},
+    permissions: []
+  },
   {
     name: 'Netflix',
     title: 'Netflix',
@@ -233,6 +245,16 @@ module.exports = [
     style: {},
     permissions: []
   },
+  {
+    name: 'SiriusXM',
+    title: 'SiriusXM',
+    hidden: true,
+    logo: 'imgs/siriusxm.svg',
+    url: 'https://www.siriusxm.com/player/home',
+    color: '#0000EB',
+    style: {},
+    permissions: []
+  },
   {
     name: 'Sling',
     title: 'Sling TV',

diff --git a/src/main.js b/src/main.js
@@ -105,7 +105,7 @@ async function createWindow() {
     const engineCachePath = path.join(userDataDir, 'adblock-engine-cache.txt');
     // Only load cache if there is no version mismatch
     let engine;
-    if (fs.existsSync(engineCachePath) && (store.get('version') === '3.2.8')) {
+    if (fs.existsSync(engineCachePath) && (store.get('version') === '3.3.4')) {
       electronLog.info('Adblock engine cache found. Loading it into main process...');
       engine = await ElectronBlocker.deserialize(
         fs.readFileSync(engineCachePath)
@@ -339,7 +339,7 @@ async function createNewWindow() {
     const engineCachePath = path.join(userDataDir, 'adblock-engine-cache.txt');
     // Only load cache if there is no version mismatch
     let engine;
-    if (fs.existsSync(engineCachePath) && (store.get('version') === '3.2.8')) {
+    if (fs.existsSync(engineCachePath) && (store.get('version') === '3.3.4')) {
       electronLog.info('Adblock engine cache found. Loading it into main process...');
       engine = await ElectronBlocker.deserialize(
         fs.readFileSync(engineCachePath)