Merge pull request #285 from xMohnad/manga/webtoons

Fix: Manga/webtoons

javascript/manga/src/all/webtoons.js

@@ -1,3 +1,4 @@
+// prettier-ignore
 const mangayomiSources = [{
     "name": "Webtoons",
     "langs": ["en", "fr", "id", "th", "es", "zh", "de"],
@@ -15,121 +16,93 @@ const mangayomiSources = [{
 
 class DefaultExtension extends MProvider {
   headers = {
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36"
+    "User-Agent":
+      "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36",
   };
   getHeaders(url) {
     return {
-            Referer: this.source.baseUrl
+      Referer: this.source.baseUrl,
-        }
+    };
   }
 
-    async getItem(url, selector) {
+  mangaFromElement(doc) {
-        const res = await new Client().get(this.source.baseUrl + url, this.headers);
+    const list = [];
-        const doc = new Document(res.body);
+    for (const el of doc.select(
-        const mangas = [];
+      `div.webtoon_list_wrap li a, ul.webtoon_list li a`,
-        const elements = doc.select(selector);
+    )) {
-        for (const element of elements) {
+      const imageUrl = el.selectFirst("img").getSrc;
-            const linkElement = element.selectFirst("a");
+      const name = el.selectFirst("strong.title").text;
-            const imageElement = linkElement.selectFirst("img");
+      const link = el.getHref;
-            const imageUrl = imageElement.attr("src");
+      list.push({ name, imageUrl, link });
-            const name = element.selectFirst("p.subj").text;
-            const link = linkElement.attr("href");
-            const genre = [];
-            if (element.selectFirst("p.genre").text === "") {
-                genre.push(element.selectFirst("span.genre").text);
-            } else {
-                genre.push(element.selectFirst("p.genre").text);
     }
-            mangas.push({
+
-                name: name,
+    return list;
-                imageUrl: imageUrl,
-                link: link,
-                genre: genre
-            });
-        }
-        return mangas;
   }
 
   async getPopular(page) {
     const baseUrl = this.source.baseUrl;
-        const client = new Client();
+    const res = await new Client().get(
-        const res = await client.get(`${baseUrl}/${this.langCode()}/originals`);
+      `${baseUrl}/${this.langCode()}/originals`,
+    );
     const doc = new Document(res.body);
 
-        const days = ["MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY", "SATURDAY", "SUNDAY"];
-        let dayElements = [];
-
-        for (const day of days) {
-            const elements = doc.select(`div.daily_section._list_${day} li`);
-            dayElements.push(elements);
-        }
-
-        const maxElements = Math.max(...dayElements.map(elements => elements.length));
-        let list = [];
-        for (let i = 0; i < maxElements; i++) {
-            for (let j = 0; j < days.length; j++) {
-                const elements = dayElements[j];
-                if (i < elements.length) {
-                    const element = elements[i];
-                    const linkElement = element.selectFirst("a");
-                    const imageElement = linkElement.selectFirst("img");
-                    const imageUrl = imageElement.attr("src");
-                    const name = element.selectFirst("p.subj").text;
-                    const link = linkElement.attr("href");
-                    list.push({ name, imageUrl, link });
-                }
-            }
-        }
-
-        const completed = doc.select("div.daily_lst.comp li");
-        for (const element of completed) {
-            const linkElement = element.selectFirst("a");
-            const imageElement = linkElement.selectFirst("img");
-            const imageUrl = imageElement.attr("src");
-            const name = element.selectFirst("p.subj").text;
-            const link = linkElement.attr("href");
-            list.push({ name, imageUrl, link });
-        }
-
     return {
-            list: list,
+      list: this.mangaFromElement(doc),
-            hasNextPage: false
+      hasNextPage: false,
     };
   }
 
   async getLatestUpdates(page) {
-        const Day = ['SUNDAY', 'MONDAY', 'TUESDAY', 'WEDNESDAY', 'THURSDAY', 'FRIDAY', 'SATURDAY'];
+    const baseUrl = this.source.baseUrl;
-        const list = await this.getItem(`/${this.langCode()}/originals?sortOrder=UPDATE`, "div.daily_section._list_" + Day[new Date().getDay()] + " li");
+    const res = await new Client().get(
+      `${baseUrl}/${this.langCode()}/originals?sortOrder=UPDATE`,
+    );
+    const doc = new Document(res.body);
+
     return {
-            list: list,
+      list: this.mangaFromElement(doc),
-            hasNextPage: false
+      hasNextPage: false,
     };
   }
 
   async search(query, page, filters) {
-        let keyword = query.trim().replace(/\s+/g, '+');
+    const keyword = query.trim().replace(/\s+/g, "+");
-        let hasNextPage = true;
+    const baseurl = this.source.baseUrl;
-        let type_originals = "WEBTOON";
+    let url = `${baseurl}/${this.langCode()}`;
-        let type_canvas = "CHALLENGE";
+    let hasNextPage = false;
-        let fetch_originals = "ul.card_lst li";
-        let fetch_canvas = "div.challenge_lst.search li";
-        let list_originals = [];
-        let list_canvas = [];
-        let list = [];
 
-        if (query !== "") {
+    const getFilterValue = (type, defaultValue = "") => {
-            list_originals = await this.getItem(`/${this.langCode()}/search?keyword=${keyword}&searchType=` + type_originals + `&page=${page}`, fetch_originals);
+      const filter = filters.find((f) => f.type === type);
-            list_canvas = await this.getItem(`/${this.langCode()}/search?keyword=${keyword}&searchType=` + type_canvas + `&page=${page}`, fetch_canvas);
+      return filter?.values?.[filter.state]?.value ?? defaultValue;
-            if (filters) { }
+    };
-            list = list_originals.concat(list_canvas);
+    if (query) {
+      url += `/search/${getFilterValue("searchType")}?keyword=${keyword}&page=${page}`;
     } else {
+      const sortOrder = getFilterValue("sortOrder");
+      const rankingType = getFilterValue("rankingType");
+      const weekday = getFilterValue("weekday");
+      const genreType = getFilterValue("genre");
 
+      if (rankingType) {
+        // const genreParam = genreType ? `&subTabGenreCode=${genreType}` : "";
+        url += `/ranking/${rankingType}`;
+      } else if (weekday) {
+        url += `/originals/${weekday}?sortOrder=${sortOrder}`;
+      } else if (genreType) {
+        url += `/genres/${genreType}?sortOrder=${sortOrder}`;
+      }
+    }
+
+    const res = await new Client().get(url);
+    const doc = new Document(res.body);
+    const list = this.mangaFromElement(doc);
+    if (query) {
+      hasNextPage = list.length !== 0;
     }
 
-        if (list.length === 0) { hasNextPage = false; }
     return {
-            list: list,
+      list,
-            hasNextPage: hasNextPage
+      hasNextPage,
     };
   }
 
@@ -137,10 +110,18 @@ class DefaultExtension extends MProvider {
     const res = await new Client().get(url);
     const doc = new Document(res.body);
     const info = doc.selectFirst("div.cont_box");
-        const cover = info.selectFirst("div.detail_body")?.attr("style")?.match(/url\(['"]?(.*?)['"]?\)/)?.[1] ?? info.selectFirst("span.thmb img")?.attr("src");
+
     const title = info.selectFirst("h1.subj, h3.subj").text.trim();
-        const genre = Array.from(info.select("p.genre")).map(el => el.text) != '' ? Array.from(info.select("p.genre")).map(el => el.text) : [info.selectFirst("div.info h2").text];
+    const genre =
-        const author = info.selectFirst("div.author_area").text.replace(/\s+/g, ' ').replace(/author info/g, '').trim() ?? info.selectFirst("a.author").text;
+      Array.from(info.select("p.genre")).map((el) => el.text) != ""
+        ? Array.from(info.select("p.genre")).map((el) => el.text)
+        : [info.selectFirst("div.info h2").text];
+    const author =
+      info
+        .selectFirst("div.author_area")
+        .text.replace(/\s+/g, " ")
+        .replace(/author info/g, "")
+        .trim() ?? info.selectFirst("a.author").text;
     const status_str = info.selectFirst("p.day_info").text;
     var status;
     if (status_str == "COMPLETED") {
@@ -148,7 +129,7 @@ class DefaultExtension extends MProvider {
     } else {
       status = 0;
     }
-        const desc = info.selectFirst("p.summary").text.replace(/\s+/g, ' ').trim();
+    const desc = info.selectFirst("p.summary").text.replace(/\s+/g, " ").trim();
     const chapters = [];
     let tester = "";
     let page = 1;
@@ -162,13 +143,15 @@ class DefaultExtension extends MProvider {
       for (const element of elements) {
         tester = element.selectFirst("span.tx").text.trim();
         const dateString = element.selectFirst("span.date").text.trim();
-                const date = new Date(this.formatDateString(dateString, this.source.lang));
+        const date = new Date(
+          this.formatDateString(dateString, this.source.lang),
+        );
         const millisecondsSinceEpoch = date.getTime();
         const millisecondsString = millisecondsSinceEpoch.toString();
         chapters.push({
           name: tester + " " + element.selectFirst("span.subj span").text,
-                    url: element.selectFirst('a').attr("href"),
+          url: element.selectFirst("a").attr("href"),
-                    dateUpload: millisecondsString
+          dateUpload: millisecondsString,
         });
       }
       page++;
@@ -178,15 +161,12 @@ class DefaultExtension extends MProvider {
       link: url,
       genre: genre,
       description: desc,
-            imageUrl: cover,
       author: author,
       status: status,
-            episodes: chapters
+      episodes: chapters,
     };
   }
 
-
-
   langCode() {
     return {
       en: "en",
@@ -195,20 +175,85 @@ class DefaultExtension extends MProvider {
       th: "th",
       es: "es",
       zh: "zh-hant",
-            de: "de"
+      de: "de",
     }[this.source.lang];
   }
 
   formatDateString(dateStr, lang) {
     // Month translations for supported languages
     const monthTranslations = {
-            en: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
+      en: [
-            fr: ["janv.", "févr.", "mars", "avr.", "mai", "juin", "juil.", "août", "sept.", "oct.", "nov.", "déc."],
+        "Jan",
-            id: ["Jan", "Feb", "Mar", "Apr", "Mei", "Jun", "Jul", "Agt", "Sep", "Okt", "Nov", "Des"],
+        "Feb",
-            th: ["ม.ค.", "ก.พ.", "มี.ค.", "เม.ย.", "พ.ค.", "มิ.ย.", "ก.ค.", "ส.ค.", "ก.ย.", "ต.ค.", "พ.ย.", "ธ.ค."],
+        "Mar",
-            es: ["ene.", "feb.", "mar.", "abr.", "may.", "jun.", "jul.", "ago.", "sep.", "oct.", "nov.", "dic."],
+        "Apr",
+        "May",
+        "Jun",
+        "Jul",
+        "Aug",
+        "Sep",
+        "Oct",
+        "Nov",
+        "Dec",
+      ],
+      fr: [
+        "janv.",
+        "févr.",
+        "mars",
+        "avr.",
+        "mai",
+        "juin",
+        "juil.",
+        "août",
+        "sept.",
+        "oct.",
+        "nov.",
+        "déc.",
+      ],
+      id: [
+        "Jan",
+        "Feb",
+        "Mar",
+        "Apr",
+        "Mei",
+        "Jun",
+        "Jul",
+        "Agt",
+        "Sep",
+        "Okt",
+        "Nov",
+        "Des",
+      ],
+      th: [
+        "ม.ค.",
+        "ก.พ.",
+        "มี.ค.",
+        "เม.ย.",
+        "พ.ค.",
+        "มิ.ย.",
+        "ก.ค.",
+        "ส.ค.",
+        "ก.ย.",
+        "ต.ค.",
+        "พ.ย.",
+        "ธ.ค.",
+      ],
+      es: [
+        "ene.",
+        "feb.",
+        "mar.",
+        "abr.",
+        "may.",
+        "jun.",
+        "jul.",
+        "ago.",
+        "sep.",
+        "oct.",
+        "nov.",
+        "dic.",
+      ],
       zh: [], // No need for month names; uses yyyy年MM月dd日 format
-            de: []  // No need for month names; uses dd.MM.yyyy format
+      de: [], // No need for month names; uses dd.MM.yyyy format
     };
     const months = monthTranslations[lang];
     let parts;
@@ -225,7 +270,7 @@ class DefaultExtension extends MProvider {
         day = match[3];
       case "de":
         // Expected format: dd.MM.yyyy
-                parts = dateStr.split('.');
+        parts = dateStr.split(".");
         if (parts.length === 3) {
           month = parts[1];
           day = parts[0];
@@ -236,7 +281,7 @@ class DefaultExtension extends MProvider {
       case "id":
       case "th":
         // Expected format: dd MMM yyyy
-                parts = dateStr.split(' ');
+        parts = dateStr.split(" ");
         if (parts.length === 3) {
           month = months.indexOf(parts[1]) + 1;
           day = parts[0];
@@ -244,141 +289,293 @@ class DefaultExtension extends MProvider {
         }
         break;
       default:
-                parts = dateStr.split(' ');
+        parts = dateStr.split(" ");
         if (parts.length === 3) {
           month = months.indexOf(parts[0]) + 1;
-                    day = parts[1].replace(',', '');
+          day = parts[1].replace(",", "");
           year = parts[2];
         }
     }
     if (!month || !year || !day) {
       return Date.now();
     }
-        return `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
+    return `${year}-${month.toString().padStart(2, "0")}-${day.toString().padStart(2, "0")}`;
-
   }
 
   async getPageList(url) {
     const res = await new Client().get(url);
     const doc = new Document(res.body);
     const urls = [];
-        const imageElement = doc.selectFirst('div#_imageList');
+    const imageElement = doc.selectFirst("div#_imageList");
-        const img_urls = imageElement.select('img');
+    const img_urls = imageElement.select("img");
     for (let i = 0; i < img_urls.length; i++) {
       urls.push(img_urls[i].attr("data-url"));
     }
     return urls;
   }
 
-
-
   getFilterList() {
-        return [{
+    return [
-            type: "sort",
+      {
-            name: "Official or Challenge",
+        type: "header",
+        name: "Filter Priority: Search > Ranking > Day > Genre | Sort applies to Day/Genre",
+        type_name: "HeaderFilter",
+      },
+      {
+        type: "separator",
+        type_name: "SeparatorFilter",
+      },
+
+      {
+        type: "searchType",
+        name: "Search Type",
         type_name: "SelectFilter",
-            values: [{
+        values: [
+          {
             type_name: "SelectOption",
-                name: "Any",
+            name: "Originals",
-                value: "any"
+            value: "originals",
           },
           {
             type_name: "SelectOption",
-                name: "Official only",
+            name: "Canvas",
-                value: "official"
+            value: "canvas",
+          },
+        ],
+        state: 0,
+      },
+      {
+        type: "separator",
+        type_name: "SeparatorFilter",
+      },
+
+      {
+        type: "rankingType",
+        name: "Ranking Category",
+        type_name: "SelectFilter",
+        values: [
+          {
+            type_name: "SelectOption",
+            name: "Not Selected",
+            value: "",
           },
           {
             type_name: "SelectOption",
-                name: "Challenge only",
+            name: "Trending",
-                value: "challenge"
+            value: "trending",
-            }]
           },
           {
-            type: "categories",
+            type_name: "SelectOption",
+            name: "Popular",
+            value: "popular",
+          },
+          {
+            type_name: "SelectOption",
+            name: "Originals",
+            value: "originals",
+          },
+          {
+            type_name: "SelectOption",
+            name: "Canvas",
+            value: "canvas",
+          },
+        ],
+      },
+      {
+        type: "separator",
+        type_name: "SeparatorFilter",
+      },
+
+      {
+        type: "sortOrder",
+        name: "Sort By (For Schedule & Genres)",
+        type_name: "SelectFilter",
+        values: [
+          { type_name: "SelectOption", name: "Popular (MANA)", value: "MANA" },
+          { type_name: "SelectOption", name: "Likes", value: "LIKEIT" },
+          { type_name: "SelectOption", name: "Newest", value: "UPDATE" },
+        ],
+        state: 0,
+        appliesTo: ["weekday", "genre"],
+      },
+
+      {
+        type: "weekday",
+        name: "Update Schedule",
+        type_name: "SelectFilter",
+        values: [
+          {
+            type_name: "SelectOption",
+            name: "Day",
+            value: "",
+            data: "",
+          },
+          {
+            type_name: "SelectOption",
+            name: "Monday",
+            value: "monday",
+            data: "MONDAY",
+          },
+          {
+            type_name: "SelectOption",
+            name: "Tuesday",
+            value: "tuesday",
+            data: "TUESDAY",
+          },
+          {
+            type_name: "SelectOption",
+            name: "Wednesday",
+            value: "wednesday",
+            data: "WEDNESDAY",
+          },
+          {
+            type_name: "SelectOption",
+            name: "Thursday",
+            value: "thursday",
+            data: "THURSDAY",
+          },
+          {
+            type_name: "SelectOption",
+            name: "Friday",
+            value: "friday",
+            data: "FRIDAY",
+          },
+          {
+            type_name: "SelectOption",
+            name: "Saturday",
+            value: "saturday",
+            data: "SATURDAY",
+          },
+          {
+            type_name: "SelectOption",
+            name: "Sunday",
+            value: "sunday",
+            data: "SUNDAY",
+          },
+          {
+            type_name: "SelectOption",
+            name: "Completed",
+            value: "complete",
+            data: "COMPLETE",
+          },
+        ],
+      },
+
+      {
+        type: "genre",
         name: "Genre",
         type_name: "SelectFilter",
-            values: [{
+        values: [
-                type_name: "SelectOption",
-                name: "All",
-                value: ""
-            },
           {
             type_name: "SelectOption",
-                name: "Action",
+            name: "All Genres",
-                value: "action"
+            value: "",
-            },
+            data: "",
-            {
-                type_name: "SelectOption",
-                name: "Comedy",
-                value: "comedy"
           },
           {
             type_name: "SelectOption",
             name: "Drama",
-                value: "drama"
+            value: "drama",
+            data: "DRAMA",
           },
           {
             type_name: "SelectOption",
             name: "Fantasy",
-                value: "fantasy"
+            value: "fantasy",
+            data: "FANTASY",
           },
           {
             type_name: "SelectOption",
-                name: "Heartwarming",
+            name: "Comedy",
-                value: "heartwarming"
+            value: "comedy",
+            data: "COMEDY",
           },
           {
             type_name: "SelectOption",
-                name: "Historical",
+            name: "Action",
-                value: "historical"
+            value: "action",
+            data: "ACTION",
           },
           {
             type_name: "SelectOption",
-                name: "Horror",
+            name: "Slice of Life",
-                value: "horror"
+            value: "slice_of_life",
-            },
+            data: "SLICE_OF_LIFE",
-            {
-                type_name: "SelectOption",
-                name: "Informative",
-                value: "tiptoon"
-            },
-            {
-                type_name: "SelectOption",
-                name: "Mystery",
-                value: "mystery"
           },
           {
             type_name: "SelectOption",
             name: "Romance",
-                value: "romance"
+            value: "romance",
-            },
+            data: "ROMANCE",
-            {
-                type_name: "SelectOption",
-                name: "Sci-fi",
-                value: "sf"
-            },
-            {
-                type_name: "SelectOption",
-                name: "Slice of life",
-                value: "slice_of_life"
-            },
-            {
-                type_name: "SelectOption",
-                name: "Sports",
-                value: "sports"
           },
           {
             type_name: "SelectOption",
             name: "Superhero",
-                value: "super_hero"
+            value: "super_hero",
+            data: "SUPER_HERO",
+          },
+          {
+            type_name: "SelectOption",
+            name: "Sci-Fi",
+            value: "sf",
+            data: "SF",
+          },
+          {
+            type_name: "SelectOption",
+            name: "Thriller",
+            value: "thriller",
+            data: "THRILLER",
           },
           {
             type_name: "SelectOption",
             name: "Supernatural",
-                value: "supernatural"
+            value: "supernatural",
-            }]
+            data: "SUPERNATURAL",
-        }
+          },
+          {
+            type_name: "SelectOption",
+            name: "Mystery",
+            value: "mystery",
+            data: "MYSTERY",
+          },
+          {
+            type_name: "SelectOption",
+            name: "Sports",
+            value: "sports",
+            data: "SPORTS",
+          },
+          {
+            type_name: "SelectOption",
+            name: "Historical",
+            value: "historical",
+            data: "HISTORICAL",
+          },
+          {
+            type_name: "SelectOption",
+            name: "Heartwarming",
+            value: "heartwarming",
+            data: "HEARTWARMING",
+          },
+          {
+            type_name: "SelectOption",
+            name: "Horror",
+            value: "horror",
+            data: "HORROR",
+          },
+          {
+            type_name: "SelectOption",
+            name: "Graphic Novel",
+            value: "graphic_novel",
+            data: "GRAPHIC_NOVEL",
+          },
+          {
+            type_name: "SelectOption",
+            name: "Informative",
+            value: "tiptoon",
+            data: "TIPTOON",
+          },
+        ],
+      },
     ];
   }
-
 }