Skip to content

Commit ee2317b

Browse files
committed
FIX: Adding _botcity_temp_dir in all browsers
1 parent 3eb8e2a commit ee2317b

File tree

5 files changed

+4
-20
lines changed

5 files changed

+4
-20
lines changed

botcity/web/bot.py

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,26 +47,11 @@
4747

4848
def _cleanup(bot: ReferenceType[WebBot]):
4949

50-
def get_botcity_temp_dir(opt, browser_name):
51-
browsers = {
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,
55-
Browser.FIREFOX: None,
56-
Browser.IE: None
57-
}
58-
return browsers.get(browser_name, None)
59-
6050
if bot() is not None:
6151
try:
6252
options = bot().options
63-
name = bot().browser
6453
bot().stop_browser()
65-
if not bot():
66-
return None
67-
temp_dir = get_botcity_temp_dir(options, name)
68-
if not temp_dir:
69-
return None
54+
temp_dir = options._botcity_temp_dir
7055
shutil.rmtree(temp_dir, ignore_errors=True)
7156
except Exception:
7257
pass

botcity/web/browsers/chrome.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ 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-
chrome_options._botcity_temp_dir = None
7473
if not user_data_dir:
7574
temp_dir = tempfile.TemporaryDirectory(prefix="botcity_")
7675
user_data_dir = temp_dir.name

botcity/web/browsers/edge.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ 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-
edge_options._botcity_temp_dir = None
70+
7171
if not user_data_dir:
7272
temp_dir = tempfile.TemporaryDirectory(prefix="botcity_")
7373
user_data_dir = temp_dir.name

botcity/web/browsers/firefox.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ def default_options(headless=False, download_folder_path=None, user_data_dir=Non
362362
if not user_data_dir:
363363
temp_dir = tempfile.TemporaryDirectory(prefix="botcity_")
364364
user_data_dir = temp_dir.name
365-
atexit.register(cleanup_temp_dir, temp_dir)
365+
firefox_options._botcity_temp_dir = user_data_dir
366366
if binary_path:
367367
firefox_options.binary_location = str(binary_path)
368368
firefox_options.set_preference("profile", user_data_dir)

botcity/web/browsers/undetected_chrome.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def default_options(headless=False, download_folder_path=None, user_data_dir=Non
7777
if not user_data_dir:
7878
temp_dir = tempfile.TemporaryDirectory(prefix="botcity_")
7979
user_data_dir = temp_dir.name
80-
atexit.register(cleanup_temp_dir, temp_dir)
80+
chrome_options._botcity_temp_dir = user_data_dir
8181

8282
chrome_options.add_argument(f"--user-data-dir={user_data_dir}")
8383

0 commit comments

Comments
 (0)