Refactor: Faqwiki (#1159)

* refactor

* mutlWordGenres

* cover fix

* replace slice

* replace trailing slash

src/plugins/english/faqwikius.ts

@@ -6,15 +6,18 @@ import { NovelStatus } from '@libs/novelStatus';
 class FaqWikiUs implements Plugin.PluginBase {
   id = 'FWK.US';
   name = 'Faq Wiki';
-  site = 'https://faqwiki.us/';
+  site = 'https://www.faqwiki.us/';
-  version = '1.1.1';
+  version = '2.0.0';
   icon = 'src/en/faqwikius/icon.png';
 
   parseNovels(loadedCheerio: CheerioAPI, searchTerm?: string) {
     let novels: Plugin.NovelItem[] = [];
 
-    loadedCheerio('figure.wp-block-image').each((index, element) => {
+    loadedCheerio('.plt-page-item').each((index, element) => {
-      const name = loadedCheerio(element).text();
+      const name = loadedCheerio(element)
+        .text()
+        .replace('Novel – All Chapters', '')
+        .trim();
       let cover = loadedCheerio(element).find('img').attr('data-ezsrc');
 
       // Remove the appended query string
@@ -28,7 +31,8 @@ class FaqWikiUs implements Plugin.PluginBase {
         .find('a')
         .attr('href')
         ?.replace('tp:', 'tps:')
-        ?.slice(this.site.length);
+        ?.replace(this.site, '')
+        ?.replace(/\/+$/, '');
       if (!path) return;
 
       novels.push({ name, cover, path });
@@ -64,55 +68,72 @@ class FaqWikiUs implements Plugin.PluginBase {
       .replace('Novel – All Chapters', '')
       .trim();
 
-    novel.cover = loadedCheerio('.wp-block-image')
+    const img = loadedCheerio('.wp-block-image img');
-      .find('img')
+    const cover = img.attr('data-ezsrc') || img.attr('src');
-      .attr('data-ezsrc')
+    novel.cover = cover?.replace(/\?ezimgfmt=.*$/, ''); // Regular expression magic!
-      ?.replace(/\?ezimgfmt=.*$/, ''); // Regular expression magic!
 
     const status = loadedCheerio(
       "#lcp_instance_0 +:icontains('complete')",
     ).text();
     novel.status = status ? NovelStatus.Completed : NovelStatus.Ongoing;
 
-    const div = loadedCheerio('.book-review-block__meta-item-value');
+    loadedCheerio('.entry-content strong').each((i, el) => {
-
+      const key = loadedCheerio(el).text().trim().toLowerCase();
-    div.html(div.html()?.replace(/(?<=>)([^<]+)(?=<br\s*\/?>)/g, '<p>$1</p>'));
+      const parent = loadedCheerio(el).parent();
-
+      const values = [parent.text().slice(key.length).trim()].concat(
-    loadedCheerio('.book-review-block__meta-item-value strong').each(
+        parent
-      (i, el) => {
+          .nextUntil('p:has(strong)')
-        const key = loadedCheerio(el)
+          .map((e, ax) => loadedCheerio(ax).text().trim())
-          .text()
+          .get(),
-          .replace(':', '')
+      );
-          .trim()
+      let genreText = values.join(' ').trim();
-          .toLowerCase();
+      const multiWordGenres = [
-        const value = loadedCheerio(el).next().text().replace(':', '').trim();
+        //add more when found
+        'Slice of Life',
+        'School Life',
+      ];
+      multiWordGenres.forEach(genre => {
+        genreText = genreText.replace(
+          new RegExp(`\\b${genre}\\b`, 'g'),
+          genre.replace(/ /g, '_'),
+        );
+      });
+      const genres = genreText
+        .split(/\s+/)
+        .map(word => word.replace(/_/g, ' '))
+        .join(', ');
 
       switch (key) {
-          case 'description':
+        case 'description:':
-            novel.summary = value;
+          novel.summary = values.join('\n');
           break;
-          case 'author(s)':
+        case 'author(s):':
-            novel.author = value;
+          novel.author = values[0];
           break;
-          case 'genre':
+        case 'genre:':
-            novel.genres = value.split(' ').join(',');
+          novel.genres = genres;
       }
-      },
+    });
-    );
 
-    const chapters: Plugin.ChapterItem[] = loadedCheerio(
+    const chapters: Plugin.ChapterItem[] = [];
-      '.lcp_catlist > li > a',
+    loadedCheerio('.lcp_catlist li a').each((chapterIndex, element) => {
-    )
+      const name = loadedCheerio(element)
-      .map((chapterIndex, element) => ({
-        name: loadedCheerio(element)
         .text()
         .replace(novel.name + '', '')
         .replace('Novel' + '', '')
-          .trim(),
+        .trim();
-        path: '' + loadedCheerio(element).attr('href')?.slice(this.site.length),
+      const path = loadedCheerio(element)
-        chapterNumber: chapterIndex + 1,
+        .attr('href')
-      }))
+        ?.replace(this.site, '')
-      .get();
+        ?.replace(/\/+$/, '');
+      const chapterNumber = chapterIndex + 1;
+      if (!path) return;
+      chapters.push({
+        name,
+        path,
+        chapterNumber,
+      });
+    });
 
     novel.chapters = chapters;
     return novel;
@@ -123,33 +144,37 @@ class FaqWikiUs implements Plugin.PluginBase {
       res.text(),
     );
     const loadedCheerio = parseHTML(body);
-    loadedCheerio('span').remove();
+    const removal = ['.entry-content span', '.entry-content div', 'script'];
+    removal.map(e => {
+      loadedCheerio(e).remove();
+    });
 
-    const chapterParagraphs = loadedCheerio('.entry-content p');
+    const chapterText = loadedCheerio('.entry-content').html()!;
+    // const chapterParagraphs = loadedCheerio('.entry-content p');
 
-    let chapterContent; // Variable to store the result
+    // let chapterContent; // Save this code in case needed
 
-    if (chapterParagraphs.length < 5) {
+    // if (chapterParagraphs.length < 5) {
-      //some chapter in this site store their whole text in 1-4 <p>,
+    //   //some chapter in this site store their whole text in 1-4 <p>,
-      chapterContent = chapterParagraphs
+    //   chapterContent = chapterParagraphs
-        .map((index, element) => {
+    //     .map((index, element) => {
-          const text = loadedCheerio(element).html();
+    //       const text = loadedCheerio(element).html();
-          return text;
+    //       return text;
-        })
+    //     })
-        .get()
+    //     .get()
-        .join('\n\n');
+    //     .join('\n\n');
-    } else {
+    // } else {
-      // Multiple paragraphs case
+    //   // Multiple paragraphs case
-      chapterContent = chapterParagraphs
+    //   chapterContent = chapterParagraphs
-        .map((index, element) => {
+    //     .map((index, element) => {
-          const text = loadedCheerio(element).text().trim();
+    //       const text = loadedCheerio(element).text().trim();
-          return `<p>${text}</p>`;
+    //       return `<p>${text}</p>`;
-        })
+    //     })
-        .get()
+    //     .get()
-        .join('\n\n');
+    //     .join('\n\n');
-    }
+    // }
 
-    return chapterContent;
+    return chapterText;
   }
 
   async searchNovels(searchTerm: string): Promise<Plugin.NovelItem[]> {