fix: Source Updates (#615)

Closes LNReader/lnreader-plugins#476 Closes LNReader/lnreader-plugins#478 Closes LNReader/lnreader-plugins#485 Closes LNReader/lnreader-plugins#487 Closes LNReader/lnreader-plugins#486
LNReader · May 6, 2023 · f0d0696 · f0d0696
1 parent 7221070
commit f0d0696
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 59 deletions.
diff --git a/src/sources/en/novelhall.js b/src/sources/en/novelhall.js
@@ -1,60 +1,52 @@
 import * as cheerio from 'cheerio';
+import { fetchHtml } from '@utils/fetch/fetch';
 import { defaultCoverUri } from '../helpers/constants';
 
 const baseUrl = 'https://www.novelhall.com/';
 
 const sourceId = 6;
 
+const sourceName = 'NovelHall';
+
 const popularNovels = async page => {
-  const url = baseUrl + 'completed-' + page + '.html';
+  const url = `${baseUrl}all2022-${page}.html`;
 
-  const result = await fetch(url);
-  const body = await result.text();
+  const body = await fetchHtml({ url, sourceId });
 
   const loadedCheerio = cheerio.load(body);
 
   let novels = [];
 
-  loadedCheerio('div.section3')
-    .find('tr')
-    .each(function () {
-      const novelName = loadedCheerio(this).find('.w70 > a').text();
-      const novelCover = defaultCoverUri;
-      const novelUrl = loadedCheerio(this)
-        .find('.w70 > a')
-        .attr('href')
-        .substring(1);
-
-      const novel = {
-        sourceId,
-        novelName,
-        novelCover,
-        novelUrl,
-      };
+  loadedCheerio('li.btm').each(function () {
+    const novelName = loadedCheerio(this).find('a').text();
+    const novelCover = defaultCoverUri;
+    const novelUrl =
+      baseUrl + loadedCheerio(this).find('a').attr('href').slice(1);
 
-      novels.push(novel);
-    });
+    const novel = {
+      sourceId,
+      novelName,
+      novelCover,
+      novelUrl,
+    };
+
+    novels.push(novel);
+  });
 
   return { novels };
 };
 
 const parseNovelAndChapters = async novelUrl => {
-  const url = `${baseUrl}${novelUrl}/`;
-
-  const result = await fetch(url);
-  const body = await result.text();
+  const body = await fetchHtml({ url: novelUrl, sourceId });
 
-  const loadedCheerio = cheerio.load(body);
-
-  let novel = {};
-
-  novel.sourceId = 6;
-
-  novel.sourceName = 'NovelHall';
+  let loadedCheerio = cheerio.load(body);
 
-  novel.url = url;
-
-  novel.novelUrl = novelUrl;
+  let novel = {
+    sourceId,
+    sourceName,
+    url: novelUrl,
+    novelUrl,
+  };
 
   novel.novelName = loadedCheerio('h1').text();
 
@@ -88,11 +80,7 @@ const parseNovelAndChapters = async novelUrl => {
 
       let releaseDate = null;
 
-      let chapterUrl = loadedCheerio(this).find('a').attr('href');
-
-      if (chapterUrl) {
-        chapterUrl = chapterUrl.replace(`/${novelUrl}/`, '');
-      }
+      let chapterUrl = baseUrl + loadedCheerio(this).find('a').attr('href');
 
       const chapter = {
         chapterName,
@@ -109,12 +97,9 @@ const parseNovelAndChapters = async novelUrl => {
 };
 
 const parseChapter = async (novelUrl, chapterUrl) => {
-  const url = `${baseUrl}${novelUrl}/${chapterUrl}`;
+  const body = await fetchHtml({ url: chapterUrl, sourceId });
 
-  const result = await fetch(url);
-  const body = await result.text();
-
-  const loadedCheerio = cheerio.load(body);
+  let loadedCheerio = cheerio.load(body);
 
   const chapterName = loadedCheerio('h1').text();
   const chapterText = loadedCheerio('div.entry-content').html();
@@ -134,24 +119,18 @@ const searchNovels = async searchTerm => {
 
   const url = `${searchUrl}${searchTerm}`;
 
-  const result = await fetch(url);
-  const body = await result.text();
+  const body = await fetchHtml({ url, sourceId });
 
   const loadedCheerio = cheerio.load(body);
 
   let novels = [];
 
   loadedCheerio('tr').each(function () {
-    let novelName = loadedCheerio(this).find('td:nth-child(2)').text();
-    novelName = novelName.replace(/[\t\n]/g, '');
-
+    const novelName = loadedCheerio(this).find('td:nth-child(2) > a').text();
     const novelCover = 'https://cdn.novelupdates.com/imgmid/noimagemid.jpg';
-
-    let novelUrl = loadedCheerio(this).find('td:nth-child(2) >').attr('href');
-    if (novelUrl) {
-      novelUrl = novelUrl.slice(1);
-    }
-
+    const novelUrl =
+      baseUrl +
+      loadedCheerio(this).find('td:nth-child(2) > a').attr('href').slice(1);
     const novel = {
       sourceId,
       novelName,

diff --git a/src/sources/en/pawread.js b/src/sources/en/pawread.js
@@ -72,11 +72,12 @@ const parseNovelAndChapters = async novelUrl => {
       .next()
       .text();
     const chapterUrl =
-      baseUrl +
+      novelUrl +
       loadedCheerio(this)
         .find('.item-box')
         .attr('onclick')
-        .replace(/.*?(novel.*html).*/g, '$1');
+        .replace(/.*'(.*)'.*/g, '$1') +
+      '.html';
 
     chapters.push({ chapterName, releaseDate, chapterUrl });
   });

diff --git a/src/sources/id/sakuranovel.js b/src/sources/id/sakuranovel.js
@@ -102,7 +102,7 @@ const parseChapter = async (novelUrl, chapterUrl) => {
   let loadedCheerio = cheerio.load(body);
 
   const chapterName = loadedCheerio('.title-chapter').text();
-  const chapterText = loadedCheerio('.reader').html();
+  const chapterText = loadedCheerio('.readers').html();
 
   const chapter = {
     sourceId,