Plugins (#718)

* fix * test * sync * nitromanga -> madara * test wuxiaworld * xm * add chapterNumber * fix chapterNumber > 0 * test filters * nice * tunovelaligera -> madara * Squashed commit of the following: commit 4c7bee5855 Author: nyagami <hoangquan05112002@gmail.com> Date: Mon Jan 29 17:56:23 2024 +0700 fix: use english lang in plugin item consistent commit b26d1129de Author: uy/sun <hmy0119@hotmail.com> Date: Sun Jan 28 20:22:43 2024 +0800 Chinese: support showLatestNovels (#733) * improve: better chapterText * feat: support latest page commit 6ff206eab3 Author: nyagami <hoangquan05112002@gmail.com> Date: Sat Jan 27 09:26:19 2024 +0700 Refactor: Using English key (#728) * fix: use english key instead of native * fix: ukrainian * fix: web test with new plugins map commit 62fc988019 Author: Marcin Majewski <skilletssgames@gmail.com> Date: Fri Jan 26 14:42:54 2024 +0100 Fix search box styles (#727) commit 3a1e0c43eb Author: uy/sun <hmy0119@hotmail.com> Date: Fri Jan 26 19:46:47 2024 +0800 Add 69shu and 69xinshu (#726) * fix(linovelib): use NovelStatus and translate filter label * feat(69xinshu): add 69xinshu * feat(69shu): add 69shu * remove: empty userAgent * updated the filters and removed dead sites. Error: net::ERR_NAME_NOT_RESOLVED at https://cratenovel.com/novel Error: net::ERR_CONNECTION_REFUSED at https://clicknovel.net/novel Error: net::ERR_NAME_NOT_RESOLVED at https://noobchan.xyz/novel Error: net::ERR_CONNECTION_TIMED_OUT at https://sugarbbscan.com/series * test * Squashed commit of the following: commit cadf7a72fe Author: Felipe Bonfim <felipebonfim2006@gmail.com> Date: Tue Jan 30 14:55:34 2024 -0400 kiniga added (#739) * kiniga added * kiniga updated icon commit 38fc1860da Author: K1ngfish3r <trulyihu@gmail.com> Date: Mon Jan 29 23:27:42 2024 +0800 (add src) LNMTL & ScribbleHub (#738) * quick * quick panda fix * remove console.log commit 4c7bee5855 Author: nyagami <hoangquan05112002@gmail.com> Date: Mon Jan 29 17:56:23 2024 +0700 fix: use english lang in plugin item consistent commit b26d1129de Author: uy/sun <hmy0119@hotmail.com> Date: Sun Jan 28 20:22:43 2024 +0800 Chinese: support showLatestNovels (#733) * improve: better chapterText * feat: support latest page commit 6ff206eab3 Author: nyagami <hoangquan05112002@gmail.com> Date: Sat Jan 27 09:26:19 2024 +0700 Refactor: Using English key (#728) * fix: use english key instead of native * fix: ukrainian * fix: web test with new plugins map commit 62fc988019 Author: Marcin Majewski <skilletssgames@gmail.com> Date: Fri Jan 26 14:42:54 2024 +0100 Fix search box styles (#727) commit 3a1e0c43eb Author: uy/sun <hmy0119@hotmail.com> Date: Fri Jan 26 19:46:47 2024 +0800 Add 69shu and 69xinshu (#726) * fix(linovelib): use NovelStatus and translate filter label * feat(69xinshu): add 69xinshu * feat(69shu): add 69shu * remove: empty userAgent * add wuxiamtl, fannovel * fix * Update ranobelib.ts * parseMadaraDate deleted * remove multisrc name from Plugin item --------- Co-authored-by: nyagami <hoangquan05112002@gmail.com>
2024-02-04 08:47:12 +03:00
parent 26bdb94100
commit fc52a6e665
36 changed files with 34403 additions and 15118 deletions
@@ -1552,7 +1552,7 @@
      ],
      "type": "Picker"
    },
