FIX: Ensuring the temp folder is deleted at the end

Author: joao-voltarelli

botcity/web/bot.py

@@ -43,13 +43,16 @@
 logger = logging.getLogger(__name__)
 
 
-def _cleanup(bot: ReferenceType[WebBot]):
-    if bot() is not None:
+def _cleanup(driver, temp_dir):
+    if driver() is not None:
+        try:
+            if driver().service.is_connectable():
+                driver().quit()
+        except Exception:
+            pass
+
+    if temp_dir:
         try:
-            bot().stop_browser()
-            temp_dir = bot()._botcity_temp_dir
-            if not temp_dir:
-                return None
             shutil.rmtree(temp_dir, ignore_errors=True)
         except Exception:
             pass
@@ -94,8 +97,6 @@ def __init__(self, headless=False):
         self._download_folder_path = os.getcwd()
         self._botcity_temp_dir = None
 
-        atexit.register(_cleanup, ref(self))
-
     def __enter__(self):
         pass
 
@@ -279,10 +280,11 @@ def check_driver():
         self.capabilities = cap
         driver_path = self.driver_path or check_driver()
         self.driver_path = driver_path
-
         self._driver = driver_class(options=opt, desired_capabilities=cap, executable_path=driver_path)
         self.set_screen_resolution()
 
+        atexit.register(_cleanup, ref(self._driver), self.options._botcity_temp_dir)
+
     def stop_browser(self):
         """
         Stops the Chrome browser and clean up the User Data Directory.