Add Zbulu Decorator and websites

web/src/engine/transformers/BookmarkConverter.ts

@@ -23,6 +23,8 @@ export const legacyWebsiteIdentifierMap = new Map([
     [ 'flamescans-org', 'flamecomics' ],
     [ 'galaxyaction', 'galaxymanga' ],
     [ 'gateanimemanga', 'gatemanga' ],
+    [ 'heavenmanga', 'manhwafullnet' ],
+    [ 'heavenmanga2', 'heavenmanga' ],
     [ 'imperioscans', 'neroxus' ],
     [ 'instamanhwa', 'xmanhwa' ],
     [ 'kisscomic', 'readcomiconline' ],

web/src/engine/transformers/BookmarkConverter_test.ts

@@ -25,6 +25,8 @@ const legacyWebsiteIdentifierMapTestCases = [
     { sourceID: 'flamescans-org', targetID: 'flamecomics' },
     { sourceID: 'galaxyaction', targetID: 'galaxymanga' },
     { sourceID: 'gateanimemanga', targetID: 'gatemanga' },
+    { sourceID: 'heavenmanga', targetID: 'manhwafullnet' },
+    { sourceID: 'heavenmanga2', targetID: 'heavenmanga' },
     { sourceID: 'imperioscans', targetID: 'neroxus' },
     { sourceID: 'instamanhwa', targetID: 'xmanhwa' },
     { sourceID: 'kisscomic', targetID: 'readcomiconline' },

web/src/engine/websites/HeavenManga.ts

@@ -0,0 +1,46 @@
+import { Tags } from '../Tags';
+import icon from './HeavenManga.webp';
+import { Chapter, DecoratableMangaScraper, type Manga } from '../providers/MangaPlugin';
+import * as Common from './decorators/Common';
+import { FetchJSON } from '../platform/FetchProvider';
+
+function MangaInfoExtractor(element: HTMLAnchorElement) {
+    return {
+        id: element.pathname,
+        title: element.querySelector('img').alt.trim()
+    };
+}
+
+type APIChapter = {
+    data: {
+        slug: string
+        id : number
+    }[]
+}
+
+const scriptPages = `window.pUrl.map(page => page.imgURL);`;
+
+@Common.MangaCSS(/^{origin}\/manga\/[^/]+$/, 'div.site-content div.post-title h3')
+@Common.MangasMultiPageCSS('/top?page={page}', 'div.page-item-detail div.photo a.thumbnail', 1, 1, 0, MangaInfoExtractor)
+@Common.PagesSinglePageJS(scriptPages, 500)
+@Common.ImageAjax()
+export default class extends DecoratableMangaScraper {
+
+    public constructor() {
+        super('heavenmanga', `HeavenManga`, 'https://heavenmanga.com', Tags.Language.Spanish, Tags.Source.Aggregator, Tags.Media.Manga, Tags.Media.Manhua, Tags.Media.Manhwa);
+    }
+
+    public override get Icon() {
+        return icon;
+    }
+
+    public override async FetchChapters(manga: Manga): Promise<Chapter[]> {
+        const request = new Request(new URL(manga.Identifier, this.URI), {
+            headers: {
+                'X-Requested-With': 'XMLHttpRequest'
+            }
+        });
+        const { data } = await FetchJSON<APIChapter>(request);
+        return data.map(page => new Chapter(this, manga, `/manga/leer/${page.id}`, `Chapter ${page.slug}`));
+    }
+}

web/src/engine/websites/HeavenManga2_e2e.ts → web/src/engine/websites/HeavenManga_e2e.ts

@@ -1,24 +1,24 @@
-import { TestFixture, type Config } from '../../../test/WebsitesFixture';
-
-const config: Config = {
-    plugin: {
-        id: 'heavenmanga2',
-        title: 'HeavenManga'
-    },
-    container: {
-        url: 'https://heavenmanga.com/manga/black-clover',
-        id: '/manga/black-clover',
-        title: 'Black Clover'
-    },
-    child: {
-        id: '/manga/leer/122619',
-        title: 'Chapter 333'
-    },
-    entry: {
-        index: 0,
-        size: 1_055_197,
-        type: 'image/jpeg'
-    }
-};
-
+import { TestFixture, type Config } from '../../../test/WebsitesFixture';
+
+const config: Config = {
+    plugin: {
+        id: 'heavenmanga',
+        title: 'HeavenManga'
+    },
+    container: {
+        url: 'https://heavenmanga.com/manga/black-clover',
+        id: '/manga/black-clover',
+        title: 'Black Clover'
+    },
+    child: {
+        id: '/manga/leer/122619',
+        title: 'Chapter 333'
+    },
+    entry: {
+        index: 0,
+        size: 1_055_197,
+        type: 'image/jpeg'
+    }
+};
+
 new TestFixture(config).AssertWebsite();

web/src/engine/websites/ManhwaFullNet.ts

@@ -0,0 +1,22 @@
+import { Tags } from '../Tags';
+import icon from './ManhwaFullNet.webp';
+import { DecoratableMangaScraper } from '../providers/MangaPlugin';
+import * as Common from './decorators/Common';
+import * as Zbulu from './decorators/WordPressZbulu';
+
+@Common.MangaCSS(/^{origin}\/[^/]+\/$/, Zbulu.queryManga, Zbulu.MangaLabelExtractor)
+@Zbulu.MangasMultiPageCSS('/comic-list/page-{page}/')
+@Zbulu.ChaptersMultiPageCSS(Zbulu.chapterPath, 'div#chapterList div.items-chapters a')
+@Common.PagesSinglePageCSS(Zbulu.queryPages)
+@Common.ImageAjax()
+export default class extends DecoratableMangaScraper {
+
+    public constructor() {
+        super('manhwafullnet', `ManhwaFull(.Net)`, 'https://manhwafull.net', Tags.Media.Manga, Tags.Media.Manhua, Tags.Media.Manhwa, Tags.Language.English, Tags.Source.Aggregator);
+    }
+
+    public override get Icon() {
+        return icon;
+    }
+
+}

web/src/engine/websites/ManhwaFullNet_e2e.ts

@@ -0,0 +1,24 @@
+import { TestFixture, type Config } from '../../../test/WebsitesFixture';
+
+const config: Config = {
+    plugin: {
+        id: 'manhwafullnet',
+        title: 'ManhwaFull(.Net)'
+    },
+    container: {
+        url: 'https://manhwafull.net/ancient-gods-chosen-warriors/',
+        id: '/ancient-gods-chosen-warriors/',
+        title: 'Ancient God’s Chosen Warriors'
+    },
+    child: {
+        id: '/ancient-gods-chosen-warriors-chapter-42',
+        title: 'Chapter 42'
+    },
+    entry: {
+        index: 0,
+        size: 87_738,
+        type: 'image/webp'
+    }
+};
+
+new TestFixture(config).AssertWebsite();

web/src/engine/websites/MyToon.ts

@@ -0,0 +1,22 @@
+import { Tags } from '../Tags';
+import icon from './MyToon.webp';
+import { DecoratableMangaScraper } from '../providers/MangaPlugin';
+import * as Common from './decorators/Common';
+import * as Zbulu from './decorators/WordPressZbulu';
+
+@Common.MangaCSS(/^{origin}\/[^/]+\/$/, Zbulu.queryManga, Zbulu.MangaLabelExtractor)
+@Zbulu.MangasMultiPageCSS()
+@Zbulu.ChaptersMultiPageCSS()
+@Common.PagesSinglePageCSS(Zbulu.queryPages)
+@Common.ImageAjax()
+export default class extends DecoratableMangaScraper {
+
+    public constructor() {
+        super('mytoon', `MyToon`, 'https://mytoon.net', Tags.Media.Manga, Tags.Media.Manhua, Tags.Media.Manhwa, Tags.Language.English, Tags.Source.Aggregator);
+    }
+
+    public override get Icon() {
+        return icon;
+    }
+
+}

web/src/engine/websites/MyToon_e2e.ts

@@ -0,0 +1,24 @@
+import { TestFixture, type Config } from '../../../test/WebsitesFixture';
+
+const config: Config = {
+    plugin: {
+        id: 'mytoon',
+        title: 'MyToon'
+    },
+    container: {
+        url: 'https://mytoon.net/one-piece-02/',
+        id: '/one-piece-02/',
+        title: 'One Piece'
+    },
+    child: {
+        id: '/one-piece-chapter-1096',
+        title: 'Chapter 1096'
+    },
+    entry: {
+        index: 0,
+        size: 450_883,
+        type: 'image/jpeg'
+    }
+};
+
+new TestFixture(config).AssertWebsite();

web/src/engine/websites/_index.ts

@@ -176,7 +176,7 @@ export { default as HastaTeam } from './HastaTeam';
 export { default as HastaTeamDDT } from './HastaTeamDDT';
 export { default as Hayalistic } from './Hayalistic';
 export { default as HDPornComics } from './HDPornComics';
-export { default as HeavenManga2 } from './HeavenManga2';
+export { default as HeavenManga } from './HeavenManga';
 export { default as HenChan } from './HenChan';
 export { default as Hentai2Read } from './Hentai2Read';
 export { default as Hentai20 } from './Hentai20';
@@ -422,6 +422,7 @@ export { default as Manhwaclan } from './Manhwaclan';
 export { default as ManhwaClub } from './ManhwaClub';
 export { default as ManhwaDashRaw } from './ManhwaDashRaw';
 export { default as ManhwaEighteen } from './ManhwaEighteen';
+export { default as ManhwaFullNet } from './ManhwaFullNet';
 export { default as ManhwaHentai } from './ManhwaHentai';
 export { default as ManhwaHentaiMe } from './ManhwaHentaiMe';
 export { default as ManhwaHub } from './ManhwaHub';
@@ -466,6 +467,7 @@ export { default as MultPorn } from './MultPorn';
 export { default as MundoManhwa } from './MundoManhwa';
 export { default as MyComicList } from './MyComicList';
 export { default as MyHentaiGallery } from './MyHentaiGallery';
+export { default as MyToon } from './MyToon';
 export { default as NamiComi } from './NamiComi';
 export { default as NatsuID } from './NatsuID';
 export { default as NecroScans } from './NecroScans';
@@ -747,7 +749,6 @@ export { default as EpikManga } from './legacy/EpikManga';
 export { default as Futabanet } from './legacy/Futabanet';
 export { default as GammaPlus } from './legacy/GammaPlus';
 export { default as Guoman8 } from './legacy/Guoman8';
-export { default as HeavenManga } from './legacy/HeavenManga';
 export { default as HolyManga } from './legacy/HolyManga';
 export { default as KanMan } from './legacy/KanMan';
 export { default as KissAway } from './legacy/KissAway';