Merge branch 'master' into deepsource-fix-dc58783a

pull/35/head
Millennium Earl 2020-10-21 15:35:05 +02:00 committed by GitHub
commit e2d939c593
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 15 deletions

View File

@ -9,8 +9,9 @@
Unofficial Node JS module for scraping F95Zone platform Unofficial Node JS module for scraping F95Zone platform
# Guidelines for errors # Guidelines for errors
+ If you can, return a meaningful value
+ Return `null` only if the function should return a complex object (including strings) - If you can, return a meaningful value
+ Return an empty array if the function should return an array - Return `null` only if the function should return a complex object (including strings)
+ Return `false`, `-1` when the function should retrn `boolean` or `number` - Return an empty array if the function should return an array
+ Throw an exception only if it is an error or if a wrong value could mess up the functioning of the library - Return `false`, `-1` when the function should retrn `boolean` or `number`
- Throw an exception only if it is an error or if a wrong value could mess up the functioning of the library

View File

@ -27,7 +27,8 @@ module.exports.getGameInfo = async function (browser, url) {
// Verify the correctness of the URL // Verify the correctness of the URL
const exists = await urlHelper.urlExists(url); const exists = await urlHelper.urlExists(url);
if (!exists) throw new URIError(url + " is not a valid URL"); if (!exists) throw new URIError(url + " is not a valid URL");
if (!urlHelper.isF95URL(url)) throw new Error(url + " is not a valid F95Zone URL"); if (!urlHelper.isF95URL(url))
throw new Error(url + " is not a valid F95Zone URL");
const page = await preparePage(browser); // Set new isolated page const page = await preparePage(browser); // Set new isolated page
await page.setCookie(...shared.cookies); // Set cookies to avoid login await page.setCookie(...shared.cookies); // Set cookies to avoid login
@ -309,7 +310,8 @@ async function getLastChangelog(page) {
let parsedText = HTMLParser.parse(changelogHTML).structuredText; let parsedText = HTMLParser.parse(changelogHTML).structuredText;
// Clean the text // Clean the text
if (parsedText.startsWith("Spoiler")) parsedText = parsedText.replace("Spoiler", ""); if (parsedText.startsWith("Spoiler"))
parsedText = parsedText.replace("Spoiler", "");
if (parsedText.startsWith(":")) parsedText = parsedText.replace(":", ""); if (parsedText.startsWith(":")) parsedText = parsedText.replace(":", "");
return parsedText.trim(); return parsedText.trim();
} }

View File

@ -124,10 +124,7 @@ async function getThreadURL(page, handle) {
if (isF95URL(relativeURLThread)) return relativeURLThread; if (isF95URL(relativeURLThread)) return relativeURLThread;
// ... else compose the URL and return // ... else compose the URL and return
const urlThread = new URL( const urlThread = new URL(relativeURLThread, urlK.F95_BASE_URL).toString();
relativeURLThread,
urlK.F95_BASE_URL
).toString();
return urlThread; return urlThread;
} }
//#endregion Private methods //#endregion Private methods