(fix src) Novel Updates (#719)

* fixnu filter

* Update plugins/english/novelupdates.ts

Co-authored-by: nyagami <hoangquan05112002@gmail.com>

* Update plugins/english/nobleMTL.ts

Co-authored-by: nyagami <hoangquan05112002@gmail.com>

* better commit

* fix typo

---------

Co-authored-by: nyagami <hoangquan05112002@gmail.com>
This commit is contained in:
K1ngfish3r
2024-01-24 14:53:33 +08:00
committed by GitHub
parent a9cede8d26
commit e46c7d07aa
6 changed files with 1218 additions and 391 deletions
+31 -142
View File
@@ -1,4 +1,4 @@
import { load as parseHTML } from "cheerio";
import { CheerioAPI, load as parseHTML } from "cheerio";
import { fetchApi, fetchFile } from "@libs/fetch";
import { FilterTypes, Filters } from "@libs/filterInputs";
import { Plugin } from "@typings/plugin";
@@ -9,7 +9,29 @@ class NobleMTL implements Plugin.PluginBase {
icon = "src/en/noblemtl/icon.png";
site = "https://noblemtl.com/";
version = "1.0.0";
parseNovels(loadedCheerio: CheerioAPI) {
const novels: Plugin.NovelItem[] = [];
loadedCheerio("article.bs").each(function () {
const novelName = loadedCheerio(this).find(".ntitle").text().trim();
let image = loadedCheerio(this).find("img");
const novelCover = image.attr("data-src") || image.attr("src");
const novelUrl = loadedCheerio(this).find("a").attr("href");
if (!novelUrl) return;
const novel = {
name: novelName,
cover: novelCover,
url: novelUrl,
};
novels.push(novel);
});
return novels;
}
async popularNovels(
pageNo: number,
{ filters }: Plugin.PopularNovelsOptions<typeof this.filters>
@@ -32,28 +54,7 @@ class NobleMTL implements Plugin.PluginBase {
);
const loadedCheerio = parseHTML(body);
const loadedCheerio = parseHTML(body);
const novels: Plugin.NovelItem[] = [];
loadedCheerio("article.bs").each(function () {
const novelName = loadedCheerio(this).find(".ntitle").text().trim();
let image = loadedCheerio(this).find("img");
const novelCover = image.attr("data-src") || image.attr("src");
const novelUrl = loadedCheerio(this).find("a").attr("href");
if (!novelUrl) return;
const novel = {
name: novelName,
cover: novelCover,
url: novelUrl,
};
novels.push(novel);
});
return this.parseNovels(loadedCheerio);
}
async parseNovelAndChapters(novelUrl: string): Promise<Plugin.SourceNovel> {
@@ -150,32 +151,17 @@ class NobleMTL implements Plugin.PluginBase {
async searchNovels(
searchTerm: string,
searchTerm: string,
pageNo: number
): Promise<Plugin.NovelItem[]> {
): Promise<Plugin.NovelItem[]> {
const url = `${this.site}page/${pageNo}/?s=${searchTerm}`;
const headers = new Headers();
const result = await fetchApi(url, { headers });
const body = await result.text();
const loadedCheerio = parseHTML(body);
const loadedCheerio = parseHTML(body);
const novels: Plugin.NovelItem[] = [];
loadedCheerio("article.bs").each(function () {
const novelName = loadedCheerio(this).find(".ntitle").text().trim();
const novelCover = loadedCheerio(this).find("img").attr("src");
const novelUrl = loadedCheerio(this).find("a").attr("href");
if (!novelUrl) return;
novels.push({
name: novelName,
url: novelUrl,
cover: novelCover,
});
});
return this.parseNovels(loadedCheerio);
}
async fetchImage(url: string): Promise<string | undefined> {
return await fetchFile(url);
}
@@ -183,20 +169,15 @@ class NobleMTL implements Plugin.PluginBase {
filters = {
order: {
label: "Sort By",
label: "Sort By",
options: [
{ label: "Default", value: "" },
{ label: "Default", value: "" },
{ label: "A-Z", value: "title" },
{ label: "A-Z", value: "title" },
{ label: "Z-A", value: "titlereverse" },
{ label: "Z-A", value: "titlereverse" },
{ label: "Latest Update", value: "update" },
{ label: "Latest Update", value: "update" },
{ label: "Latest Added", value: "latest" },
{ label: "Latest Added", value: "latest" },
{ label: "Popular", value: "popular" },
],
type: FilterTypes.Picker,
value: "",
},
@@ -204,11 +185,8 @@ class NobleMTL implements Plugin.PluginBase {
label: "Status",
options: [
{ label: "All", value: "" },
{ label: "All", value: "" },
{ label: "Ongoing", value: "ongoing" },
{ label: "Ongoing", value: "ongoing" },
{ label: "Hiatus", value: "hiatus" },
{ label: "Hiatus", value: "hiatus" },
{ label: "Completed", value: "completed" },
],
type: FilterTypes.Picker,
@@ -218,15 +196,10 @@ class NobleMTL implements Plugin.PluginBase {
label: "Type",
options: [
{ label: "Chinese novel", value: "chinese-novel" },
{ label: "Chinese novel", value: "chinese-novel" },
{ label: "habyeol", value: "habyeol" },
{ label: "habyeol", value: "habyeol" },
{ label: "korean novel", value: "korean-novel" },
{ label: "korean novel", value: "korean-novel" },
{ label: "Web Novel", value: "web-novel" },
{ label: "Web Novel", value: "web-novel" },
{ label: "삼심", value: "%ec%82%bc%ec%8b%ac" },
{ label: "삼심", value: "%ec%82%bc%ec%8b%ac" },
{ label: "호곡", value: "%ed%98%b8%ea%b3%a1" },
],
type: FilterTypes.CheckboxGroup,
@@ -234,182 +207,98 @@ class NobleMTL implements Plugin.PluginBase {
},
genres: {
label: "Genres",
label: "Genres",
options: [
{ label: "A.I", value: "a.i" },
{ label: "A.I", value: "a.i" },
{ label: "Academy", value: "academy" },
{ label: "Academy", value: "academy" },
{ label: "Action", value: "action" },
{ label: "Action", value: "action" },
{ label: "Adult", value: "adult" },
{ label: "Adult", value: "adult" },
{ label: "Adventure", value: "adventure" },
{ label: "Adventure", value: "adventure" },
{ label: "Alternative History", value: "alternative-history" },
{ label: "Alternative History", value: "alternative-history" },
{ label: "Another World", value: "another-world" },
{ label: "Another World", value: "another-world" },
{ label: "Apocalypse", value: "apocalypse" },
{ label: "Apocalypse", value: "apocalypse" },
{ label: "Bromance", value: "bromance" },
{ label: "Bromance", value: "bromance" },
{ label: "Comedy", value: "comedy" },
{ label: "Comedy", value: "comedy" },
{ label: "Dark fantasy", value: "dark-fantasy" },
{ label: "Dark fantasy", value: "dark-fantasy" },
{ label: "Demons", value: "demons" },
{ label: "Demons", value: "demons" },
{ label: "Drama", value: "drama" },
{ label: "Drama", value: "drama" },
{ label: "Dystopia", value: "dystopia" },
{ label: "Dystopia", value: "dystopia" },
{ label: "Ecchi", value: "ecchi" },
{ label: "Ecchi", value: "ecchi" },
{ label: "Entertainment", value: "entertainment" },
{ label: "Entertainment", value: "entertainment" },
{ label: "Exhaustion", value: "exhaustion" },
{ label: "Exhaustion", value: "exhaustion" },
{ label: "Fanfiction", value: "fanfiction" },
{ label: "Fanfiction", value: "fanfiction" },
{ label: "fantasy", value: "fantasy" },
{ label: "fantasy", value: "fantasy" },
{ label: "finance", value: "finance" },
{ label: "finance", value: "finance" },
{ label: "Full color", value: "full-color" },
{ label: "Full color", value: "full-color" },
{ label: "Game", value: "game" },
{ label: "Game", value: "game" },
{ label: "Gender Bender", value: "gender-bender" },
{ label: "Gender Bender", value: "gender-bender" },
{ label: "Genius", value: "genius" },
{ label: "Genius", value: "genius" },
{ label: "Harem", value: "harem" },
{ label: "Harem", value: "harem" },
{ label: "Hero", value: "hero" },
{ label: "Hero", value: "hero" },
{ label: "Historical", value: "historical" },
{ label: "Historical", value: "historical" },
{ label: "Hunter", value: "hunter" },
{ label: "Hunter", value: "hunter" },
{ label: "korean novel", value: "korean-novel" },
{ label: "korean novel", value: "korean-novel" },
{ label: "Light Novel", value: "light-novel" },
{ label: "Light Novel", value: "light-novel" },
{
label: "List Adventure Manga Genres",
value: "list-adventure-manga-genres",
},
},
{ label: "Long Strip", value: "long-strip" },
{ label: "Long Strip", value: "long-strip" },
{ label: "Love comedy", value: "love-comedy" },
{ label: "Love comedy", value: "love-comedy" },
{ label: "magic", value: "magic" },
{ label: "magic", value: "magic" },
{ label: "Manhua", value: "manhua" },
{ label: "Manhua", value: "manhua" },
{ label: "Martial Arts", value: "martial-arts" },
{ label: "Martial Arts", value: "martial-arts" },
{ label: "Mature", value: "mature" },
{ label: "Mature", value: "mature" },
{ label: "Medieval", value: "medieval" },
{ label: "Medieval", value: "medieval" },
{ label: "Misunderstanding", value: "misunderstanding" },
{ label: "Misunderstanding", value: "misunderstanding" },
{ label: "Modern", value: "modern" },
{ label: "Modern", value: "modern" },
{ label: "modern fantasy", value: "modern-fantasy" },
{ label: "modern fantasy", value: "modern-fantasy" },
{ label: "music", value: "music" },
{ label: "music", value: "music" },
{ label: "Mystery", value: "mystery" },
{ label: "Mystery", value: "mystery" },
{ label: "Necromancy", value: "necromancy" },
{ label: "Necromancy", value: "necromancy" },
{ label: "No Romance", value: "no-romance" },
{ label: "No Romance", value: "no-romance" },
{ label: "NTL", value: "ntl" },
{ label: "NTL", value: "ntl" },
{ label: "o", value: "o" },
{ label: "o", value: "o" },
{ label: "Obsession", value: "obsession" },
{ label: "Obsession", value: "obsession" },
{ label: "Politics", value: "politics" },
{ label: "Politics", value: "politics" },
{ label: "Possession", value: "possession" },
{ label: "Possession", value: "possession" },
{ label: "Programming", value: "programming" },
{ label: "Programming", value: "programming" },
{ label: "Psychological", value: "psychological" },
{ label: "Psychological", value: "psychological" },
{ label: "Pure Love", value: "pure-love" },
{ label: "Pure Love", value: "pure-love" },
{ label: "Redemption", value: "redemption" },
{ label: "Redemption", value: "redemption" },
{ label: "Regression", value: "regression" },
{ label: "Regression", value: "regression" },
{ label: "Regret", value: "regret" },
{ label: "Regret", value: "regret" },
{ label: "Reincarnation", value: "reincarnation" },
{ label: "Reincarnation", value: "reincarnation" },
{ label: "Revenge", value: "revenge" },
{ label: "Revenge", value: "revenge" },
{ label: "Romance", value: "romance" },
{ label: "Romance", value: "romance" },
{ label: "Romance Fanrasy", value: "romance-fanrasy" },
{ label: "Romance Fanrasy", value: "romance-fanrasy" },
{ label: "Salvation", value: "salvation" },
{ label: "Salvation", value: "salvation" },
{ label: "School Life", value: "school-life" },
{ label: "School Life", value: "school-life" },
{ label: "Sci-fi", value: "sci-fi" },
{ label: "Sci-fi", value: "sci-fi" },
{ label: "Science fiction", value: "science-fiction" },
{ label: "Science fiction", value: "science-fiction" },
{ label: "Seinen", value: "seinen" },
{ label: "Seinen", value: "seinen" },
{ label: "Shounen", value: "shounen" },
{ label: "Shounen", value: "shounen" },
{ label: "Slice of Life", value: "slice-of-life" },
{ label: "Slice of Life", value: "slice-of-life" },
{ label: "Soft yandere", value: "soft-yandere" },
{ label: "Soft yandere", value: "soft-yandere" },
{ label: "Sports", value: "sports" },
{ label: "Sports", value: "sports" },
{ label: "Supernatural", value: "supernatural" },
{ label: "Supernatural", value: "supernatural" },
{ label: "Survival", value: "survival" },
{ label: "Survival", value: "survival" },
{ label: "system", value: "system" },
{ label: "system", value: "system" },
{ label: "Time limit", value: "time-limit" },
{ label: "Time limit", value: "time-limit" },
{ label: "Tragedy", value: "tragedy" },
{ label: "Tragedy", value: "tragedy" },
{ label: "Transmigration", value: "transmigration" },
{ label: "Transmigration", value: "transmigration" },
{ label: "TS", value: "ts" },
{ label: "TS", value: "ts" },
{ label: "Tsundere", value: "tsundere" },
{ label: "Tsundere", value: "tsundere" },
{ label: "Unique", value: "unique" },
{ label: "Unique", value: "unique" },
{ label: "Wholesome", value: "wholesome" },
{ label: "Wholesome", value: "wholesome" },
{ label: "Wuxia", value: "wuxia" },
{ label: "Wuxia", value: "wuxia" },
{ label: "Xuanhuan", value: "xuanhuan" },
{ label: "Xuanhuan", value: "xuanhuan" },
{ label: "Yandere", value: "yandere" },
{ label: "Yandere", value: "yandere" },
{ label: "Yuri", value: "yuri" },
],
type: FilterTypes.CheckboxGroup,
value: [],
},
} satisfies Filters;
}
const Noble = new NobleMTL();
export default new NobleMTL();
+86 -106
View File
@@ -1,4 +1,4 @@
import { load as parseHTML } from "cheerio";
import { CheerioAPI, load as parseHTML } from "cheerio";
import { fetchApi, fetchFile } from "@libs/fetch";
import { Filters, FilterTypes } from "@libs/filterInputs";
import { Plugin } from "@typings/plugin";
@@ -9,66 +9,8 @@ class NovelUpdates implements Plugin.PluginBase {
version = "0.5.0";
icon = "src/en/novelupdates/icon.png";
site = "https://www.novelupdates.com/";
baseUrl = this.site;
getPopularNovelsUrl(
page: number,
{ showLatestNovels, filters }: Plugin.PopularNovelsOptions<Filters>
) {
let url = `${this.baseUrl}${filters
? "series-finder"
: showLatestNovels
? "latest-series"
: "series-ranking"
}/`;
if (!filters) {
url += "?rank=week";
} else {
url += "?sf=1";
}
if (filters) {
if (Array.isArray(filters.novelType) && filters.novelType?.length) {
url += "&nt=" + filters?.novelType.join(",");
}
if (Array.isArray(filters.genres) && filters.genres?.length) {
url += "&gi=" + filters?.genres.join(",") + "&mgi=and";
}
if (Array.isArray(filters.language) && filters.language?.length) {
url += "&org=" + filters?.language.join(",");
}
if (filters.storyStatus) {
url += "&ss=" + filters?.storyStatus;
}
}
if (!filters?.sort) {
url += "&sort=" + "sdate";
} else {
url += "&sort=" + filters?.sort;
}
if (!filters?.order) {
url += "&order=" + "desc";
} else {
url += "&order=" + filters?.order;
}
return url;
}
async popularNovels(pageNo: number, { showLatestNovels, filters }: Plugin.PopularNovelsOptions<Filters>): Promise<Plugin.NovelItem[]> {
const url = this.getPopularNovelsUrl(pageNo, { showLatestNovels, filters });
const result = await fetchApi(url);
const body = await result.text();
const loadedCheerio = parseHTML(body);
parseNovels(loadedCheerio: CheerioAPI){
const novels: Plugin.NovelItem[] = [];
loadedCheerio("div.search_main_box_nu").each((idx, ele) => {
@@ -91,9 +33,56 @@ class NovelUpdates implements Plugin.PluginBase {
return novels;
}
async popularNovels(page: number, { showLatestNovels, filters }: Plugin.PopularNovelsOptions<typeof this.filters>): Promise<Plugin.NovelItem[]> {
let link = `${this.site}`;
if (filters.language.value.length ||
filters.novelType.value.length ||
filters.genres.value.include?.length ||
filters.genres.value.exclude?.length ||
filters.storyStatus.value.length ){
link += "series-finder/?sf=1"
} else if (showLatestNovels){
link += "latest-series/?st=1"
} else {
link += "series-ranking/?rank=week"
};
if (filters.language.value.length)
link += '&org=' + filters.language.value.join(',');
if (filters.novelType.value.length)
link += '&nt=' + filters.novelType.value.join(',');
if (filters.genres.value.include?.length)
link += '&gi=' + filters.genres.value.include.join(',');
if (filters.genres.value.exclude?.length)
link += '&ge=' + filters.genres.value.exclude.join(',');
if (filters.genres.value.include?.length || filters.genres.value.exclude?.length)
link += '&mgi=' + filters.genre_operator.value;
if (filters.storyStatus.value.length)
link += '&ss=' + filters.storyStatus.value;
link += '&sort=' + filters.sort.value;
link += '&order=' + filters.order.value;
link += '&pg=' + page;
const headers = new Headers();
const body = await fetchApi(link, { headers }).then((result) =>
result.text()
);
const loadedCheerio = parseHTML(body);
return this.parseNovels(loadedCheerio);
}
async parseNovelAndChapters(novelUrl: string): Promise<Plugin.SourceNovel> {
const url = novelUrl;
const result = await fetchApi(url);
const body = await result.text();
@@ -134,7 +123,7 @@ class NovelUpdates implements Plugin.PluginBase {
formData.append("mygrr", "0");
formData.append("mypostid", novelId);
let link = "https://www.novelupdates.com/wp-admin/admin-ajax.php";
let link = `${this.site}wp-admin/admin-ajax.php`;
const text = await fetchApi(
link,
@@ -317,45 +306,24 @@ class NovelUpdates implements Plugin.PluginBase {
return chapterText;
}
async searchNovels(searchTerm: string, pageNo: number): Promise<Plugin.NovelItem[]> {
const url =
"https://www.novelupdates.com/?s=" +
searchTerm +
"&post_type=seriesplans";
const result = await fetchApi(url);
async searchNovels(searchTerm: string, page: number): Promise<Plugin.NovelItem[]> {
const url =`${this.site}page/${page}/?s=${searchTerm}&post_type=seriesplans`;
const headers = new Headers();
const result = await fetchApi(url, { headers });
const body = await result.text();
const loadedCheerio = parseHTML(body);
let novels: Plugin.NovelItem[] = [];
loadedCheerio("div.search_main_box_nu").each(function () {
const novelCover = loadedCheerio(this).find("img").attr("src");
const novelName = loadedCheerio(this).find(".search_title > a").text();
const novelUrl = loadedCheerio(this)
.find(".search_title > a")
.attr("href")
?.split("/")[4];
if (!novelUrl) return;
novels.push({
name: novelName,
url: novelUrl,
cover: novelCover,
});
});
return novels;
return this.parseNovels(loadedCheerio);
}
fetchImage(url: string): Promise<string | undefined> {
return fetchFile(url);
}
filters: Filters = {
filters = {
sort: {
label: "Sort Results By",
type: FilterTypes.Picker,
value: "sdate",
options: [
{ label: "Last Updated", value: "sdate" },
{ label: "Rating", value: "srate" },
@@ -366,31 +334,33 @@ class NovelUpdates implements Plugin.PluginBase {
{ label: "Readers", value: "sread" },
{ label: "Frequency", value: "sfrel" },
],
value: "sdate",
type: FilterTypes.Picker,
},
order: {
label: "Order",
type: FilterTypes.Picker,
value: "desc",
options: [
{ label: "Descending", value: "desc" },
{ label: "Ascending", value: "asc" },
],
value: "asc"
type: FilterTypes.Picker,
},
storyStatus: {
label: "Story Status (Translation)",
type: FilterTypes.Picker,
value: "",
options: [
{ label: "All", value: "" },
{ label: "Completed", value: "2" },
{ label: "Ongoing", value: "3" },
{ label: "Hiatus", value: "4" },
],
value: ""
type: FilterTypes.Picker,
},
language: {
label: "Language",
value: [],
options: [
{ label: "None", value: "" },
{ label: "Chinese", value: "495" },
{ label: "Filipino", value: "9181" },
{ label: "Indonesian", value: "9179" },
@@ -401,23 +371,25 @@ class NovelUpdates implements Plugin.PluginBase {
{ label: "Thai", value: "9954" },
{ label: "Vietnamese", value: "9177" },
],
type: FilterTypes.Picker,
value: ""
type: FilterTypes.CheckboxGroup,
},
novelType: {
label: "Novel Type",
type: FilterTypes.CheckboxGroup,
value: [],
options: [
{ label: "Light Novel", value: "2443" },
{ label: "Published Novel", value: "26874" },
{ label: "Web Novel", value: "2444" },
]
],
type: FilterTypes.CheckboxGroup,
},
genres: {
label: "Genres",
type: FilterTypes.CheckboxGroup,
value: [],
type: FilterTypes.ExcludableCheckboxGroup,
value: {
include: [],
exclude: [],
},
options: [
{ label: "Action", value: "8" },
{ label: "Adult", value: "280" },
@@ -454,10 +426,18 @@ class NovelUpdates implements Plugin.PluginBase {
{ label: "Xuanhuan", value: "3954" },
{ label: "Yaoi", value: "560" },
{ label: "Yuri", value: "922" },
]
}
}
],
},
genre_operator: {
label: "Genre (AND/OR)",
value: "and",
options: [
{ label: "AND", value: "and" },
{ label: "OR", value: "or" },
],
type: FilterTypes.Picker,
},
} satisfies Filters;
}
export default new NovelUpdates();