Git-Mirrors/brozzler
1
0
Fork 0
mirror of https://github.com/internetarchive/brozzler.git synced 2025-07-26 08:15:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'better-headless' into qa

Browse source
This commit is contained in:
Barbara Miller 2024-04-16 18:22:15 -07:00
commit a50f9380ad
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
brozzler/chrome.py
View file

@ -61,6 +61,7 @@ def check_version(chrome_exe):
"brozzler requires chrome/chromium version 64 or " "brozzler requires chrome/chromium version 64 or "
"later but %s reports version %s" % (chrome_exe, version_str) "later but %s reports version %s" % (chrome_exe, version_str)
) )
return major_version
class Chrome: class Chrome:
@ -182,7 +183,6 @@ class Chrome:
chrome_args = [ chrome_args = [
self.chrome_exe, self.chrome_exe,
"-v", "-v",
"--headless",
"--remote-debugging-port=%s" % self.port, "--remote-debugging-port=%s" % self.port,
"--use-mock-keychain", # mac thing "--use-mock-keychain", # mac thing
"--user-data-dir=%s" % self._chrome_user_data_dir, "--user-data-dir=%s" % self._chrome_user_data_dir,
@ -205,6 +205,13 @@ class Chrome:
"--disable-save-password-bubble", "--disable-save-password-bubble",
"--disable-sync", "--disable-sync",
] ]
major_version = check_version(self.chrome_exe)
if major_version >= 109:
chrome_args.append("--headless=new")
elif 96 <= major_version <= 108:
chrome_args.append("--headless=chrome")
else:
chrome_args.append("--headless")
extra_chrome_args = os.environ.get("BROZZLER_EXTRA_CHROME_ARGS") extra_chrome_args = os.environ.get("BROZZLER_EXTRA_CHROME_ARGS")
if extra_chrome_args: if extra_chrome_args: