From 508984c94169a94e4f2854bf8fc6908b27afb410 Mon Sep 17 00:00:00 2001 From: apkallum Date: Wed, 23 Sep 2020 13:22:10 -0400 Subject: [PATCH 1/3] fix: ensure chrome data dir is none when appropiate --- archivebox/config/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archivebox/config/__init__.py b/archivebox/config/__init__.py index 6627c736..aa34df6f 100644 --- a/archivebox/config/__init__.py +++ b/archivebox/config/__init__.py @@ -232,7 +232,7 @@ DERIVED_CONFIG_DEFAULTS: ConfigDefaultDict = { 'LOGS_DIR': {'default': lambda c: c['OUTPUT_DIR'] / LOGS_DIR_NAME}, 'CONFIG_FILE': {'default': lambda c: Path(c['CONFIG_FILE']).resolve() if c['CONFIG_FILE'] else c['OUTPUT_DIR'] / CONFIG_FILENAME}, 'COOKIES_FILE': {'default': lambda c: c['COOKIES_FILE'] and Path(c['COOKIES_FILE']).resolve()}, - 'CHROME_USER_DATA_DIR': {'default': lambda c: find_chrome_data_dir() if c['CHROME_USER_DATA_DIR'] is None else Path(c['CHROME_USER_DATA_DIR']).resolve() or None}, + 'CHROME_USER_DATA_DIR': {'default': lambda c: find_chrome_data_dir() if c['CHROME_USER_DATA_DIR'] is None else Path(c['CHROME_USER_DATA_DIR']).resolve() if Path(c['CHROME_USER_DATA_DIR']).resolve() != Path.cwd() else None}, 'URL_BLACKLIST_PTN': {'default': lambda c: c['URL_BLACKLIST'] and re.compile(c['URL_BLACKLIST'] or '', re.IGNORECASE | re.UNICODE | re.MULTILINE)}, 'ARCHIVEBOX_BINARY': {'default': lambda c: sys.argv[0]}, From 2b987421fb623c54f05ae3a389a7de1485a511de Mon Sep 17 00:00:00 2001 From: Karim Date: Wed, 23 Sep 2020 17:23:53 -0400 Subject: [PATCH 2/3] simpler check for CHROME_USER_DATA_DIR --- archivebox/config/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archivebox/config/__init__.py b/archivebox/config/__init__.py index aa34df6f..0e1c1be6 100644 --- a/archivebox/config/__init__.py +++ b/archivebox/config/__init__.py @@ -232,7 +232,7 @@ DERIVED_CONFIG_DEFAULTS: ConfigDefaultDict = { 'LOGS_DIR': {'default': lambda c: c['OUTPUT_DIR'] / LOGS_DIR_NAME}, 'CONFIG_FILE': {'default': lambda c: Path(c['CONFIG_FILE']).resolve() if c['CONFIG_FILE'] else c['OUTPUT_DIR'] / CONFIG_FILENAME}, 'COOKIES_FILE': {'default': lambda c: c['COOKIES_FILE'] and Path(c['COOKIES_FILE']).resolve()}, - 'CHROME_USER_DATA_DIR': {'default': lambda c: find_chrome_data_dir() if c['CHROME_USER_DATA_DIR'] is None else Path(c['CHROME_USER_DATA_DIR']).resolve() if Path(c['CHROME_USER_DATA_DIR']).resolve() != Path.cwd() else None}, + 'CHROME_USER_DATA_DIR': {'default': lambda c: find_chrome_data_dir() if c['CHROME_USER_DATA_DIR'] is None else Path(c['CHROME_USER_DATA_DIR']).resolve() if c['CHROME_USER_DATA_DIR']) else None}, 'URL_BLACKLIST_PTN': {'default': lambda c: c['URL_BLACKLIST'] and re.compile(c['URL_BLACKLIST'] or '', re.IGNORECASE | re.UNICODE | re.MULTILINE)}, 'ARCHIVEBOX_BINARY': {'default': lambda c: sys.argv[0]}, From 38c1f96e2cfc40dbf3096e7ba5c1c4d56f7a50d2 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Wed, 23 Sep 2020 17:29:57 -0400 Subject: [PATCH 3/3] Update archivebox/config/__init__.py --- archivebox/config/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archivebox/config/__init__.py b/archivebox/config/__init__.py index 0e1c1be6..ac6c728f 100644 --- a/archivebox/config/__init__.py +++ b/archivebox/config/__init__.py @@ -232,7 +232,7 @@ DERIVED_CONFIG_DEFAULTS: ConfigDefaultDict = { 'LOGS_DIR': {'default': lambda c: c['OUTPUT_DIR'] / LOGS_DIR_NAME}, 'CONFIG_FILE': {'default': lambda c: Path(c['CONFIG_FILE']).resolve() if c['CONFIG_FILE'] else c['OUTPUT_DIR'] / CONFIG_FILENAME}, 'COOKIES_FILE': {'default': lambda c: c['COOKIES_FILE'] and Path(c['COOKIES_FILE']).resolve()}, - 'CHROME_USER_DATA_DIR': {'default': lambda c: find_chrome_data_dir() if c['CHROME_USER_DATA_DIR'] is None else Path(c['CHROME_USER_DATA_DIR']).resolve() if c['CHROME_USER_DATA_DIR']) else None}, + 'CHROME_USER_DATA_DIR': {'default': lambda c: find_chrome_data_dir() if c['CHROME_USER_DATA_DIR'] is None else Path(c['CHROME_USER_DATA_DIR']).resolve() if c['CHROME_USER_DATA_DIR']) else None}, # None means unset, so we autodetect it with find_chrome_Data_dir(), but emptystring '' means user manually set it to '', and we should store it as None 'URL_BLACKLIST_PTN': {'default': lambda c: c['URL_BLACKLIST'] and re.compile(c['URL_BLACKLIST'] or '', re.IGNORECASE | re.UNICODE | re.MULTILINE)}, 'ARCHIVEBOX_BINARY': {'default': lambda c: sys.argv[0]},