From 32409b91a703f40fafc1e6bedd7b66648e70b4e7 Mon Sep 17 00:00:00 2001 From: MillenniumEarl Date: Fri, 16 Oct 2020 10:05:28 +0200 Subject: [PATCH] Style fixes --- app/index.js | 8 ++++---- app/scripts/classes/game-download.js | 6 +++--- app/scripts/classes/game-info.js | 2 +- app/scripts/classes/login-result.js | 2 +- app/scripts/constants/css-selectors.js | 2 +- app/scripts/constants/urls.js | 4 ++-- app/scripts/game-scraper.js | 6 +++--- app/scripts/game-searcher.js | 4 ++-- app/scripts/puppeteer-helper.js | 4 ++-- app/scripts/urls-helper.js | 2 +- test/user-test.js | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/index.js b/app/index.js index eb292f2..1037ff8 100644 --- a/app/index.js +++ b/app/index.js @@ -10,12 +10,12 @@ const selectors = require('./scripts/constants/css-selectors.js'); const { isStringAValidURL, urlExists, - isF95URL, + isF95URL } = require('./scripts/urls-helper.js'); const scraper = require('./scripts/game-scraper.js'); const { prepareBrowser, - preparePage, + preparePage } = require('./scripts/puppeteer-helper.js'); const searcher = require('./scripts/game-searcher.js'); @@ -161,7 +161,7 @@ module.exports.loadF95BaseData = async function () { // Go to latest update page and wait for it to load await page.goto(constURLs.F95_LATEST_UPDATES, { - waitUntil: shared.WAIT_STATEMENT, + waitUntil: shared.WAIT_STATEMENT }); // Obtain engines (disc/online) @@ -489,7 +489,7 @@ async function loginF95(browser, username, password) { await Promise.all([ page.click(selectors.LOGIN_BUTTON), // Click on the login button page.waitForNavigation({ - waitUntil: shared.WAIT_STATEMENT, + waitUntil: shared.WAIT_STATEMENT }), // Wait for page to load ]); diff --git a/app/scripts/classes/game-download.js b/app/scripts/classes/game-download.js index e03ce49..d3b1032 100644 --- a/app/scripts/classes/game-download.js +++ b/app/scripts/classes/game-download.js @@ -63,7 +63,7 @@ async function downloadMEGA(url, savepath) { const link = await page.$('a.host_link'); await link.click(); await page.goto(url, { - waitUntil: shared.WAIT_STATEMENT, + waitUntil: shared.WAIT_STATEMENT }); // Go to the game page and wait until it loads // Obtain the URL after the redirect @@ -89,7 +89,7 @@ async function downloadNOPY(url, savepath) { // Set the save path await page._client.send('Page.setDownloadBehavior', { behavior: 'allow', - downloadPath: path.basename(path.dirname(savepath)), // Is a directory + downloadPath: path.basename(path.dirname(savepath)) // It's a directory }); // Obtain the download button and click it @@ -99,7 +99,7 @@ async function downloadNOPY(url, savepath) { // Await for all the connections to close await page.waitForNavigation({ waitUntil: 'networkidle0', - timeout: 0, // Disable timeout + timeout: 0 // Disable timeout }); // Close browser and page diff --git a/app/scripts/classes/game-info.js b/app/scripts/classes/game-info.js index 5174cbb..8601986 100644 --- a/app/scripts/classes/game-info.js +++ b/app/scripts/classes/game-info.js @@ -103,7 +103,7 @@ class GameInfo { isMod: this.isMod, changelog: this.changelog, gameDir: this.gameDir, - downloadInfo: this.downloadInfo, + downloadInfo: this.downloadInfo }; } diff --git a/app/scripts/classes/login-result.js b/app/scripts/classes/login-result.js index 93d1782..4916b9b 100644 --- a/app/scripts/classes/login-result.js +++ b/app/scripts/classes/login-result.js @@ -17,4 +17,4 @@ class LoginResult { this.message = ''; } } -module.exports = LoginResult; \ No newline at end of file +module.exports = LoginResult; diff --git a/app/scripts/constants/css-selectors.js b/app/scripts/constants/css-selectors.js index 060fd9d..9297e1c 100644 --- a/app/scripts/constants/css-selectors.js +++ b/app/scripts/constants/css-selectors.js @@ -28,5 +28,5 @@ module.exports = Object.freeze({ DOWNLOAD_LINKS_CONTAINER: 'span[style="font-size: 18px"]', SEARCH_THREADS_RESULTS_BODY: 'div.contentRow-main', SEARCH_THREADS_MEMBERSHIP: 'li > a:not(.username)', - THREAD_LAST_CHANGELOG: 'div.bbCodeBlock-content > div:first-of-type', + THREAD_LAST_CHANGELOG: 'div.bbCodeBlock-content > div:first-of-type' }); diff --git a/app/scripts/constants/urls.js b/app/scripts/constants/urls.js index da54df4..88856c0 100644 --- a/app/scripts/constants/urls.js +++ b/app/scripts/constants/urls.js @@ -3,5 +3,5 @@ module.exports = Object.freeze({ F95_SEARCH_URL: 'https://f95zone.to/search', F95_LATEST_UPDATES: 'https://f95zone.to/latest', F95_LOGIN_URL: 'https://f95zone.to/login', - F95_WATCHED_THREADS: 'https://f95zone.to/watched/threads', -}); \ No newline at end of file + F95_WATCHED_THREADS: 'https://f95zone.to/watched/threads' +}); diff --git a/app/scripts/game-scraper.js b/app/scripts/game-scraper.js index dacc392..0282dd9 100644 --- a/app/scripts/game-scraper.js +++ b/app/scripts/game-scraper.js @@ -31,7 +31,7 @@ module.exports.getGameInfo = async function (browser, url) { const page = await preparePage(browser); // Set new isolated page await page.setCookie(...shared.cookies); // Set cookies to avoid login await page.goto(url, { - waitUntil: shared.WAIT_STATEMENT, + waitUntil: shared.WAIT_STATEMENT }); // Go to the game page and wait until it loads // It asynchronously searches for the elements and @@ -81,7 +81,7 @@ module.exports.getGameVersionFromTitle = async function (browser, info) { const page = await preparePage(browser); // Set new isolated page await page.setCookie(...shared.cookies); // Set cookies to avoid login await page.goto(info.f95url, { - waitUntil: shared.WAIT_STATEMENT, + waitUntil: shared.WAIT_STATEMENT }); // Go to the game page and wait until it loads // Get the title @@ -322,7 +322,7 @@ async function getGameDownloadLink(page) { 'MIXDROP', 'UPLOADHAVEN', 'PIXELDRAIN', - 'FILESFM', + 'FILESFM' ]; // Supported OS platforms diff --git a/app/scripts/game-searcher.js b/app/scripts/game-searcher.js index 718e9f0..fde774e 100644 --- a/app/scripts/game-searcher.js +++ b/app/scripts/game-searcher.js @@ -23,7 +23,7 @@ module.exports.getSearchGameResults = async function (browser, gamename) { const page = await preparePage(browser); // Set new isolated page await page.setCookie(...shared.cookies); // Set cookies to avoid login await page.goto(constURLs.F95_SEARCH_URL, { - waitUntil: shared.WAIT_STATEMENT, + waitUntil: shared.WAIT_STATEMENT }); // Go to the search form and wait for it // Explicitly wait for the required items to load @@ -36,7 +36,7 @@ module.exports.getSearchGameResults = async function (browser, gamename) { await Promise.all([ page.click(selectors.SEARCH_BUTTON), // Execute search page.waitForNavigation({ - waitUntil: shared.WAIT_STATEMENT, + waitUntil: shared.WAIT_STATEMENT }), // Wait for page to load ]); diff --git a/app/scripts/puppeteer-helper.js b/app/scripts/puppeteer-helper.js index 12c8059..2764566 100644 --- a/app/scripts/puppeteer-helper.js +++ b/app/scripts/puppeteer-helper.js @@ -18,11 +18,11 @@ module.exports.prepareBrowser = async function () { if (shared.chromiumLocalPath) { browser = await puppeteer.launch({ executablePath: shared.chromiumLocalPath, - headless: !shared.debug, // Use GUI when debug = true + headless: !shared.debug // Use GUI when debug = true }); } else { browser = await puppeteer.launch({ - headless: !shared.debug, // Use GUI when debug = true + headless: !shared.debug // Use GUI when debug = true }); } diff --git a/app/scripts/urls-helper.js b/app/scripts/urls-helper.js index edd2ad5..e7a0ca7 100644 --- a/app/scripts/urls-helper.js +++ b/app/scripts/urls-helper.js @@ -2,7 +2,7 @@ // Public modules from npm const ky = require('ky-universal').create({ - throwHttpErrors: false, + throwHttpErrors: false }); // Modules from file diff --git a/test/user-test.js b/test/user-test.js index 07717e7..90692cd 100644 --- a/test/user-test.js +++ b/test/user-test.js @@ -5,7 +5,7 @@ const { getGameData, loadF95BaseData, getUserData, - logout, + logout } = require("../app/index.js"); const GameDownload = require("../app/scripts/classes/game-download.js");