Filters Redesign (#658)

* Add XCheckboxFilter

* Fix madara typo

* Change the branch name in config

* Add typing for madara popoularnovels filters

* Add preview and refactor PluginWrapper

* Add preview HTML sanitize and other improv.

* Web improvements + sanitizeHTML

* Add dark mode

* Add git run less to compile less

* Add less.js to remove the need for compiling less
This commit is contained in:
Marcin Majewski
2023-12-27 15:49:46 +01:00
committed by GitHub
parent 9cdace3460
commit d7a76063bf
170 changed files with 94169 additions and 80752 deletions
+30 -19
View File
@@ -7,32 +7,43 @@ type GeneratedScript = {
pluginScript: string;
};
export type ScrpitGeneratorFunction = () => GeneratedScript[];
export type ScrpitGeneratorFunction = (name: string) => GeneratedScript[];
const isScriptGenerator = (s: unknown): s is ScrpitGeneratorFunction => {
return !!s && typeof s === "function";
};
const generate = async (name: string): Promise<boolean> => {
const generateAll: ScrpitGeneratorFunction | unknown =
require(`./${name}/generator`).generateAll;
if (!isScriptGenerator(generateAll)) return false;
const sources = generateAll();
for (let source of sources) {
const { lang, filename, pluginScript } = source;
if(!lang || !filename || !pluginScript){
console.warn(name, ": lang, filename, pluginScript are required!");
continue;
try {
const generateAll: ScrpitGeneratorFunction | unknown =
require(`./${name}/generator`).generateAll;
if (!isScriptGenerator(generateAll)) return false;
const sources = generateAll(name);
for (let source of sources) {
const { lang, filename, pluginScript } = source;
if (!lang || !filename || !pluginScript) {
console.warn(
name,
": lang, filename, pluginScript are required!"
);
continue;
}
const pluginsDir = path.join(
path.dirname(path.dirname(__dirname)),
"plugins"
);
const filePath = path.join(
pluginsDir,
lang.toLowerCase(),
filename.replace(/[\s-\.]+/g, "") + `[${name}].ts`
);
fs.writeFileSync(filePath, pluginScript, { encoding: "utf-8" });
}
const pluginsDir = path.join(
path.dirname(path.dirname(__dirname)),
"plugins"
);
const filePath = path.join(pluginsDir, lang.toLowerCase(), filename.replace(/[\s-\.]+/g, "") + `[${name}].ts`);
fs.writeFileSync(filePath, pluginScript, { encoding: "utf-8" });
return true;
} catch (e) {
console.log(`${name} is broken! ${e}`);
return false;
}
return true;
};
const run = async () => {
@@ -44,7 +55,7 @@ const run = async () => {
for (let name of sources) {
const success = await generate(name);
if (success) console.log(name + " OK");
if (success) console.log(`[${name}] OK`);
}
};
+32 -13
View File
@@ -1,31 +1,50 @@
import { FilterInputs } from "../../../libs/filterInputs";
import { FilterTypes, Filters } from "../../../libs/filterInputs";
import { ScrpitGeneratorFunction } from "../generate";
import list from "./sources.json";
import { MadaraMetadata } from "./template";
import { readFileSync } from "fs";
import path from "path";
export const generateAll: ScrpitGeneratorFunction = function () {
return list.map((metadata: MadaraMetadata) => {
return generator(metadata);
});
export const generateAll: ScrpitGeneratorFunction = function (name) {
return (
list
/* This map is changing `type` from string to FilterTypes */
.map<MadaraMetadata>((p) => {
let d = false;
const filters: Filters = {};
for (const k in p.filters) {
const f = p.filters[k as "sort" | "genres"];
if (f) {
filters[k] = {
...f,
type: FilterTypes.Picker,
};
}
}
return { ...p, filters: d ? undefined : filters };
})
.map((metadata: MadaraMetadata) => {
console.log(`[${name}]: Generating`, metadata.id);
return generator(metadata);
})
);
};
const generator = function generator(metadata: MadaraMetadata) {
const lang = metadata.options?.lang || "English";
const madaraTemplate = readFileSync(path.join(__dirname, "template.ts"), {encoding: "utf-8"});
metadata.filters = metadata.filters?.map((filter: any) => ({
...filter,
inputType: FilterInputs[filter.inputType]
}));
const madaraTemplate = readFileSync(path.join(__dirname, "template.ts"), {
encoding: "utf-8",
});
const pluginScript = `
${madaraTemplate}
const plugin = new MadaraPlugin(${JSON.stringify(metadata)});
const plugin = new MadaraPlugin(${JSON.stringify(metadata).replace(
/"type":"Picker"/g,
`"type":FilterTypes.Picker`
)});
export default plugin;
`
`;
return {
lang,
filename: metadata.sourceName,
File diff suppressed because it is too large Load Diff
+172 -139
View File
@@ -1,38 +1,38 @@
import { fetchApi, fetchFile } from "@libs/fetch";
import { Filter } from "@libs/filterInputs";
import { Plugin } from '@typings/plugin'
import { Filters, FilterTypes } from "@libs/filterInputs";
import { Plugin } from "@typings/plugin";
import { load as parseHTML } from "cheerio";
import { defaultCover } from "@libs/defaultCover";
import { NovelStatus } from "@libs/novelStatus";
import { parseMadaraDate } from "@libs/parseMadaraDate";
import dayjs from "dayjs";
interface MadaraOptionPath{
genres?: string,
novels?: string,
novel?: string,
chapter?: string,
interface MadaraOptionPath {
genres?: string;
novels?: string;
novel?: string;
chapter?: string;
}
const MadaraDefaultPath: MadaraOptionPath = {
novels: 'novel',
novel: 'novel',
chapter: 'novel'
}
novels: "novel",
novel: "novel",
chapter: "novel",
};
interface MadaraOptions {
useNewChapterEndpoint?: boolean,
path?: MadaraOptionPath,
lang?: string,
orderBy?: string
useNewChapterEndpoint?: boolean;
path?: MadaraOptionPath;
lang?: string;
orderBy?: string;
}
export interface MadaraMetadata {
id: string,
sourceSite: string,
sourceName: string,
options?: MadaraOptions,
filters?: Filter[],
id: string;
sourceSite: string;
sourceName: string;
options?: MadaraOptions;
filters?: Filters;
}
class MadaraPlugin implements Plugin.PluginBase {
id: string;
@@ -43,12 +43,14 @@ class MadaraPlugin implements Plugin.PluginBase {
userAgent: string;
cookieString: string;
options?: MadaraOptions;
filters?: Filter[] | undefined;
constructor(metadata: MadaraMetadata){
filters?: Filters | undefined;
constructor(metadata: MadaraMetadata) {
this.id = metadata.id;
this.name = metadata.sourceName + "[madara]";
const iconFileName = metadata.sourceName.replace(/\s+/g, "").toLowerCase();
const iconFileName = metadata.sourceName
.replace(/\s+/g, "")
.toLowerCase();
this.icon = `multisrc/madara/icons/${iconFileName}.png`;
this.site = metadata.sourceSite;
this.version = "1.0.0";
@@ -57,192 +59,223 @@ class MadaraPlugin implements Plugin.PluginBase {
this.options = metadata.options;
this.filters = metadata.filters;
}
async popularNovels(pageNo: number, {filters, showLatestNovels}: Plugin.PopularNovelsOptions): Promise<Plugin.NovelItem[]> {
async popularNovels(
pageNo: number,
{
filters,
showLatestNovels,
}: Plugin.PopularNovelsOptions<typeof this.filters>
): Promise<Plugin.NovelItem[]> {
const novels: Plugin.NovelItem[] = [];
let url = this.site;
if (filters?.genres && this.options?.path?.genres) {
if (filters?.genres && this.options?.path?.genres) {
url += this.options?.path?.genres + filters.genres;
} else {
url += this.options?.path?.novels ? this.options.path.novels : MadaraDefaultPath.novels;
url += this.options?.path?.novels
? this.options.path.novels
: MadaraDefaultPath.novels;
}
url += '/page/' + pageNo + '/' +
'?m_orderby=' + (showLatestNovels ? 'latest' : (filters?.sort || 'rating'));
const body = await fetchApi(url).then(res => res.text());
url +=
"/page/" +
pageNo +
"/" +
"?m_orderby=" +
(showLatestNovels ? "latest" : filters?.sort || "rating");
const body = await fetchApi(url).then((res) => res.text());
const loadedCheerio = parseHTML(body);
loadedCheerio('.manga-title-badges').remove();
loadedCheerio('.page-item-detail').each(function () {
const novelName = loadedCheerio(this).find('.post-title').text().trim();
let image = loadedCheerio(this).find('img');
const novelCover = image.attr('data-src') || image.attr('src');
let novelUrl = loadedCheerio(this).find('.post-title')
.find('a')
.attr('href') || '';
loadedCheerio(".manga-title-badges").remove();
loadedCheerio(".page-item-detail").each(function () {
const novelName = loadedCheerio(this)
.find(".post-title")
.text()
.trim();
let image = loadedCheerio(this).find("img");
const novelCover = image.attr("data-src") || image.attr("src");
let novelUrl =
loadedCheerio(this)
.find(".post-title")
.find("a")
.attr("href") || "";
const novel: Plugin.NovelItem = {
name: novelName,
cover: novelCover,
url: novelUrl,
};
novels.push(novel);
});
return novels;
}
async parseNovelAndChapters(novelUrl: string): Promise<Plugin.SourceNovel> {
const novel: Plugin.SourceNovel = {
url: novelUrl,
};
const body = await fetchApi(novelUrl).then(res => res.text());
const body = await fetchApi(novelUrl).then((res) => res.text());
let loadedCheerio = parseHTML(body);
loadedCheerio('.manga-title-badges, #manga-title span').remove();
novel.name =
loadedCheerio('.post-title h1').text().trim() ||
loadedCheerio('#manga-title h1').text();
loadedCheerio(".manga-title-badges, #manga-title span").remove();
novel.name =
loadedCheerio(".post-title h1").text().trim() ||
loadedCheerio("#manga-title h1").text();
novel.cover =
loadedCheerio('.summary_image > a > img').attr('data-lazy-src') ||
loadedCheerio('.summary_image > a > img').attr('data-src') ||
loadedCheerio('.summary_image > a > img').attr('src') ||
loadedCheerio(".summary_image > a > img").attr("data-lazy-src") ||
loadedCheerio(".summary_image > a > img").attr("data-src") ||
loadedCheerio(".summary_image > a > img").attr("src") ||
defaultCover;
loadedCheerio('.post-content_item, .post-content').each(function () {
const detailName = loadedCheerio(this).find('h5').text().trim();
const detail = loadedCheerio(this).find('.summary-content').text().trim();
loadedCheerio(".post-content_item, .post-content").each(function () {
const detailName = loadedCheerio(this).find("h5").text().trim();
const detail = loadedCheerio(this)
.find(".summary-content")
.text()
.trim();
switch (detailName) {
case 'Genre(s)':
case 'التصنيفات':
novel.genres = detail.replace(/[\\t\\n]/g, ',');
case "Genre(s)":
case "التصنيفات":
novel.genres = detail.replace(/[\\t\\n]/g, ",");
break;
case 'Author(s)':
case 'المؤلف':
case 'المؤلف (ين)':
case "Author(s)":
case "المؤلف":
case "المؤلف (ين)":
novel.author = detail;
break;
case 'Status':
case 'الحالة':
case "Status":
case "الحالة":
novel.status =
detail.includes('OnGoing') || detail.includes('مستمرة')
? NovelStatus.Ongoing
: NovelStatus.Completed;
detail.includes("OnGoing") || detail.includes("مستمرة")
? NovelStatus.Ongoing
: NovelStatus.Completed;
break;
}
});
loadedCheerio('div.summary__content .code-block,script').remove();
novel.summary =
loadedCheerio('div.summary__content').text().trim() ||
loadedCheerio('#tab-manga-about').text().trim() ||
loadedCheerio('.post-content_item h5:contains("Summary")').next().text().trim();
loadedCheerio("div.summary__content .code-block,script").remove();
novel.summary =
loadedCheerio("div.summary__content").text().trim() ||
loadedCheerio("#tab-manga-about").text().trim() ||
loadedCheerio('.post-content_item h5:contains("Summary")')
.next()
.text()
.trim();
let html;
if (this.options?.useNewChapterEndpoint !== true) {
const novelId =
loadedCheerio('.rating-post-id').attr('value') ||
loadedCheerio('#manga-chapters-holder').attr('data-id') || '';
const formData = new FormData()
loadedCheerio(".rating-post-id").attr("value") ||
loadedCheerio("#manga-chapters-holder").attr("data-id") ||
"";
const formData = new FormData();
formData.append("action", "manga_get_chapters");
formData.append("manga", novelId);
html = await fetchApi(
this.site + 'wp-admin/admin-ajax.php',
{
method: 'POST',
html = await fetchApi(this.site + "wp-admin/admin-ajax.php", {
method: "POST",
body: formData,
})
.then(res => res.text());
}).then((res) => res.text());
} else {
html = await fetchApi(
novelUrl + 'ajax/chapters/',
{ method: 'POST' })
.then(res => res.text());
html = await fetchApi(novelUrl + "ajax/chapters/", {
method: "POST",
}).then((res) => res.text());
}
if (html !== '0') {
if (html !== "0") {
loadedCheerio = parseHTML(html);
}
const chapters: Plugin.ChapterItem[] = [];
loadedCheerio('.wp-manga-chapter').each(function () {
const chapterName = loadedCheerio(this).find('a').text().trim();
loadedCheerio(".wp-manga-chapter").each(function () {
const chapterName = loadedCheerio(this).find("a").text().trim();
let releaseDate = null;
releaseDate = loadedCheerio(this)
.find('span.chapter-release-date')
.find("span.chapter-release-date")
.text()
.trim();
if (releaseDate) {
releaseDate = parseMadaraDate(releaseDate);
} else {
/**
* Insert current date
*/
releaseDate = dayjs().format('LL');
releaseDate = dayjs().format("LL");
}
let chapterUrl = loadedCheerio(this).find('a').attr('href') || '';
chapters.push({ name: chapterName, releaseTime: releaseDate, url: chapterUrl });
let chapterUrl = loadedCheerio(this).find("a").attr("href") || "";
chapters.push({
name: chapterName,
releaseTime: releaseDate,
url: chapterUrl,
});
});
novel.chapters = chapters.reverse();
return novel;
}
async parseChapter(chapterUrl: string): Promise<string> {
const body = await fetchApi(chapterUrl).then(res => res.text());
const body = await fetchApi(chapterUrl).then((res) => res.text());
const loadedCheerio = parseHTML(body);
const chapterText =
loadedCheerio('.text-left').html() ||
loadedCheerio('.text-right').html() ||
loadedCheerio('.entry-content').html() || "";
loadedCheerio(".text-left").html() ||
loadedCheerio(".text-right").html() ||
loadedCheerio(".entry-content").html() ||
"";
return chapterText;
}
async searchNovels(searchTerm: string, pageNo?: number | undefined): Promise<Plugin.NovelItem[]> {
async searchNovels(
searchTerm: string,
pageNo?: number | undefined
): Promise<Plugin.NovelItem[]> {
const novels: Plugin.NovelItem[] = [];
const url = this.site + "?s=" + searchTerm + "&post_type=wp-manga";
const body = await fetchApi(url).then(res => res.text());
const body = await fetchApi(url).then((res) => res.text());
const loadedCheerio = parseHTML(body);
loadedCheerio('.c-tabs-item__content').each(function () {
const novelName = loadedCheerio(this).find('.post-title').text().trim();
let image = loadedCheerio(this).find('img');
const novelCover = image.attr('data-src') || image.attr('src');
let novelUrl = loadedCheerio(this)
.find('.post-title')
.find('a')
.attr('href') || '';
const novel = {
name: novelName,
cover: novelCover,
url: novelUrl,
};
novels.push(novel);
loadedCheerio(".c-tabs-item__content").each(function () {
const novelName = loadedCheerio(this)
.find(".post-title")
.text()
.trim();
let image = loadedCheerio(this).find("img");
const novelCover = image.attr("data-src") || image.attr("src");
let novelUrl =
loadedCheerio(this)
.find(".post-title")
.find("a")
.attr("href") || "";
const novel = {
name: novelName,
cover: novelCover,
url: novelUrl,
};
novels.push(novel);
});
return novels;
}
async fetchImage(url: string): Promise<string | undefined> {
return await fetchFile(url, {});
}
}
}
View File
+28 -17
View File
@@ -1,4 +1,4 @@
import { FilterInputs } from "../../../libs/filterInputs";
import { FilterTypes, Filters } from "../../../libs/filterInputs";
import { ScrpitGeneratorFunction } from "../generate";
import list from "./sources.json";
import { ReadwnMetadata } from "./template";
@@ -6,29 +6,40 @@ import { readFileSync } from "fs";
import path from "path";
export const generateAll: ScrpitGeneratorFunction = function () {
return list.map((metadata: ReadwnMetadata) => {
return generator(metadata);
});
return list
.map((p) => {
let d = false;
const filters: Filters = {};
for (const k in p.filters) {
const f = p.filters[k as keyof typeof p.filters];
if (f) {
filters[k] = {
...f,
type: FilterTypes.Picker,
};
}
}
return { ...p, filters: d ? undefined : filters };
})
.map((metadata: ReadwnMetadata) => {
return generator(metadata);
});
};
const generator = function generator(metadata: ReadwnMetadata) {
const rulateTemplate = readFileSync(path.join(__dirname, "template.ts"), {
encoding: "utf-8",
});
metadata.filters = metadata.filters?.map((filter: any) => ({
...filter,
inputType: FilterInputs[filter.inputType],
}));
const rulateTemplate = readFileSync(path.join(__dirname, "template.ts"), {
encoding: "utf-8",
});
const pluginScript = `
const pluginScript = `
${rulateTemplate}
const plugin = new ReadwnPlugin(${JSON.stringify(metadata)});
export default plugin;
`.trim();
return {
lang: "english",
filename: metadata.sourceName,
pluginScript,
};
return {
lang: "english",
filename: metadata.sourceName,
pluginScript,
};
};
File diff suppressed because it is too large Load Diff
+179 -167
View File
@@ -1,5 +1,5 @@
import { fetchFile, fetchApi } from "@libs/fetch";
import { Filter } from "@libs/filterInputs";
import { Filters } from "@libs/filterInputs";
import { Plugin } from "@typings/plugin";
import { NovelStatus } from "@libs/novelStatus";
import { load as parseHTML } from "cheerio";
@@ -7,193 +7,205 @@ import { parseMadaraDate } from "@libs/parseMadaraDate";
// import { defaultCover } from "@libs/defaultCover";
export interface ReadwnMetadata {
id: string;
sourceSite: string;
sourceName: string;
filters?: Filter[];
id: string;
sourceSite: string;
sourceName: string;
filters?: Filters;
}
class ReadwnPlugin implements Plugin.PluginBase {
id: string;
name: string;
icon: string;
site: string;
version: string;
userAgent: string;
cookieString: string;
filters?: Filter[] | undefined;
id: string;
name: string;
icon: string;
site: string;
version: string;
userAgent: string;
cookieString: string;
filters?: Filters | undefined;
constructor(metadata: ReadwnMetadata) {
this.id = metadata.id;
this.name = metadata.sourceName + "[readwn]";
const iconFileName = metadata.sourceName.replace(/\s+/g, "").toLowerCase();
this.icon = `multisrc/readwn/icons/${iconFileName}.png`;
this.site = metadata.sourceSite;
this.version = "1.0.0";
this.userAgent = "";
this.cookieString = "";
this.filters = metadata.filters;
}
async popularNovels(
pageNo: number,
{ filters, showLatestNovels }: Plugin.PopularNovelsOptions,
): Promise<Plugin.NovelItem[]> {
const novels: Plugin.NovelItem[] = [];
const baseUrl = this.site;
let url = baseUrl + "/list/";
url += (filters?.genres || "all") + "/";
url += (filters?.status || "all") + "-";
url +=
(showLatestNovels ? "lastdotime" : filters?.sort || "newstime") + "-";
url += pageNo - 1 + ".html";
if (filters?.tags) {
url = baseUrl + "/tags/" + filters.tags + "-0.html";
constructor(metadata: ReadwnMetadata) {
this.id = metadata.id;
this.name = metadata.sourceName + "[readwn]";
const iconFileName = metadata.sourceName
.replace(/\s+/g, "")
.toLowerCase();
this.icon = `multisrc/readwn/icons/${iconFileName}.png`;
this.site = metadata.sourceSite;
this.version = "1.0.0";
this.userAgent = "";
this.cookieString = "";
this.filters = metadata.filters;
}
const result = await fetchApi(url);
const body = await result.text();
async popularNovels(
pageNo: number,
{ filters, showLatestNovels }: Plugin.PopularNovelsOptions
): Promise<Plugin.NovelItem[]> {
const novels: Plugin.NovelItem[] = [];
const baseUrl = this.site;
const loadedCheerio = parseHTML(body);
loadedCheerio("li.novel-item").each(function () {
const name = loadedCheerio(this).find("h4").text();
const url = loadedCheerio(this).find("a").attr("href");
const cover = loadedCheerio(this).find(".novel-cover > img").attr("data-src");
if (!name || !url) return;
let url = baseUrl + "/list/";
url += (filters?.genres || "all") + "/";
url += (filters?.status || "all") + "-";
url +=
(showLatestNovels ? "lastdotime" : filters?.sort || "newstime") +
"-";
url += pageNo - 1 + ".html";
novels.push({ name: name, cover: baseUrl + cover, url: baseUrl + url });
});
if (filters?.tags) {
url = baseUrl + "/tags/" + filters.tags + "-0.html";
}
return novels;
}
const result = await fetchApi(url);
const body = await result.text();
async parseNovelAndChapters(novelUrl: string): Promise<Plugin.SourceNovel> {
const baseUrl = this.site;
const result = await fetchApi(novelUrl);
const body = await result.text();
const loadedCheerio = parseHTML(body);
loadedCheerio("li.novel-item").each(function () {
const name = loadedCheerio(this).find("h4").text();
const url = loadedCheerio(this).find("a").attr("href");
const cover = loadedCheerio(this)
.find(".novel-cover > img")
.attr("data-src");
if (!name || !url) return;
let loadedCheerio = parseHTML(body);
const novel: Plugin.SourceNovel = {
url: novelUrl,
};
novels.push({
name: name,
cover: baseUrl + cover,
url: baseUrl + url,
});
});
novel.name = loadedCheerio("h1.novel-title").text();
novel.author = loadedCheerio("span[itemprop=author]").text();
novel.cover =
baseUrl + loadedCheerio("figure.cover > img").attr("data-src");
novel.summary = loadedCheerio(".summary")
.text()
.replace("Summary", "")
.trim();
novel.genres = loadedCheerio("div.categories > ul > li")
.map((index, element) => loadedCheerio(element).text()?.trim())
.get()
.join(",");
loadedCheerio("div.header-stats > span").each(function () {
if (loadedCheerio(this).find("small").text() === "Status") {
novel.status = loadedCheerio(this).find("strong").text();
}
});
const chapters: Plugin.ChapterItem[] = [];
const latestChapterNo = parseInt(
loadedCheerio(".header-stats")
.find("span > strong")
.first()
.text()
.trim(),
);
let lastChapterNo = 1;
loadedCheerio(".chapter-list li").each(function () {
const name = loadedCheerio(this).find("a .chapter-title").text().trim();
const url = loadedCheerio(this).find("a").attr("href")?.trim();
const releaseTime = loadedCheerio(this)
.find("a .chapter-update")
.text()
.trim();
lastChapterNo = parseInt(
loadedCheerio(this).find("a .chapter-no").text().trim(),
);
if (!name || !url) return;
chapters.push({
name,
releaseTime: parseMadaraDate(releaseTime),
url: baseUrl + url,
});
});
const novelId =
"/" + novelUrl.replace(".html", "").replace(this.site, "") + "_";
// Itterate once more before loop to finish off
lastChapterNo++;
for (let i = lastChapterNo; i <= latestChapterNo; i++) {
const name = "Chapter " + i;
const releaseTime = null;
const url = baseUrl + novelId + i + ".html";
chapters.push({ name, releaseTime, url });
return novels;
}
novel.chapters = chapters;
return novel;
}
async parseNovelAndChapters(novelUrl: string): Promise<Plugin.SourceNovel> {
const baseUrl = this.site;
const result = await fetchApi(novelUrl);
const body = await result.text();
async parseChapter(chapterUrl: string): Promise<string> {
const result = await fetchApi(chapterUrl);
const body = await result.text();
let loadedCheerio = parseHTML(body);
const novel: Plugin.SourceNovel = {
url: novelUrl,
};
const loadedCheerio = parseHTML(body);
novel.name = loadedCheerio("h1.novel-title").text();
novel.author = loadedCheerio("span[itemprop=author]").text();
novel.cover =
baseUrl + loadedCheerio("figure.cover > img").attr("data-src");
const chapterText = loadedCheerio(".chapter-content").html();
return chapterText || "";
}
novel.summary = loadedCheerio(".summary")
.text()
.replace("Summary", "")
.trim();
async searchNovels(
searchTerm: string,
//page: number | undefined = 1,
): Promise<Plugin.NovelItem[]> {
const novels: Plugin.NovelItem[] = [];
const baseUrl = this.site;
const searchUrl = baseUrl + "/e/search/index.php";
novel.genres = loadedCheerio("div.categories > ul > li")
.map((index, element) => loadedCheerio(element).text()?.trim())
.get()
.join(",");
const result = await fetchApi(searchUrl, {
headers: {
"Content-Type": "application/x-www-form-urlencoded",
Referer: baseUrl + "search.html",
Origin: baseUrl,
"user-agent":
this.userAgent ||
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36",
},
method: "POST",
body: JSON.stringify({
show: "title",
tempid: 1,
tbname: "news",
keyboard: searchTerm,
}),
});
const body = await result.text();
loadedCheerio("div.header-stats > span").each(function () {
if (loadedCheerio(this).find("small").text() === "Status") {
novel.status = loadedCheerio(this).find("strong").text();
}
});
const loadedCheerio = parseHTML(body);
loadedCheerio("li.novel-item").each(function () {
const name = loadedCheerio(this).find("h4").text();
const url = loadedCheerio(this).find("a").attr("href");
const cover = loadedCheerio(this).find("img").attr("data-src");
if (!name || !url) return;
const chapters: Plugin.ChapterItem[] = [];
const latestChapterNo = parseInt(
loadedCheerio(".header-stats")
.find("span > strong")
.first()
.text()
.trim()
);
novels.push({ name, cover: baseUrl + cover, url: baseUrl + url });
});
let lastChapterNo = 1;
loadedCheerio(".chapter-list li").each(function () {
const name = loadedCheerio(this)
.find("a .chapter-title")
.text()
.trim();
const url = loadedCheerio(this).find("a").attr("href")?.trim();
const releaseTime = loadedCheerio(this)
.find("a .chapter-update")
.text()
.trim();
lastChapterNo = parseInt(
loadedCheerio(this).find("a .chapter-no").text().trim()
);
if (!name || !url) return;
return novels;
}
chapters.push({
name,
releaseTime: parseMadaraDate(releaseTime),
url: baseUrl + url,
});
});
const novelId =
"/" + novelUrl.replace(".html", "").replace(this.site, "") + "_";
fetchImage = fetchFile;
// Itterate once more before loop to finish off
lastChapterNo++;
for (let i = lastChapterNo; i <= latestChapterNo; i++) {
const name = "Chapter " + i;
const releaseTime = null;
const url = baseUrl + novelId + i + ".html";
chapters.push({ name, releaseTime, url });
}
novel.chapters = chapters;
return novel;
}
async parseChapter(chapterUrl: string): Promise<string> {
const result = await fetchApi(chapterUrl);
const body = await result.text();
const loadedCheerio = parseHTML(body);
const chapterText = loadedCheerio(".chapter-content").html();
return chapterText || "";
}
async searchNovels(
searchTerm: string
//page: number | undefined = 1,
): Promise<Plugin.NovelItem[]> {
const novels: Plugin.NovelItem[] = [];
const baseUrl = this.site;
const searchUrl = baseUrl + "/e/search/index.php";
const result = await fetchApi(searchUrl, {
headers: {
"Content-Type": "application/x-www-form-urlencoded",
Referer: baseUrl + "search.html",
Origin: baseUrl,
"user-agent":
this.userAgent ||
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36",
},
method: "POST",
body: JSON.stringify({
show: "title",
tempid: 1,
tbname: "news",
keyboard: searchTerm,
}),
});
const body = await result.text();
const loadedCheerio = parseHTML(body);
loadedCheerio("li.novel-item").each(function () {
const name = loadedCheerio(this).find("h4").text();
const url = loadedCheerio(this).find("a").attr("href");
const cover = loadedCheerio(this).find("img").attr("data-src");
if (!name || !url) return;
novels.push({ name, cover: baseUrl + cover, url: baseUrl + url });
});
return novels;
}
fetchImage = fetchFile;
}
View File
+28 -17
View File
@@ -1,4 +1,4 @@
import { FilterInputs } from "../../../libs/filterInputs";
import { Filters, FilterTypes } from "../../../libs/filterInputs";
import { ScrpitGeneratorFunction } from "../generate";
import list from "./sources.json";
import { RulateMetadata } from "./template";
@@ -6,29 +6,40 @@ import { readFileSync } from "fs";
import path from "path";
export const generateAll: ScrpitGeneratorFunction = function () {
return list.map((metadata: RulateMetadata) => {
return generator(metadata);
});
return list
.map((p) => {
let d = false;
const filters: Filters = {};
for (const k in p.filters) {
const f = p.filters[k as keyof typeof p.filters];
if (f) {
filters[k] = {
...f,
type: FilterTypes.Picker,
};
}
}
return { ...p, filters: d ? undefined : filters };
})
.map((metadata: RulateMetadata) => {
return generator(metadata);
});
};
const generator = function generator(metadata: RulateMetadata) {
const rulateTemplate = readFileSync(path.join(__dirname, "template.ts"), {
encoding: "utf-8",
});
metadata.filters = metadata.filters?.map((filter: any) => ({
...filter,
inputType: FilterInputs[filter.inputType],
}));
const rulateTemplate = readFileSync(path.join(__dirname, "template.ts"), {
encoding: "utf-8",
});
const pluginScript = `
const pluginScript = `
${rulateTemplate}
const plugin = new RulatePlugin(${JSON.stringify(metadata)});
export default plugin;
`.trim();
return {
lang: "russian",
filename: metadata.sourceName,
pluginScript,
};
return {
lang: "russian",
filename: metadata.sourceName,
pluginScript,
};
};
File diff suppressed because it is too large Load Diff
+241 -230
View File
@@ -1,262 +1,273 @@
import { fetchFile, fetchApi } from "@libs/fetch";
import { Filter } from "@libs/filterInputs";
import { Filters } from "@libs/filterInputs";
import { Plugin } from "@typings/plugin";
import { NovelStatus } from "@libs/novelStatus";
import { load as parseHTML } from "cheerio";
// import { defaultCover } from "@libs/defaultCover";
export interface RulateMetadata {
id: string;
sourceSite: string;
sourceName: string;
filters?: Filter[];
id: string;
sourceSite: string;
sourceName: string;
filters?: Filters;
}
class RulatePlugin implements Plugin.PluginBase {
id: string;
name: string;
icon: string;
site: string;
version: string;
userAgent: string;
cookieString: string;
filters?: Filter[] | undefined;
id: string;
name: string;
icon: string;
site: string;
version: string;
userAgent: string;
cookieString: string;
filters?: Filters | undefined;
constructor(metadata: RulateMetadata) {
this.id = metadata.id;
this.name = metadata.sourceName + "[rulate]";
const iconFileName = metadata.sourceName.replace(/\s+/g, "").toLowerCase();
this.icon = `multisrc/rulate/icons/${iconFileName}.png`;
this.site = metadata.sourceSite;
this.version = "1.0.0";
this.userAgent = "";
this.cookieString = "";
this.filters = metadata.filters;
}
async popularNovels(
pageNo: number,
{ filters, showLatestNovels }: Plugin.PopularNovelsOptions,
): Promise<Plugin.NovelItem[]> {
const novels: Plugin.NovelItem[] = [];
const baseUrl = this.site;
let url = baseUrl + "/search?t=";
url += "&cat=" + (filters?.cat || "0");
url += "&s_lang=" + (filters?.s_lang || "0");
url += "&t_lang=" + (filters?.t_lang || "0");
url += "&type=" + (filters?.type || "0");
url += "&sort=" + (showLatestNovels ? "4" : filters?.sort || "6");
url += "&atmosphere=" + (filters?.atmosphere || "0");
url += "&adult=" + (filters?.adult || "0");
if (filters?.genres instanceof Array) {
url += filters.genres.map((i) => "&genres[]=" + i).join("");
constructor(metadata: RulateMetadata) {
this.id = metadata.id;
this.name = metadata.sourceName + "[rulate]";
const iconFileName = metadata.sourceName
.replace(/\s+/g, "")
.toLowerCase();
this.icon = `multisrc/rulate/icons/${iconFileName}.png`;
this.site = metadata.sourceSite;
this.version = "1.0.0";
this.userAgent = "";
this.cookieString = "";
this.filters = metadata.filters;
}
if (filters?.genres_ex instanceof Array) {
url += filters.genres_ex.map((i) => "&genres_ex[]=" + i).join("");
}
async popularNovels(
pageNo: number,
{
filters,
showLatestNovels,
}: Plugin.PopularNovelsOptions<typeof this.filters>
): Promise<Plugin.NovelItem[]> {
const novels: Plugin.NovelItem[] = [];
const baseUrl = this.site;
if (filters?.tags instanceof Array) {
url += filters.tags.map((i) => "&tags[]=" + i).join("");
}
let url = baseUrl + "/search?t=";
url += "&cat=" + (filters?.cat || "0");
url += "&s_lang=" + (filters?.s_lang || "0");
url += "&t_lang=" + (filters?.t_lang || "0");
url += "&type=" + (filters?.type || "0");
url += "&sort=" + (showLatestNovels ? "4" : filters?.sort || "6");
url += "&atmosphere=" + (filters?.atmosphere || "0");
url += "&adult=" + (filters?.adult || "0");
if (filters?.tags_ex instanceof Array) {
url += filters.tags_ex.map((i) => "&tags_ex[]=" + i).join("");
}
if (filters?.fandoms instanceof Array) {
url += filters.fandoms.map((i) => "&fandoms[]=" + i).join("");
}
if (filters?.fandoms_ex instanceof Array) {
url += filters.fandoms_ex.map((i) => "&fandoms_ex[]=" + i).join("");
}
if (filters?.trash instanceof Array) {
url += filters.trash.map((i) => "&" + i + "=1").join("");
}
url += "&Book_page=" + pageNo;
const result = await fetchApi(url);
const body = await result.text();
const loadedCheerio = parseHTML(body);
loadedCheerio(
'ul[class="search-results"] > li:not([class="ad_type_catalog"])',
).each(function () {
loadedCheerio(this).find("p > a").text();
const name = loadedCheerio(this).find("p > a").text();
const cover = loadedCheerio(this).find("img").attr("src");
const url = loadedCheerio(this).find("p > a").attr("href");
if (!name || !url) return;
novels.push({ name, cover: baseUrl + cover, url: baseUrl + url });
});
return novels;
}
async parseNovelAndChapters(novelUrl: string): Promise<Plugin.SourceNovel> {
const baseUrl = this.site;
const novel: Plugin.SourceNovel = {
url: novelUrl,
};
let result = await fetchApi(novelUrl);
if (result.url.includes("mature?path=")) {
const formData = new FormData();
formData.append("path", novelUrl);
formData.append("ok", "Да");
await fetchApi(result.url, {
method: "POST",
body: formData,
});
result = await fetchApi(novelUrl);
}
const body = await result.text();
const loadedCheerio = parseHTML(body);
novel.name = loadedCheerio(
'div[class="container"] > div > div > h1, div.span8:nth-child(1) > h1:nth-child(2)',
)
.text()
.trim();
novel.cover =
baseUrl + loadedCheerio('div[class="images"] > div img').attr("src");
novel.summary = loadedCheerio(
"#Info > div:nth-child(3), .book-description",
).text();
novel.author = loadedCheerio(
".book-stats-icons_author > span:nth-child(2) > a:nth-child(1)",
).text();
const genres: string[] = [];
loadedCheerio("div.span5 > p, .span5 > div:nth-child(2) > p").each(
function () {
switch (loadedCheerio(this).find("strong").text()) {
case "Автор:":
novel.author = loadedCheerio(this).find("em > a").text().trim();
break;
case "Выпуск:":
novel.status =
loadedCheerio(this).find("em").text().trim() === "продолжается"
? NovelStatus.Ongoing
: NovelStatus.Completed;
break;
case "Тэги:":
loadedCheerio(this)
.find("em > a")
.each(function () {
genres.push(loadedCheerio(this).text());
});
break;
case "Жанры:":
loadedCheerio(this)
.find("em > a")
.each(function () {
genres.push(loadedCheerio(this).text());
});
break;
if (filters?.genres instanceof Array) {
url += filters.genres.map((i) => "&genres[]=" + i).join("");
}
},
);
if (genres.length) {
novel.genres = genres.reverse().join(",");
}
if (filters?.genres_ex instanceof Array) {
url += filters.genres_ex.map((i) => "&genres_ex[]=" + i).join("");
}
const chapters: Plugin.ChapterItem[] = [];
loadedCheerio("table > tbody > tr.chapter_row").each(function () {
const chapterName = loadedCheerio(this)
.find('td[class="t"] > a')
.text()
.trim();
const releaseDate = loadedCheerio(this)
.find("td > span")
.attr("title")
?.trim();
const chapterUrl = loadedCheerio(this)
.find('td[class="t"] > a')
.attr("href");
if (filters?.tags instanceof Array) {
url += filters.tags.map((i) => "&tags[]=" + i).join("");
}
if (
loadedCheerio(this).find('td > span[class="disabled"]').length < 1 &&
releaseDate
) {
chapters.push({
name: chapterName,
releaseTime: releaseDate,
url: baseUrl + chapterUrl,
if (filters?.tags_ex instanceof Array) {
url += filters.tags_ex.map((i) => "&tags_ex[]=" + i).join("");
}
if (filters?.fandoms instanceof Array) {
url += filters.fandoms.map((i) => "&fandoms[]=" + i).join("");
}
if (filters?.fandoms_ex instanceof Array) {
url += filters.fandoms_ex.map((i) => "&fandoms_ex[]=" + i).join("");
}
if (filters?.trash instanceof Array) {
url += filters.trash.map((i) => "&" + i + "=1").join("");
}
url += "&Book_page=" + pageNo;
const result = await fetchApi(url);
const body = await result.text();
const loadedCheerio = parseHTML(body);
loadedCheerio(
'ul[class="search-results"] > li:not([class="ad_type_catalog"])'
).each(function () {
loadedCheerio(this).find("p > a").text();
const name = loadedCheerio(this).find("p > a").text();
const cover = loadedCheerio(this).find("img").attr("src");
const url = loadedCheerio(this).find("p > a").attr("href");
if (!name || !url) return;
novels.push({ name, cover: baseUrl + cover, url: baseUrl + url });
});
}
});
novel.chapters = chapters;
return novel;
}
async parseChapter(chapterUrl: string): Promise<string> {
const baseUrl = this.site;
let result = await fetchApi(chapterUrl);
if (result.url.includes("mature?path=")) {
const formData = new FormData();
formData.append("ok", "Да");
await fetchApi(result.url, {
method: "POST",
body: formData,
});
result = await fetchApi(chapterUrl);
return novels;
}
const body = await result.text();
const loadedCheerio = parseHTML(body);
loadedCheerio(".content-text img").each(function () {
if (!loadedCheerio(this).attr("src")?.startsWith("http")) {
const src = loadedCheerio(this).attr("src");
loadedCheerio(this).attr("src", baseUrl + src);
}
});
async parseNovelAndChapters(novelUrl: string): Promise<Plugin.SourceNovel> {
const baseUrl = this.site;
const novel: Plugin.SourceNovel = {
url: novelUrl,
};
let result = await fetchApi(novelUrl);
if (result.url.includes("mature?path=")) {
const formData = new FormData();
formData.append("path", novelUrl);
formData.append("ok", "Да");
const chapterText = loadedCheerio(".content-text").html();
return chapterText || "";
}
async searchNovels(
searchTerm: string,
//page: number | undefined = 1,
): Promise<Plugin.NovelItem[]> {
const novels: Plugin.NovelItem[] = [];
const result = await fetchApi(
this.site + "/search/autocomplete?query=" + searchTerm,
);
const json = (await result.json()) as response[];
await fetchApi(result.url, {
method: "POST",
body: formData,
});
json.forEach((novel) => {
const name = novel.title_one + " / " + novel.title_two;
if (!novel.url) return;
result = await fetchApi(novelUrl);
}
const body = await result.text();
const loadedCheerio = parseHTML(body);
novels.push({
name,
cover: this.site + novel.img,
url: this.site + novel.url,
});
});
novel.name = loadedCheerio(
'div[class="container"] > div > div > h1, div.span8:nth-child(1) > h1:nth-child(2)'
)
.text()
.trim();
novel.cover =
baseUrl +
loadedCheerio('div[class="images"] > div img').attr("src");
novel.summary = loadedCheerio(
"#Info > div:nth-child(3), .book-description"
).text();
novel.author = loadedCheerio(
".book-stats-icons_author > span:nth-child(2) > a:nth-child(1)"
).text();
const genres: string[] = [];
return novels;
}
loadedCheerio("div.span5 > p, .span5 > div:nth-child(2) > p").each(
function () {
switch (loadedCheerio(this).find("strong").text()) {
case "Автор:":
novel.author = loadedCheerio(this)
.find("em > a")
.text()
.trim();
break;
case "Выпуск:":
novel.status =
loadedCheerio(this).find("em").text().trim() ===
"продолжается"
? NovelStatus.Ongoing
: NovelStatus.Completed;
break;
case "Тэги:":
loadedCheerio(this)
.find("em > a")
.each(function () {
genres.push(loadedCheerio(this).text());
});
break;
case "Жанры:":
loadedCheerio(this)
.find("em > a")
.each(function () {
genres.push(loadedCheerio(this).text());
});
break;
}
}
);
fetchImage = fetchFile;
if (genres.length) {
novel.genres = genres.reverse().join(",");
}
const chapters: Plugin.ChapterItem[] = [];
loadedCheerio("table > tbody > tr.chapter_row").each(function () {
const chapterName = loadedCheerio(this)
.find('td[class="t"] > a')
.text()
.trim();
const releaseDate = loadedCheerio(this)
.find("td > span")
.attr("title")
?.trim();
const chapterUrl = loadedCheerio(this)
.find('td[class="t"] > a')
.attr("href");
if (
loadedCheerio(this).find('td > span[class="disabled"]').length <
1 &&
releaseDate
) {
chapters.push({
name: chapterName,
releaseTime: releaseDate,
url: baseUrl + chapterUrl,
});
}
});
novel.chapters = chapters;
return novel;
}
async parseChapter(chapterUrl: string): Promise<string> {
const baseUrl = this.site;
let result = await fetchApi(chapterUrl);
if (result.url.includes("mature?path=")) {
const formData = new FormData();
formData.append("ok", "Да");
await fetchApi(result.url, {
method: "POST",
body: formData,
});
result = await fetchApi(chapterUrl);
}
const body = await result.text();
const loadedCheerio = parseHTML(body);
loadedCheerio(".content-text img").each(function () {
if (!loadedCheerio(this).attr("src")?.startsWith("http")) {
const src = loadedCheerio(this).attr("src");
loadedCheerio(this).attr("src", baseUrl + src);
}
});
const chapterText = loadedCheerio(".content-text").html();
return chapterText || "";
}
async searchNovels(
searchTerm: string
//page: number | undefined = 1,
): Promise<Plugin.NovelItem[]> {
const novels: Plugin.NovelItem[] = [];
const result = await fetchApi(
this.site + "/search/autocomplete?query=" + searchTerm
);
const json = (await result.json()) as response[];
json.forEach((novel) => {
const name = novel.title_one + " / " + novel.title_two;
if (!novel.url) return;
novels.push({
name,
cover: this.site + novel.img,
url: this.site + novel.url,
});
});
return novels;
}
fetchImage = fetchFile;
}
interface response {
id: number;
title_one: string;
title_two: string;
url: string;
img: string;
id: number;
title_one: string;
title_two: string;
url: string;
img: string;
}
+6 -5
View File
@@ -3,8 +3,9 @@ import list from "./sources.json";
type sourceData = (typeof list)[number];
export const generateAll: ScrpitGeneratorFunction = function () {
export const generateAll: ScrpitGeneratorFunction = function (name) {
return list.map((source) => {
console.log(`[${name}] Generating:`, source.id);
return generator(source);
});
};
@@ -13,8 +14,8 @@ const generator = function generator(sourceJson: sourceData) {
const pluginId = sourceJson.id;
const sourceName = sourceJson.sourceName;
const site = sourceJson.sourceSite;
const reverseChapters = sourceJson.reverseChapters;
const iconFileName = sourceName.split('.')[0].toLowerCase() + '.png';
const reverseChapters = sourceJson.reverseChapters;
const iconFileName = sourceName.split(".")[0].toLowerCase() + ".png";
const pluginScript = `
import { CheerioAPI, load } from "cheerio";
import { fetchApi, fetchFile } from "@libs/fetch";
@@ -181,10 +182,10 @@ class LightNovelFRPlugin implements Plugin.PluginBase {
}
export default new LightNovelFRPlugin();`;
return {
lang: sourceJson.lang,
filename: sourceName,
pluginScript,
};
};
};