From 4c1708d74b30b2b982a55a5a3a3ce1ccac32a10e Mon Sep 17 00:00:00 2001
From: technicca <cake3327@gmail.com>
Date: Sun, 28 Jan 2024 22:28:37 +0300
Subject: 1. Discover chromedriver dynamically with "which". 2. Use "finally"
 in WebDriverSession.__exit__

---
 g4f/webdriver.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'g4f')

diff --git a/g4f/webdriver.py b/g4f/webdriver.py
index ee03ff66..44765402 100644
--- a/g4f/webdriver.py
+++ b/g4f/webdriver.py
@@ -15,6 +15,7 @@ except ImportError:
     has_requirements = False
 
 import time  
+from shutil import which
 from os import path
 from os import access, R_OK
 from .errors import MissingRequirementsError
@@ -55,7 +56,9 @@ def get_browser(
     if proxy:
         options.add_argument(f'--proxy-server={proxy}')
     # Check for system driver in docker
-    driver = '/usr/bin/chromedriver'
+    driver = which('chromedriver')
+    if not driver:
+        driver = '/usr/bin/chromedriver'
     if not path.isfile(driver) or not access(driver, R_OK):
         driver = None
     return Chrome(
@@ -218,7 +221,8 @@ class WebDriverSession:
             except Exception as e:
                 if debug.logging:
                     print(f"Error closing WebDriver: {e}")
-            self.default_driver.quit()
+            finally:
+                self.default_driver.quit()
         if self.virtual_display:
             self.virtual_display.stop()  
   
-- 
cgit v1.2.3