From 7a92f80a2a9359db1774c62e184f0ff50ec31643 Mon Sep 17 00:00:00 2001 From: Wesley Kerfoot Date: Tue, 31 Dec 2019 17:14:32 -0500 Subject: [PATCH] add option to pass path to chrome binary --- deletefb/deletefb.py | 13 ++++++++++++- deletefb/tools/chrome_driver.py | 1 - deletefb/tools/login.py | 8 ++++++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/deletefb/deletefb.py b/deletefb/deletefb.py index ee6a163..4d8c5a9 100755 --- a/deletefb/deletefb.py +++ b/deletefb/deletefb.py @@ -89,6 +89,16 @@ def run_delete(): help="The year(s) you want posts deleted." ) + parser.add_argument( + "-B", + "--chromebin", + required=False, + default=False, + dest="chromebin", + type=str, + help="Optional path to the Google Chrome (or Chromium) binary" + ) + args = parser.parse_args() settings["ARCHIVE"] = not args.archive_off @@ -102,7 +112,8 @@ def run_delete(): user_email_address=args.email, user_password=args_user_password, is_headless=args.is_headless, - two_factor_token=args.two_factor_token + two_factor_token=args.two_factor_token, + chrome_binary_path=args.chromebin ) if args.mode == "wall": diff --git a/deletefb/tools/chrome_driver.py b/deletefb/tools/chrome_driver.py index d6549ba..2069340 100644 --- a/deletefb/tools/chrome_driver.py +++ b/deletefb/tools/chrome_driver.py @@ -51,7 +51,6 @@ def setup_selenium(driver_path, options): # Configures selenium to use a custom path return webdriver.Chrome(executable_path=driver_path, options=options) - def get_webdriver(): """ Ensure a webdriver is available diff --git a/deletefb/tools/login.py b/deletefb/tools/login.py index dd3ce05..c1c67a5 100644 --- a/deletefb/tools/login.py +++ b/deletefb/tools/login.py @@ -5,11 +5,11 @@ import time from .chrome_driver import get_webdriver, setup_selenium - def login(user_email_address, user_password, is_headless, - two_factor_token): + two_factor_token, + chrome_binary_path=None): """ Attempts to log into Facebook Returns a driver object @@ -27,6 +27,10 @@ def login(user_email_address, chrome_options = Options() prefs = {"profile.default_content_setting_values.notifications": 2, 'disk-cache-size': 4096} chrome_options.add_experimental_option("prefs", prefs) + + if chrome_binary_path: + chrome_options.binary_location = chrome_binary_path + chrome_options.add_argument("start-maximized") if is_headless: