ADD Comici decorator & Websites

web/src/engine/transformers/BookmarkConverter.ts

@@ -29,6 +29,7 @@ export const legacyWebsiteIdentifierMap = new Map([
     [ 'komikav', 'apkomik' ],
     [ 'kumascans', 'retsu' ],
     [ 'lyrascans', 'quantumscans' ],
+    [ 'mangacross', 'championcross' ],
     [ 'mangamx', 'mangaoni' ],
     [ 'manganel', 'manganato' ],
     [ 'mangaproz', 'mangapro' ],

web/src/engine/transformers/BookmarkConverter_test.ts

@@ -31,6 +31,7 @@ const legacyWebsiteIdentifierMapTestCases = [
     { sourceID: 'komikav', targetID: 'apkomik' },
     { sourceID: 'kumascans', targetID: 'retsu' },
     { sourceID: 'lyrascans', targetID: 'quantumscans' },
+    { sourceID: 'mangacross', targetID: 'championcross'},
     { sourceID: 'mangamx', targetID: 'mangaoni' },
     { sourceID: 'manganel', targetID: 'manganato' },
     { sourceID: 'mangaproz', targetID: 'mangapro' },

web/src/engine/websites/BigComics.ts

@@ -0,0 +1,21 @@
+import { Tags } from '../Tags';
+import icon from './BigComics.webp';
+import { DecoratableMangaScraper } from '../providers/MangaPlugin';
+import * as Common from './decorators/Common';
+import * as Comici from './decorators/ComiciViewer';
+
+@Common.MangaCSS(/^{origin}\/series\/[^/]+(\/)?$/, Comici.queryMangaTitleURI)
+@Common.MangasMultiPageCSS(Comici.mangaListPath, Comici.queryManga, 0, 1, 0, Comici.MangaExtractor)
+@Comici.ChaptersSinglePageCSS()
+@Comici.PagesSinglePageAJAX()
+@Comici.ImageAjax()
+export default class extends DecoratableMangaScraper {
+
+    public constructor() {
+        super('bigcomics', `Big Comics`, 'https://bigcomics.jp', Tags.Media.Manga, Tags.Language.Japanese, Tags.Source.Official);
+    }
+
+    public override get Icon() {
+        return icon;
+    }
+}

web/src/engine/websites/BigComics_e2e.ts

@@ -0,0 +1,24 @@
+import { TestFixture } from '../../../test/WebsitesFixture';
+
+const config = {
+    plugin: {
+        id: 'bigcomics',
+        title: 'Big Comics'
+    },
+    container: {
+        url: 'https://bigcomics.jp/series/48eef350d364a',
+        id: '/series/48eef350d364a',
+        title: '岳'
+    },
+    child: {
+        id: '/episodes/4b87f55986ccc/',
+        title: '1巻－第0歩 お家'
+    },
+    entry: {
+        index: 0,
+        size: 670_778,
+        type: 'image/png'
+    }
+};
+
+new TestFixture(config).AssertWebsite();

web/src/engine/websites/COMICMeDu.ts

@@ -0,0 +1,21 @@
+import { Tags } from '../Tags';
+import icon from './COMICMeDu.webp';
+import { DecoratableMangaScraper } from '../providers/MangaPlugin';
+import * as Common from './decorators/Common';
+import * as Comici from './decorators/ComiciViewer';
+
+@Common.MangaCSS(/^{origin}\/series\/[^/]+(\/)?$/, Comici.queryMangaTitleURI)
+@Common.MangasMultiPageCSS(Comici.mangaListPath, Comici.queryManga, 0, 1, 0, Comici.MangaExtractor)
+@Comici.ChaptersSinglePageCSS()
+@Comici.PagesSinglePageAJAX()
+@Comici.ImageAjax()
+export default class extends DecoratableMangaScraper {
+
+    public constructor() {
+        super('comicmedu', `COMIC MeDu (こみっくめづ)`, 'https://comic-medu.com', Tags.Media.Manga, Tags.Language.Japanese, Tags.Source.Official);
+    }
+
+    public override get Icon() {
+        return icon;
+    }
+}

web/src/engine/websites/COMICMeDu_e2e.ts

@@ -0,0 +1,24 @@
+import { TestFixture } from '../../../test/WebsitesFixture';
+
+const config = {
+    plugin: {
+        id: 'comicmedu',
+        title: 'COMIC MeDu (こみっくめづ)'
+    },
+    container: {
+        url: 'https://comic-medu.com/series/c2f3978c40eea',
+        id: '/series/c2f3978c40eea',
+        title: 'ぱらのいあけ〜じ'
+    },
+    child: {
+        id: '/episodes/beaa305e9cf32/',
+        title: 'その(1)'
+    },
+    entry: {
+        index: 0,
+        size: 760_096,
+        type: 'image/png'
+    }
+};
+
+new TestFixture(config).AssertWebsite();

web/src/engine/websites/ChampionCross.ts

@@ -0,0 +1,20 @@
+import { Tags } from '../Tags';
+import icon from './ChampionCross.webp';
+import { DecoratableMangaScraper } from '../providers/MangaPlugin';
+import * as Common from './decorators/Common';
+import * as Comici from './decorators/ComiciViewer';
+
+@Common.MangaCSS(/^{origin}\/series\/[^/]+(\/)?$/, Comici.queryMangaTitleURI)
+@Common.MangasMultiPageCSS(Comici.mangaListPath, 'div.article-text > a', 0, 1, 0, Comici.MangaExtractor)
+@Comici.ChaptersSinglePageCSS()
+@Comici.PagesSinglePageAJAX()
+@Comici.ImageAjax()
+export default class extends DecoratableMangaScraper {
+    public constructor() {
+        super('championcross', `Champion Cross`, 'https://championcross.jp', Tags.Language.Japanese, Tags.Media.Manga, Tags.Source.Official);
+    }
+
+    public override get Icon() {
+        return icon;
+    }
+}

web/src/engine/websites/ChampionCross_e2e.ts

@@ -0,0 +1,24 @@
+import { TestFixture, type Config } from '../../../test/WebsitesFixture';
+
+const config: Config = {
+    plugin: {
+        id: 'championcross',
+        title: 'Champion Cross'
+    },
+    container: {
+        url: 'https://championcross.jp/series/50d8ea89cfc92/',
+        id: '/series/50d8ea89cfc92/',
+        title: 'あの頃、私たちは魔法使いでした。'
+    },
+    child: {
+        id: '/episodes/13d4bf3743424/',
+        title: '第1話　「桜が舞った日のこと」'
+    },
+    entry: {
+        index: 0,
+        size: 2_691_707,
+        type: 'image/png'
+    }
+};
+
+new TestFixture(config).AssertWebsite();

web/src/engine/websites/ComicRide.ts

@@ -0,0 +1,21 @@
+import { Tags } from '../Tags';
+import icon from './ComicRide.webp';
+import { DecoratableMangaScraper } from '../providers/MangaPlugin';
+import * as Common from './decorators/Common';
+import * as Comici from './decorators/ComiciViewer';
+
+@Common.MangaCSS(/^{origin}\/series\/[^/]+(\/)?$/, Comici.queryMangaTitleURI)
+@Common.MangasMultiPageCSS(Comici.mangaListPath, Comici.queryManga, 0, 1, 0, Comici.MangaExtractor)
+@Comici.ChaptersSinglePageCSS()
+@Comici.PagesSinglePageAJAX()
+@Comici.ImageAjax()
+export default class extends DecoratableMangaScraper {
+
+    public constructor() {
+        super('comicride', `Comic Ride`, 'https://comicride.jp', Tags.Media.Manga, Tags.Language.Japanese, Tags.Source.Official);
+    }
+
+    public override get Icon() {
+        return icon;
+    }
+}

web/src/engine/websites/ComicRide_e2e.ts

@@ -0,0 +1,24 @@
+import { TestFixture } from '../../../test/WebsitesFixture';
+
+const config = {
+    plugin: {
+        id: 'comicride',
+        title: 'Comic Ride'
+    },
+    container: {
+        url: 'https://comicride.jp/series/24a2c5eb2d433',
+        id: '/series/24a2c5eb2d433',
+        title: '呪われ侯爵様の訳ありメイド'
+    },
+    child: {
+        id: '/episodes/48d531d8140b5/',
+        title: '第1話'
+    },
+    entry: {
+        index: 0,
+        size: 3_298_112,
+        type: 'image/png'
+    }
+};
+
+new TestFixture(config).AssertWebsite();

web/src/engine/websites/MagKan.ts

@@ -1,19 +1,14 @@
 import { Tags } from '../Tags';
 import icon from './MagKan.webp';
-import { Chapter, DecoratableMangaScraper, type Manga, Page } from '../providers/MangaPlugin';
+import { DecoratableMangaScraper } from '../providers/MangaPlugin';
 import * as Common from './decorators/Common';
-import { Fetch, FetchCSS } from '../platform/FetchProvider';
+import * as Comici from './decorators/ComiciViewer';
 
-function MangaExtractor(element: HTMLElement) {
-    return {
-        id: element.querySelector<HTMLAnchorElement>('a').pathname,
-        title: element.querySelector('h2.comic_name').textContent.trim()
-    };
-}
-
-@Common.MangaCSS(/^{origin}\/[^/]+/, 'h1.ttl')
-@Common.MangasSinglePageCSS('/', 'div#main div.panel div.box div.inner', MangaExtractor)
-@Common.ImageAjax()
+@Common.MangaCSS(/^{origin}\/series\/[^/]+(\/)?$/, Comici.queryMangaTitleURI)
+@Common.MangasMultiPageCSS(Comici.mangaListPath, Comici.queryManga, 0, 1, 0, Comici.MangaExtractor)
+@Comici.ChaptersSinglePageCSS()
+@Comici.PagesSinglePageAJAX()
+@Comici.ImageAjax()
 export default class extends DecoratableMangaScraper {
 
     public constructor() {
@@ -24,26 +19,4 @@ export default class extends DecoratableMangaScraper {
         return icon;
     }
 
-    public override async FetchChapters(manga: Manga): Promise<Chapter[]> {
-        const request = new Request(new URL(manga.Identifier, this.URI).href);
-        const [mainDiv] = await FetchCSS<HTMLDivElement>(request, 'div#main');
-        const current = [...mainDiv.querySelectorAll<HTMLAnchorElement>('div#main div.update_summary div.exp ul.btn li a[href*="/assets/files/"]')].map(element => {
-            const id = element.pathname.replace(/\/HTML5\/?$/i, '');
-            return new Chapter(this, manga, id, element.text.replace('を読む', '').trim());
-        });
-        const previous = [...mainDiv.querySelectorAll('div#main div.sam_exp div.exp')].map(element => {
-            const id = element.querySelector<HTMLAnchorElement>('ul.btn li a[href*="/assets/files/"]').pathname.replace(/\/HTML5\/?$/i, '');
-            return new Chapter(this, manga, id, element.querySelector('div.back_number_summary div.ttl').textContent.trim());
-        });
-        return [...current, ...previous].distinct();
-    }
-
-    public override async FetchPages(chapter: Chapter): Promise<Page[]> {
-        const uri = new URL(chapter.Identifier + '/iPhone/ibook.xml', this.URI);
-        const response = await Fetch(new Request(uri.href));
-        const data = await response.text();
-        const pages = parseInt(data.match(/<total>(\d+)<\/total>/)[1]);
-        return new Array<Page>(pages).fill(null).map((_, index) => new Page(this, chapter, new URL(`${chapter.Identifier}/books/images/2/${index + 1}.jpg`, uri)));
-    }
-
 }

web/src/engine/websites/MagKan_e2e.ts

@@ -6,18 +6,18 @@ const config = {
         title: 'MagKan'
     },
     container: {
-        url: 'https://kansai.mag-garden.co.jp/oshihen/',
-        id: '/oshihen/',
+        url: 'https://kansai.mag-garden.co.jp/series/76efde6cc8881/',
+        id: '/series/76efde6cc8881/',
         title: '推し変しやがれ!!'
     },
     child: {
-        id: '/assets/files/oshihen1',
+        id: '/episodes/a742481ce1e89/',
         title: '第零話'
     },
     entry: {
         index: 1,
-        size: 317_098,
-        type: 'image/jpeg'
+        size: 3_166_820,
+        type: 'image/png'
     }
 };
 

web/src/engine/websites/MangaBANG.ts

@@ -0,0 +1,21 @@
+import { Tags } from '../Tags';
+import icon from './MangaBANG.webp';
+import { DecoratableMangaScraper } from '../providers/MangaPlugin';
+import * as Common from './decorators/Common';
+import * as Comici from './decorators/ComiciViewer';
+
+@Common.MangaCSS(/^{origin}\/series\/[^/]+(\/)?$/, Comici.queryMangaTitleURI)
+@Common.MangasMultiPageCSS(Comici.mangaListPath, Comici.queryManga, 0, 1, 0, Comici.MangaExtractor)
+@Comici.ChaptersSinglePageCSS()
+@Comici.PagesSinglePageAJAX()
+@Comici.ImageAjax()
+export default class extends DecoratableMangaScraper {
+
+    public constructor() {
+        super('mangabang', `MangaBANG Comics (マンガBANG コミックス)`, 'https://comics.manga-bang.com', Tags.Media.Manga, Tags.Language.Japanese, Tags.Source.Official);
+    }
+
+    public override get Icon() {
+        return icon;
+    }
+}

web/src/engine/websites/MangaBANG_e2e.ts

@@ -0,0 +1,24 @@
+import { TestFixture } from '../../../test/WebsitesFixture';
+
+const config = {
+    plugin: {
+        id: 'mangabang',
+        title: 'MangaBANG Comics (マンガBANG コミックス)'
+    },
+    container: {
+        url: 'https://comics.manga-bang.com/series/c2153a77b6019',
+        id: '/series/c2153a77b6019',
+        title: '藤崎くんちのお母さんには秘密がある'
+    },
+    child: {
+        id: '/episodes/fff51cc22815e/',
+        title: '藤崎くんちのお母さん (1)'
+    },
+    entry: {
+        index: 0,
+        size: 940_071,
+        type: 'image/png'
+    }
+};
+
+new TestFixture(config).AssertWebsite();