Skip to content

Commit

Permalink
Check Chrome / Chromium web browser is installed correctly
Browse files Browse the repository at this point in the history
  • Loading branch information
ngosang committed Jan 8, 2023
1 parent e3b4200 commit c93834e
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## v3.0.2 (2023/01/08)

* Detect Cloudflare blocked access
* Check Chrome / Chromium web browser is installed correctly

## v3.0.1 (2023/01/06)

Expand Down
16 changes: 16 additions & 0 deletions src/flaresolverr_service.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import logging
import sys
import time
from urllib.parse import unquote

Expand Down Expand Up @@ -42,6 +43,21 @@

def test_browser_installation():
logging.info("Testing web browser installation...")

chrome_exe_path = utils.get_chrome_exe_path()
if chrome_exe_path is None:
logging.error("Chrome / Chromium web browser not installed!")
sys.exit(1)
else:
logging.info("Chrome / Chromium path: " + chrome_exe_path)

chrome_major_version = utils.get_chrome_major_version()
if chrome_major_version == '':
logging.error("Chrome / Chromium version not detected!")
sys.exit(1)
else:
logging.info("Chrome / Chromium major version: " + chrome_major_version)

user_agent = utils.get_user_agent()
logging.info("FlareSolverr User-Agent: " + user_agent)
logging.info("Test successful")
Expand Down
5 changes: 4 additions & 1 deletion src/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ def get_webdriver() -> WebDriver:
return driver


def get_chrome_exe_path() -> str:
return uc.find_chrome_executable()


def get_chrome_major_version() -> str:
global CHROME_MAJOR_VERSION
if CHROME_MAJOR_VERSION is not None:
Expand All @@ -112,7 +116,6 @@ def get_chrome_major_version() -> str:
process.close()

CHROME_MAJOR_VERSION = complete_version.split('.')[0].split(' ')[-1]
logging.info(f"Chrome major version: {CHROME_MAJOR_VERSION}")
return CHROME_MAJOR_VERSION


Expand Down

0 comments on commit c93834e

Please sign in to comment.