From 660b5bbf0191f5a7a33a95121182da2291a9fc3e Mon Sep 17 00:00:00 2001 From: Justin COLLON <48163201+error7404@users.noreply.github.com> Date: Mon, 22 Jul 2024 12:30:20 +0200 Subject: [PATCH] fix: Correct multiSrc Filters & Update Asura Light Novel to Srank Manga (#1082) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Asura Light Novel => Srank Manga * fix ‘npm run icons‘ & new icon asuralightnovel * fix filters for multisrc: - lightnovelwp - madara - readwn --- package.json | 2 +- .../multisrc/madara/asuralightnovel/icon.png | Bin 1487 -> 3295 bytes scripts/multisrc/lightnovelwp/generator.js | 2 +- scripts/multisrc/lightnovelwp/template.ts | 2 +- scripts/multisrc/madara/generator.js | 2 +- scripts/multisrc/madara/sources.json | 7 ++++--- scripts/multisrc/madara/template.ts | 2 +- scripts/multisrc/readwn/generator.js | 2 +- scripts/multisrc/readwn/template.ts | 2 +- 9 files changed, 11 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 3af1956..8713ecc 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "generate": "node ./scripts/multisrc/generate.js", "host-linux": "chmod +x ./host.sh && ./host.sh", "host-windows": "powershell ./host.ps1", - "icons": "npm run clearMultisrc && npm run generate && npx tsc -m node16 && npm run json && node ./scripts/icon_reloading.js", + "icons": "npm run clearMultisrc && npm run generate && npx tsc -m node16; npm run json && node ./scripts/icon_reloading.js", "json": " node ./scripts/json_plugins.js", "lint": "npx eslint .", "prepare": "husky install", diff --git a/public/static/multisrc/madara/asuralightnovel/icon.png b/public/static/multisrc/madara/asuralightnovel/icon.png index 02a6321f445378ea043d58e6f86cbc00ba82ecef..b532c7bd38627af913c56cbadd5b4990a2ea1c53 100644 GIT binary patch delta 3291 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 X6S}O}&AaJY00000NkvXXu0mjfe6YUr diff --git a/scripts/multisrc/lightnovelwp/generator.js b/scripts/multisrc/lightnovelwp/generator.js index 8505630..d6bcd24 100644 --- a/scripts/multisrc/lightnovelwp/generator.js +++ b/scripts/multisrc/lightnovelwp/generator.js @@ -12,7 +12,7 @@ export const generateAll = function () { const filters = readFileSync( join(folder, 'filters', source.id + '.json'), ); - source.filters = JSON.parse(filters); + source.filters = JSON.parse(filters).filters; } console.log( `[lightnovelwp] Generating: ${source.id}${' '.repeat(20 - source.id.length)} ${source.filters ? '🔎with filters🔍' : '🚫no filters🚫'}`, diff --git a/scripts/multisrc/lightnovelwp/template.ts b/scripts/multisrc/lightnovelwp/template.ts index 7008bed..c64f8cc 100644 --- a/scripts/multisrc/lightnovelwp/template.ts +++ b/scripts/multisrc/lightnovelwp/template.ts @@ -37,7 +37,7 @@ class LightNovelWPPlugin implements Plugin.PluginBase { this.icon = `multisrc/lightnovelwp/${metadata.id.toLowerCase()}/icon.png`; this.site = metadata.sourceSite; const versionIncrements = metadata.options?.versionIncrements || 0; - this.version = `1.1.${1 + versionIncrements}`; + this.version = `1.1.${2 + versionIncrements}`; this.options = metadata.options ?? ({} as LightNovelWPOptions); this.filters = metadata.filters satisfies Filters; } diff --git a/scripts/multisrc/madara/generator.js b/scripts/multisrc/madara/generator.js index 0b8ca32..4a0b926 100644 --- a/scripts/multisrc/madara/generator.js +++ b/scripts/multisrc/madara/generator.js @@ -12,7 +12,7 @@ export const generateAll = function () { const filters = readFileSync( join(folder, 'filters', source.id + '.json'), ); - source.filters = JSON.parse(filters); + source.filters = JSON.parse(filters).filters; } console.log( `[madara] Generating: ${source.id}${' '.repeat(20 - source.id.length)} ${source.filters ? '🔎with filters🔍' : '🚫no filters🚫'}`, diff --git a/scripts/multisrc/madara/sources.json b/scripts/multisrc/madara/sources.json index 0a77e67..6e9fee7 100644 --- a/scripts/multisrc/madara/sources.json +++ b/scripts/multisrc/madara/sources.json @@ -247,10 +247,11 @@ }, { "id": "asuralightnovel", - "sourceSite": "https://asuralightnovel.com/", - "sourceName": "Asura Light Novel", + "sourceSite": "https://srankmanga.com/", + "sourceName": "Srank Manga", "options": { - "useNewChapterEndpoint": true + "useNewChapterEndpoint": true, + "versionIncrements": 1 } }, { diff --git a/scripts/multisrc/madara/template.ts b/scripts/multisrc/madara/template.ts index 820ed62..6d8096e 100644 --- a/scripts/multisrc/madara/template.ts +++ b/scripts/multisrc/madara/template.ts @@ -39,7 +39,7 @@ class MadaraPlugin implements Plugin.PluginBase { this.icon = `multisrc/madara/${metadata.id.toLowerCase()}/icon.png`; this.site = metadata.sourceSite; const versionIncrements = metadata.options?.versionIncrements || 0; - this.version = `1.0.${2 + versionIncrements}`; + this.version = `1.0.${3 + versionIncrements}`; this.options = metadata.options; this.filters = metadata.filters; } diff --git a/scripts/multisrc/readwn/generator.js b/scripts/multisrc/readwn/generator.js index 064f53b..c4ae9e9 100644 --- a/scripts/multisrc/readwn/generator.js +++ b/scripts/multisrc/readwn/generator.js @@ -12,7 +12,7 @@ export const generateAll = function () { const filters = readFileSync( join(folder, 'filters', source.id + '.json'), ); - source.filters = JSON.parse(filters); + source.filters = JSON.parse(filters).filters; } console.log( `[readwn] Generating: ${source.id}${' '.repeat(20 - source.id.length)} ${source.filters ? '🔎with filters🔍' : '🚫no filters🚫'}`, diff --git a/scripts/multisrc/readwn/template.ts b/scripts/multisrc/readwn/template.ts index a7c0459..348a692 100644 --- a/scripts/multisrc/readwn/template.ts +++ b/scripts/multisrc/readwn/template.ts @@ -32,7 +32,7 @@ class ReadwnPlugin implements Plugin.PluginBase { this.icon = `multisrc/readwn/${metadata.id.toLowerCase()}/icon.png`; this.site = metadata.sourceSite; const versionIncrements = metadata.options?.versionIncrements || 0; - this.version = `1.0.${1 + versionIncrements}`; + this.version = `1.0.${2 + versionIncrements}`; this.filters = metadata.filters; }