Fix RainOfSnow

Author: PythonCoderAS

src/RainOfSnow/RainOfSnow.ts

@@ -15,7 +15,7 @@ const BASE = "https://rainofsnow.com"
 
 export const RainOfSnowInfo: SourceInfo = {
     icon: "icon.png",
-    version: "1.2.0",
+    version: "1.3.0",
     name: "RainOfSnow",
     author: "PythonCoderAS",
     authorWebsite: "https://github.com/PythonCoderAS",
@@ -34,30 +34,52 @@ export class RainOfSnow extends Source {
     }
 
     async getHomePageSections(sectionCallback: (section: HomeSection) => void): Promise<void> {
+        const options: Request = createRequestObject({
+            url: `${BASE}`,
+            method: 'GET'
+        });
+        let response = await this.requestManager.schedule(options, 1);
+        let $ = this.cheerio.load(response.data);
+        let tiles: MangaTile[] = this.parser.parseMangaList($, BASE, $($("div.row").toArray()[2]));
         sectionCallback(createHomeSection({
-            id: "1",
-            items: (await this.getWebsiteMangaDirectory(null)).results,
-            title: "All Comics"
+            id: "comics",
+            items: tiles,
+            title: "Popular Comics",
+            view_more: true
         }));
     }
 
-    async doGetWebsiteMangaDirectory(page: number = 1){
+    async getWebsiteMangaDirectory(metadata: any): Promise<PagedResults> {
+        if (typeof metadata !== "object" && metadata !== null){
+            metadata = {page: metadata};
+        } else if (metadata === null){
+            metadata = {};
+        }
+        let page = 1;
+        if (metadata.page){
+            page = metadata.page;
+        }
+        if (page === null){
+            return createPagedResults({results: []});
+        }
         const options: Request = createRequestObject({
-            url: `${BASE}/comics-library/page/${page}`,
+            url: `${BASE}/comics/page/${page}`,
             method: 'GET'
         });
         let response = await this.requestManager.schedule(options, 1);
         let $ = this.cheerio.load(response.data);
         let tiles: MangaTile[] = this.parser.parseMangaList($, BASE);
-        if ($("a.next").length !== 0){
-            tiles = tiles.concat(await this.doGetWebsiteMangaDirectory(page+1))
+        let newPage: number | null = page + 1;
+        if ($("a.next").length === 0){
+            newPage = null;
+        }
+        metadata.page = newPage
+        if (newPage === null){
+            return createPagedResults({results: []});
         }
-        return tiles;
-    }
-
-    async getWebsiteMangaDirectory(metadata: any): Promise<PagedResults> {
         return createPagedResults({
-            results: await this.doGetWebsiteMangaDirectory()
+            results: tiles,
+            metadata: metadata
         });
     }
 
@@ -97,9 +119,9 @@ export class RainOfSnow extends Source {
     }
 
     async searchRequest(query: SearchRequest, metadata: any): Promise<PagedResults> {
-        let url = `${BASE}/?serchfor=comics`
+        let url = `${BASE}/`
         if (query.title){
-            url += `&s=${query.title}`
+            url += `?s=${query.title}`
         }
         const options: Request = createRequestObject({
             url: url,
@@ -108,7 +130,7 @@ export class RainOfSnow extends Source {
         let response = await this.requestManager.schedule(options, 1);
         let $ = this.cheerio.load(response.data);
         return createPagedResults({
-            results: this.parser.parseSearchResult($, BASE)
+            results: this.parser.parseMangaList($, BASE)
         });
     }
 

src/RainOfSnow/RainOfSnowParser.ts

@@ -2,13 +2,16 @@ import {Chapter, LanguageCode, Manga, MangaStatus, MangaTile, Tag} from "paperba
 
 export class RainOfSnowParser {
 
-    parseMangaList($: CheerioStatic, base: string) {
+    parseMangaList($: CheerioStatic, base: string, filterElement: Cheerio | null = null) {
+        if (filterElement === null){
+            filterElement = $.root()
+        }
         const mangaTiles: MangaTile[] = [];
-        $("ul.boxhover1 li").map(((index, element) => {
-            const link = $("h4 a", element).first();
+        $("div.col-xs-6.col-md-3.col-lg-2", filterElement).map(((index, element) => {
+            const link = $("h3 a", element).first();
             const linkId = link.attr("href");
             const imgSrc = $("a img", element).first().attr("src");
-            if (linkId) {
+            if (linkId && linkId.includes("comic")) {
                 mangaTiles.push(createMangaTile({
                     id: linkId.replace(`${base}/comic/`, "").slice(0, -1),
                     image: imgSrc || "",
@@ -33,16 +36,18 @@ export class RainOfSnowParser {
 
     parseChapterList($: CheerioStatic, mangaId: string, base: string) {
         const chapters: Chapter[] = [];
-        $("ul.chapter1 li").map((index, element) => {
+        $("div#chapter li").map((index, element) => {
             const link = $("a", element).first();
             const linkId = link.attr("href");
             if (linkId) {
+                const chapParts = link.text().split(".");
                 chapters.push(createChapter({
-                    chapNum: Number(link.text().split(".")[0]),
+                    chapNum: Number(chapParts[0]),
                     id: linkId.replace(base + "/comic_chapters/", ""),
                     langCode: LanguageCode.ENGLISH,
                     mangaId: mangaId,
                     time: new Date($("small", element).first().text()),
+                    name: chapParts[1] || undefined
                 }))
             }
         })
@@ -56,14 +61,9 @@ export class RainOfSnowParser {
     }
 
     parseManga($: CheerioStatic, mangaId: string, base: string) {
-        const items = $("ul.rat1 li");
         const tagList: Tag[] = [];
-        let summary: string = ""
-        $("div.summery div.text p").map(((index, element) => {
-            summary += $(element).text() + "\n"
-        }))
-        summary = summary.trim();
-        $("a[rel=\"tag\"]", items).map(((index, element) => {
+        const summary: string = $("div#synop").text().replace(/\s{2,}/, "").trim();
+        $("a[rel=\"tag\"]", $("ul.vbtcolor1").first()).map(((index, element) => {
             if ("attribs" in element) {
                 tagList.push(createTag({
                     id: element.attribs["href"].replace(`${base}/tag/`, "").slice(0, -1),
@@ -73,13 +73,13 @@ export class RainOfSnowParser {
         }))
         const chapterList = this.parseChapterList($, mangaId, base)
         const mangaObj: Manga = {
-            author: $(".n2", items.first()).text(),
+            author: $("small", $("ul.vbtcolor1 li").first()).text().trim(),
             desc: summary,
             id: mangaId,
-            image: $("div.imgbox img").first().attr("src") || "",
+            image: $("img", $("div.container div.row").first()).first().attr("src") || "",
             rating: 0,
             status: MangaStatus.ONGOING,
-            titles: [$("div.container h3").first().text()],
+            titles: [$("div.text h2").first().text()],
             tags: [createTagSection({
                 id: "1",
                 label: "1",