From 6c49f2f19f413a26ecdab1dfff4a456562d3dfff Mon Sep 17 00:00:00 2001 From: Lei PAN Date: Wed, 1 Nov 2023 00:02:17 +0100 Subject: [PATCH] new no_internet wording --- src/openCvTest.js | 20 +++++++++----------- src/workers/OCRChecker.js | 7 +++++-- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/openCvTest.js b/src/openCvTest.js index 5261295..868c9ca 100644 --- a/src/openCvTest.js +++ b/src/openCvTest.js @@ -1,14 +1,12 @@ const cmdExecute = require("./utiles/CmdUtils"); +const {findText} = require("./utiles/CmdUtils"); -// const findWaldo = async () => { -// // Load images -// let imagePath = "/Users/panlei/Downloads/to_handle/E91954512_cc1d1239-70ef-4265-861e-851517eb68f1.png" -// let baseDir = "/Users/panlei/Documents/workspace/MacOCI" -// let cmd = `${baseDir}/venv/bin/python ${baseDir}/MacOCR.py ${imagePath}` -// let stdOut = await cmdExecute(cmd); -// console.log(stdOut) -// -// } -// // noinspection JSIgnoredPromiseFromCall -// findWaldo(); \ No newline at end of file +const findWaldo = async () => { + // Load images + let imagePath = "/Users/panlei/Documents/workspace/puppeteerjs/E15558320_09bf3f7f-7e5f-449c-92b6-70045914d257.png" + let stdOut = await findText(imagePath); + console.log(stdOut) +} +// noinspection JSIgnoredPromiseFromCall +findWaldo(); \ No newline at end of file diff --git a/src/workers/OCRChecker.js b/src/workers/OCRChecker.js index 2222acd..b834a86 100644 --- a/src/workers/OCRChecker.js +++ b/src/workers/OCRChecker.js @@ -13,6 +13,7 @@ function delay(delayInMs) { } const NO_INTERNET_FR = "Aucun accés a Internet" +const NO_INTERNET_FR_2 = "Aucun accès à Internet" const BRAVE_VPN_SKIP = "Pare-feu + VPN Brave" const MESSAGE_URL_VALIDATION_FR = "envoyé un lien par e-mail." const MESSAGE_URL_VALIDATION_FR_2 = "un lien par e-mail" @@ -65,6 +66,7 @@ const BRAVE_SKIP_PUB_4 = "aucune publicité" const BRAVE_SKIP_DEFAULT_PAGE = "confidentialité de Brave" const BRAVE_SKIP_DEFAULT_PAGE_2 = "définissant Brave" const BRAVE_SKIP_PRIVACY_PAGE = "Partagez des informations" +const BRAVE_SKIP_PRIVACY_PAGE_3 = "Partagez de informations" const BRAVE_SKIP_PRIVACY_PAGE_2 = "Partagez des renseignements" class OCRChecker { @@ -151,12 +153,13 @@ class OCRChecker { return OCRResult.TO_SKIP } else if (result.includes(RECAPTCHA_FAILED_FR)) { return OCRResult.TERMINAED - } else if (result.includes(NO_INTERNET_FR)) { + } else if (result.includes(NO_INTERNET_FR)||result.includes(NO_INTERNET_FR_2)) { + await this.deleteFile(fileName) return OCRResult.NO_INTERNET } else if (result.includes(BRAVE_SKIP_DEFAULT_PAGE) || result.includes(BRAVE_SKIP_DEFAULT_PAGE_2)) { await this.deleteFile(fileName) return OCRResult.BRAVE_SKIP - } else if (result.includes(BRAVE_SKIP_PRIVACY_PAGE) || result.includes(BRAVE_SKIP_PRIVACY_PAGE_2)) { + } else if (result.includes(BRAVE_SKIP_PRIVACY_PAGE) || result.includes(BRAVE_SKIP_PRIVACY_PAGE_2) || result.includes(BRAVE_SKIP_PRIVACY_PAGE_3)) { await this.deleteFile(fileName) return OCRResult.BRAVE_PRIVACY } else {