Skip to content

Commit 14b1549

Browse files
committed
ENH: Insert property in options class edge and chrome
1 parent e7082bc commit 14b1549

File tree

3 files changed

+10
-18
lines changed

3 files changed

+10
-18
lines changed

botcity/web/bot.py

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,26 +49,18 @@ def _cleanup(bot: ReferenceType[WebBot]):
4949

5050
def get_botcity_temp_dir(opt, browser_name):
5151
browsers = {
52-
Browser.CHROME: ("--botcity-temp-dir=", opt.arguments if opt else []),
53-
Browser.EDGE: ("--botcity-temp-dir=", opt.arguments if opt else []),
54-
Browser.UNDETECTED_CHROME: ("--botcity-temp-dir=", opt.arguments if opt else []),
52+
Browser.CHROME: opt._botcity_temp_dir if opt else None,
53+
Browser.EDGE: opt._botcity_temp_dir if opt else None,
54+
Browser.UNDETECTED_CHROME: opt._botcity_temp_dir if opt else None,
5555
Browser.FIREFOX: None,
5656
Browser.IE: None
5757
}
58-
items = browsers.get(browser_name, None)
59-
if not items:
60-
return None
61-
62-
result = next(filter(lambda x: x.startswith(items[0]), items[1]), None)
63-
if not result:
64-
return None
58+
response = browsers.get(browser_name, None)
6559

66-
match_result = re.search(rf'{items[0]}([^ ]+)', result)
67-
68-
if not match_result:
60+
if not response:
6961
return None
7062

71-
return match_result.group(1)
63+
return response
7264

7365
if bot() is not None:
7466
try:

botcity/web/browsers/chrome.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ def default_options(headless=False, download_folder_path=None, user_data_dir=Non
7070
chrome_options.add_argument("--no-sandbox")
7171
except AttributeError:
7272
pass
73-
73+
chrome_options._botcity_temp_dir = None
7474
if not user_data_dir:
7575
temp_dir = tempfile.TemporaryDirectory(prefix="botcity_")
7676
user_data_dir = temp_dir.name
77-
chrome_options.add_argument(f"--botcity-temp-dir={user_data_dir}")
77+
chrome_options._botcity_temp_dir = user_data_dir
7878

7979
chrome_options.add_argument(f"--user-data-dir={user_data_dir}")
8080

botcity/web/browsers/edge.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ def default_options(headless=False, download_folder_path=None, user_data_dir=Non
6767
edge_options.add_argument("--no-sandbox")
6868
except AttributeError:
6969
pass
70-
70+
edge_options._botcity_temp_dir = None
7171
if not user_data_dir:
7272
temp_dir = tempfile.TemporaryDirectory(prefix="botcity_")
7373
user_data_dir = temp_dir.name
74-
edge_options.add_argument(f"--botcity-temp-dir={user_data_dir}")
74+
edge_options._botcity_temp_dir = user_data_dir
7575

7676
edge_options.add_argument(f"--user-data-dir={user_data_dir}")
7777

0 commit comments

Comments
 (0)