mirrors/ArchiveBox
1
0
Fork 0
mirror of https://github.com/ArchiveBox/ArchiveBox.git synced 2025-05-13 06:34:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

More reliably detect Google Chrome version number

Browse source 
Previous method was splitting on the first whitespace, and missing the
version number when it appeared as `"Google Chrome 115.0.234.2342"`
instead of, i.e. `"Chromium 115.0.234.8283"`.

This commit changes the version detection to regex search for
whitespace, then one or more digits followed by a period, then at least
one more digit. Only the first sequence of digits is captured. Unless
Chrome radically changes their version numbering, this should capture
the first group of digits after the reported browser name, which would
be the major version.
This commit is contained in:
Ross Williams 2023-07-31 15:34:58 -04:00
parent 3e5e9c7a41
commit d0e65eba7f
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
archivebox/util.py
View file

@ -229,7 +229,8 @@ def chrome_args(**options) -> List[str]:
cmd_args = [options['CHROME_BINARY']] cmd_args = [options['CHROME_BINARY']]
if options['CHROME_HEADLESS']: if options['CHROME_HEADLESS']:
if int(CHROME_VERSION.split()[1].split('.')[0]) >= 111: chrome_major_version = int(re.search(r'\s(\d+)\.\d', CHROME_VERSION)[1])
if chrome_major_version >= 111:
cmd_args += ("--headless=new",) cmd_args += ("--headless=new",)
else: else:
cmd_args += ('--headless',) cmd_args += ('--headless',)