From e18bffe714a2eed7f293d29efbef9e921a517498 Mon Sep 17 00:00:00 2001 From: MikeZeDev Date: Tue, 5 Sep 2023 17:14:14 +0000 Subject: [PATCH] Website Maintenance : Madara to Mangastream * IrisScanlator * Mangacim *Diskusscan --- web/src/engine/websites/DiskusScan.ts | 10 +++--- web/src/engine/websites/DiskusScan_e2e.ts | 8 ++--- web/src/engine/websites/IrisScanlator.ts | 10 +++--- web/src/engine/websites/IrisScanlator_e2e.ts | 9 +++--- web/src/engine/websites/Mangacim.ts | 33 ++++++-------------- web/src/engine/websites/Mangacim_e2e.ts | 20 ++++++------ 6 files changed, 38 insertions(+), 52 deletions(-) diff --git a/web/src/engine/websites/DiskusScan.ts b/web/src/engine/websites/DiskusScan.ts index c11d942e85..7b95240e70 100755 --- a/web/src/engine/websites/DiskusScan.ts +++ b/web/src/engine/websites/DiskusScan.ts @@ -1,13 +1,13 @@ import { Tags } from '../Tags'; import icon from './DiskusScan.webp'; import { DecoratableMangaScraper } from '../providers/MangaPlugin'; -import * as Madara from './decorators/WordPressMadara'; +import * as MangaStream from './decorators/WordPressMangaStream'; import * as Common from './decorators/Common'; -@Madara.MangaCSS(/^https?:\/\/diskusscan\.com\/manga\/[^/]+\/$/) -@Madara.MangasMultiPageAJAX() -@Madara.ChaptersSinglePageAJAXv1() -@Madara.PagesSinglePageCSS() +@MangaStream.MangaCSS(/^https?:\/\/diskusscan\.com\/manga\/[^/]+\/$/) +@MangaStream.MangasSinglePageCSS() +@MangaStream.ChaptersSinglePageCSS() +@MangaStream.PagesSinglePageCSS() @Common.ImageAjax() export default class extends DecoratableMangaScraper { diff --git a/web/src/engine/websites/DiskusScan_e2e.ts b/web/src/engine/websites/DiskusScan_e2e.ts index 868f526600..3cae1add6c 100755 --- a/web/src/engine/websites/DiskusScan_e2e.ts +++ b/web/src/engine/websites/DiskusScan_e2e.ts @@ -7,16 +7,16 @@ const config = { }, container: { url: 'https://diskusscan.com/manga/shenwu-tianzun/', - id: JSON.stringify({ post: '802', slug: '/manga/shenwu-tianzun/' }), + id: '/manga/shenwu-tianzun/', title: 'Shenwu Tianzun' }, child: { - id: '/manga/shenwu-tianzun/capitulo-01/', - title: 'Capítulo 01' + id: '/shenwu-tianzun-capitulo-01/', + title: 'Chapter 01' }, entry: { index: 0, - size: 3_427_181, + size: 117_062, type: 'image/jpeg' } }; diff --git a/web/src/engine/websites/IrisScanlator.ts b/web/src/engine/websites/IrisScanlator.ts index 3e1e5702b0..d23e376a93 100755 --- a/web/src/engine/websites/IrisScanlator.ts +++ b/web/src/engine/websites/IrisScanlator.ts @@ -1,13 +1,13 @@ import { Tags } from '../Tags'; import icon from './IrisScanlator.webp'; import { DecoratableMangaScraper } from '../providers/MangaPlugin'; -import * as Madara from './decorators/WordPressMadara'; +import * as MangaStream from './decorators/WordPressMangaStream'; import * as Common from './decorators/Common'; -@Madara.MangaCSS(/^https?:\/\/irisscanlator\.com\.br\/manga\/[^/]+\/$/) -@Madara.MangasMultiPageAJAX() -@Madara.ChaptersSinglePageAJAXv2() -@Madara.PagesSinglePageCSS() +@MangaStream.MangaCSS(/^https?:\/\/irisscanlator\.com\.br\/manga\/[^/]+\/$/) +@MangaStream.MangasSinglePageCSS() +@MangaStream.ChaptersSinglePageCSS() +@MangaStream.PagesSinglePageJS() @Common.ImageAjax() export default class extends DecoratableMangaScraper { diff --git a/web/src/engine/websites/IrisScanlator_e2e.ts b/web/src/engine/websites/IrisScanlator_e2e.ts index 9553ba6706..9cb319b76c 100755 --- a/web/src/engine/websites/IrisScanlator_e2e.ts +++ b/web/src/engine/websites/IrisScanlator_e2e.ts @@ -7,16 +7,17 @@ const config = { }, container: { url: 'https://irisscanlator.com.br/manga/orenchi-no-maid-san/', - id: JSON.stringify({ post: '82', slug: '/manga/orenchi-no-maid-san/' }), + id: '/manga/orenchi-no-maid-san/', title: 'Orenchi no Maid-san' }, child: { - id: '/manga/orenchi-no-maid-san/capitulo-01/', - title: 'Capítulo 01' + id: '/orenchi-no-maid-san-capitulo-01/', + title: 'Chapter 01', + timeout : 15000 }, entry: { index: 0, - size: 407_663, + size: 383_954, type: 'image/jpeg' } }; diff --git a/web/src/engine/websites/Mangacim.ts b/web/src/engine/websites/Mangacim.ts index 0fe4e228aa..1be6b2c749 100755 --- a/web/src/engine/websites/Mangacim.ts +++ b/web/src/engine/websites/Mangacim.ts @@ -1,36 +1,21 @@ -// Auto-Generated export from HakuNeko Legacy -//import { Tags } from '../Tags'; +import { Tags } from '../Tags'; import icon from './Mangacim.webp'; import { DecoratableMangaScraper } from '../providers/MangaPlugin'; -import * as Madara from './decorators/WordPressMadara'; +import * as MangaStream from './decorators/WordPressMangaStream'; import * as Common from './decorators/Common'; -@Madara.MangaCSS(/^https?:\/\/www\.mangacim\.com\/manga\/[^/]+\/$/) -@Madara.MangasMultiPageAJAX() -@Madara.ChaptersSinglePageAJAXv1() -@Madara.PagesSinglePageCSS() +@MangaStream.MangaCSS(/^https?:\/\/mangacim\.com\/manga\/[^/]+\/$/) +@MangaStream.MangasSinglePageCSS() +@MangaStream.ChaptersSinglePageCSS() +@MangaStream.PagesSinglePageCSS() @Common.ImageAjax() + export default class extends DecoratableMangaScraper { public constructor() { - super('mangacim', 'Mangacim', 'https://www.mangacim.com'/*, Tags.Media., Tags.Language.*/); + super('mangacim', 'Mangacim', 'https://mangacim.com', Tags.Media.Manga, Tags.Media.Manhwa, Tags.Media.Manhua, Tags.Language.Turkish); } - public override get Icon() { return icon; } -} - -// Original Source -/* -class Mangacim extends WordPressMadara { - - constructor() { - super(); - super.id = 'mangacim'; - super.label = 'Mangacim'; - this.tags = [ 'manga', 'webtoon', 'turkish' ]; - this.url = 'https://www.mangacim.com'; - } -} -*/ \ No newline at end of file +} \ No newline at end of file diff --git a/web/src/engine/websites/Mangacim_e2e.ts b/web/src/engine/websites/Mangacim_e2e.ts index d0bc65c511..a7e21fdb34 100755 --- a/web/src/engine/websites/Mangacim_e2e.ts +++ b/web/src/engine/websites/Mangacim_e2e.ts @@ -1,24 +1,24 @@ -import { TestFixture } from '../../../test/WebsitesFixture'; +import { TestFixture } from '../../../test/WebsitesFixture'; const config = { plugin: { id: 'mangacim', title: 'Mangacim' - }/*, + }, container: { - url: 'https://www.mangacim.com/manga/.../', - id: JSON.stringify({ post: '0', slug: '/manga/.../' }), - title: 'Manga ?' + url: 'https://mangacim.com/manga/dukun-99-gelini/', + id: '/manga/dukun-99-gelini/', + title: 'Dük’ün 99.Gelini' }, child: { - id: '/manga/.../.../', - title: 'Chapter ?' + id: '/dukun-99-gelini-bolum-1/', + title: 'Bölüm 1' }, entry: { - index: 0, - size: -1, + index: 1, + size: 265_312, type: 'image/jpeg' - }*/ + } }; const fixture = new TestFixture(config);