MickSlash
/
F95API
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed merge

pull/31/head
MillenniumEarl 2020-10-16 09:52:20 +02:00
parent 3689be8969 4697e6f535
commit 638ae012f0
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/index.js
View File

@ -383,7 +383,7 @@ function isCookieExpired(cookie) {
let expiredCookies = false; let expiredCookies = false;
// Ignore cookies that never expire // Ignore cookies that never expire
const expirationUnixTimestamp = cookie["expire"]; const expirationUnixTimestamp = cookie.expire;
if (expirationUnixTimestamp !== "-1") { if (expirationUnixTimestamp !== "-1") {
// Convert UNIX epoch timestamp to normal Date // Convert UNIX epoch timestamp to normal Date
@ -392,7 +392,7 @@ function isCookieExpired(cookie) {
if (expirationDate < Date.now()) { if (expirationDate < Date.now()) {
if (shared.debug) if (shared.debug)
console.log( console.log(
"Cookie " + cookie["name"] + " expired, you need to re-authenticate" "Cookie " + cookie.name + " expired, you need to re-authenticate"
); );
expiredCookies = true; expiredCookies = true;
} }

30
app/scripts/game-scraper.js
View File

@ -7,16 +7,10 @@ const puppeteer = require("puppeteer"); // skipcq: JS-0128
// Modules from file // Modules from file
const shared = require("./shared.js"); const shared = require("./shared.js");
const selectors = require("./constants/css-selectors.js"); const selectors = require("./constants/css-selectors.js");
const { const { preparePage } = require("./puppeteer-helper.js");
preparePage
} = require("./puppeteer-helper.js");
const GameDownload = require("./classes/game-download.js"); const GameDownload = require("./classes/game-download.js");
const GameInfo = require("./classes/game-info.js"); const GameInfo = require("./classes/game-info.js");
const { const { isStringAValidURL, isF95URL, urlExists } = require("./urls-helper.js");
isStringAValidURL,
isF95URL,
urlExists
} = require("./urls-helper.js");
/** /**
* @protected * @protected
@ -60,12 +54,10 @@ module.exports.getGameInfo = async function (browser, url) {
info.overview = overview; info.overview = overview;
info.tags = await tags; info.tags = await tags;
info.f95url = url; info.f95url = url;
info.version = info.isMod ? info.version = info.isMod ? parsedInfos.MOD_VERSION : parsedInfos.VERSION;
parsedInfos["MOD_VERSION"] : info.lastUpdate = info.isMod
parsedInfos["VERSION"]; ? parsedInfos.UPDATED
info.lastUpdate = info.isMod ? : parsedInfos.THREAD_UPDATED;
parsedInfos["UPDATED"] :
parsedInfos["THREAD_UPDATED"];
info.previewSource = await previewSource; info.previewSource = await previewSource;
info.changelog = (await changelog) || "Unknown changelog"; info.changelog = (await changelog) || "Unknown changelog";
//info.downloadInfo = await downloadData; //info.downloadInfo = await downloadData;
@ -155,8 +147,7 @@ async function getGameAuthor(page) {
// Get the game/mod name (without square brackets) // Get the game/mod name (without square brackets)
const titleHTML = await page.evaluate( const titleHTML = await page.evaluate(
/* istanbul ignore next */ /* istanbul ignore next */
(selector) => (selector) => document.querySelector(selector).innerHTML,
document.querySelector(selector).innerHTML,
selectors.GAME_TITLE selectors.GAME_TITLE
); );
const structuredTitle = HTMLParser.parse(titleHTML); const structuredTitle = HTMLParser.parse(titleHTML);
@ -229,8 +220,7 @@ async function getGameTitle(page) {
// Get the game/mod name (without square brackets) // Get the game/mod name (without square brackets)
const titleHTML = await page.evaluate( const titleHTML = await page.evaluate(
/* istanbul ignore next */ /* istanbul ignore next */
(selector) => (selector) => document.querySelector(selector).innerHTML,
document.querySelector(selector).innerHTML,
selectors.GAME_TITLE selectors.GAME_TITLE
); );
const structuredTitle = HTMLParser.parse(titleHTML); const structuredTitle = HTMLParser.parse(titleHTML);
@ -413,8 +403,8 @@ function extractGameHostingData(platform, text) {
// Find the end of the container // Find the end of the container
if (endIndex === -1) if (endIndex === -1)
endIndex = endIndex =
text.indexOf(CONTAINER_SPAN_CLOSE, startIndex) + text.indexOf(CONTAINER_SPAN_CLOSE, startIndex) +
CONTAINER_SPAN_CLOSE.length; CONTAINER_SPAN_CLOSE.length;
text = text.substring(startIndex, endIndex); text = text.substring(startIndex, endIndex);