-    "trash": {
+    "extra": {
      "label": "Другое:",
      "value": [],
      "options": [
@@ -1612,7 +1612,7 @@
    },
    "adult": {
      "label": "Возрастные ограничения:",
-      "value": "0",
+      "value": "1",
      "options": [
        {
          "label": "Все",
@@ -1,6 +1,6 @@
 [
  {
-    "id": "tl.rulate",
+    "id": "rulate",
    "sourceSite": "https://tl.rulate.ru",
    "sourceName": "Rulate",
    "filters": {
@@ -22,9 +22,8 @@ class RulatePlugin implements Plugin.PluginBase {

  constructor(metadata: RulateMetadata) {
    this.id = metadata.id;
-    this.name = metadata.sourceName + "[rulate]";
-    const iconFileName = metadata.sourceName.replace(/\s+/g, "").toLowerCase();
-    this.icon = `multisrc/rulate/icons/${iconFileName}.png`;
+    this.name = metadata.sourceName;
+    this.icon = `multisrc/rulate/icons/${metadata.id}.png`;
    this.site = metadata.sourceSite;
    this.version = "1.0.0";
    this.filters = metadata.filters;
@@ -35,8 +34,7 @@ class RulatePlugin implements Plugin.PluginBase {
    { filters, showLatestNovels }: Plugin.PopularNovelsOptions,
  ): Promise<Plugin.NovelItem[]> {
    const novels: Plugin.NovelItem[] = [];
-    const baseUrl = this.site;
-    let url = baseUrl + "/search?t=";
+    let url = this.site + "/search?t=";
    url += "&cat=" + (filters?.cat?.value || "0");
    url += "&s_lang=" + (filters?.s_lang?.value || "0");
    url += "&t_lang=" + (filters?.t_lang?.value || "0");
@@ -45,39 +43,13 @@ class RulatePlugin implements Plugin.PluginBase {
    url += "&atmosphere=" + (filters?.atmosphere?.value || "0");
    url += "&adult=" + (filters?.adult?.value || "0");

-    if (filters?.genres?.value instanceof Array) {
-      url += filters.genres.value.map((i) => "&genres[]=" + i).join("");
-    }
-
-    //if (filters?.genres?.value?.exclude instanceof Array) {
-    //  url += filters.genres.value.exclude
-    //    ?.map((i) => "&genres_ex[]=" + i)
-    //    .join("");
-    //}
-
-    if (filters?.tags?.value instanceof Array) {
-      url += filters.tags.value.map((i) => "&tags[]=" + i).join("");
-    }
-
-    //if (filters?.tags?.value?.exclude instanceof Array) {
-    //  url += filters.tags.value.exclude
-    //    ?.map((i) => "&tags_ex[]=" + i)
-    //    .join("");
-    //}
-
-    if (filters?.fandoms?.value instanceof Array) {
-      url += filters.fandoms.value.map((i) => "&fandoms[]=" + i).join("");
-    }
-
-    // if (filters?.fandoms?.value?.exclude instanceof Array) {
-    //   url += filters.fandoms.value.exclude
-    //     .map((i) => "&fandoms_ex[]=" + i)
-    //     .join("");
-    // }
-
-    if (filters?.trash?.value instanceof Array) {
-      url += filters.trash.value.map((i) => "&" + i + "=1").join("");
-    }
+    Object.entries(filters || {}).forEach(([type, { value }]) => {
+      if (value instanceof Array && value.length) {
+        url += "&" + value
+            .map((val) => (type == "extra" ? val + "=1" : type + "[]=" + val))
+            .join("&");
+      }
+    });

    url += "&Book_page=" + pageNo;

@@ -86,21 +58,20 @@ class RulatePlugin implements Plugin.PluginBase {

    loadedCheerio(
      'ul[class="search-results"] > li:not([class="ad_type_catalog"])',
-    ).each(function () {
-      loadedCheerio(this).find("p > a").text();
-      const name = loadedCheerio(this).find("p > a").text();
-      const cover = loadedCheerio(this).find("img").attr("src");
-      const url = loadedCheerio(this).find("p > a").attr("href");
+    ).each((index, element) => {
+      loadedCheerio(element).find("p > a").text();
+      const name = loadedCheerio(element).find("p > a").text();
+      const cover = loadedCheerio(element).find("img").attr("src");
+      const url = loadedCheerio(element).find("p > a").attr("href");
      if (!name || !url) return;

-      novels.push({ name, cover: baseUrl + cover, url: baseUrl + url });
+      novels.push({ name, cover: this.site + cover, url: this.site + url });
    });

    return novels;
  }

  async parseNovelAndChapters(novelUrl: string): Promise<Plugin.SourceNovel> {
-    const baseUrl = this.site;
    const novel: Plugin.SourceNovel = {
      url: novelUrl,
    };
@@ -129,7 +100,7 @@ class RulatePlugin implements Plugin.PluginBase {
      novel.name = novel.name.split("[")[0].trim();
    }
    novel.cover =
-      baseUrl + loadedCheerio('div[class="images"] > div img').attr("src");
+      this.site + loadedCheerio('div[class="images"] > div img').attr("src");
    novel.summary = 
      loadedCheerio("#Info > div:nth-child(3), .book-description").text().trim();
    novel.author = loadedCheerio(
@@ -172,27 +143,17 @@ class RulatePlugin implements Plugin.PluginBase {
    }

    const chapters: Plugin.ChapterItem[] = [];
-    loadedCheerio("table > tbody > tr.chapter_row").each(function () {
-      const chapterName = loadedCheerio(this)
-        .find('td[class="t"] > a')
-        .text()
-        .trim();
-      const releaseDate = loadedCheerio(this)
-        .find("td > span")
-        .attr("title")
-        ?.trim();
-      const chapterUrl = loadedCheerio(this)
-        .find('td[class="t"] > a')
-        .attr("href");
+    loadedCheerio("table > tbody > tr.chapter_row").each((chapterIndex, element) => {
+      const chapterName = loadedCheerio(element).find('td[class="t"] > a').text().trim();
+      const releaseDate = loadedCheerio(element).find("td > span").attr("title")?.trim();
+      const chapterUrl = loadedCheerio(element).find('td[class="t"] > a').attr("href");

-      if (
-        !loadedCheerio(this).find('td > span[class="disabled"]').length &&
-        releaseDate
-      ) {
+      if (!loadedCheerio(element).find('td > span[class="disabled"]').length && releaseDate) {
        chapters.push({
          name: chapterName,
+          url: this.site + chapterUrl,
          releaseTime: releaseDate,
-          url: baseUrl + chapterUrl,
+          chapterNumber: chapterIndex + 1,
        });
      }
    });
@@ -202,7 +163,6 @@ class RulatePlugin implements Plugin.PluginBase {
  }

  async parseChapter(chapterUrl: string): Promise<string> {
-    const baseUrl = this.site;
    let result = await fetchApi(chapterUrl);
    if (result.url.includes("mature?path=")) {
      const formData = new FormData();
@@ -218,10 +178,10 @@ class RulatePlugin implements Plugin.PluginBase {
    const body = await result.text();
    const loadedCheerio = parseHTML(body);

-    loadedCheerio(".content-text img").each(function () {
-      if (!loadedCheerio(this).attr("src")?.startsWith("http")) {
-        const src = loadedCheerio(this).attr("src");
-        loadedCheerio(this).attr("src", baseUrl + src);
+    loadedCheerio(".content-text img").each((index, element) => {
+      if (!loadedCheerio(element).attr("src")?.startsWith("http")) {
+        const src = loadedCheerio(element).attr("src");
+        loadedCheerio(element).attr("src", this.site + src);
      }
    });