Merge a9583c3 into dfacbe0

bonigarcia · web-flow · commit 0340853574b9 · 2023-10-17T16:20:09.000Z
diff --git a/rust/src/config.rs b/rust/src/config.rs
@@ -55,6 +55,8 @@ pub struct ManagerConfig {
     pub offline: bool,
     pub force_browser_download: bool,
     pub avoid_browser_download: bool,
+    pub skip_driver_in_path: bool,
+    pub skip_browser_in_path: bool,
 }
 
 impl ManagerConfig {
@@ -111,6 +113,8 @@ impl ManagerConfig {
             offline: BooleanKey("offline", false).get_value(),
             force_browser_download: BooleanKey("force-browser-download", false).get_value(),
             avoid_browser_download: BooleanKey("avoid-browser-download", false).get_value(),
+            skip_driver_in_path: BooleanKey("skip-driver-in-path", false).get_value(),
+            skip_browser_in_path: BooleanKey("skip-browser-in-path", false).get_value(),
         }
     }
 }
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
@@ -382,7 +382,16 @@ pub trait SeleniumManager {
             // Check browser in PATH
             let browser_in_path = self.find_browser_in_path();
             if let Some(path) = &browser_in_path {
-                self.set_browser_path(path_to_string(path));
+                if self.is_skip_browser_in_path() {
+                    self.get_logger().debug(format!(
+                        "Skipping {} in path: {}",
+                        self.get_browser_name(),
+                        path.display()
+                    ));
+                    return None;
+                } else {
+                    self.set_browser_path(path_to_string(path));
+                }
             }
             browser_in_path
         }
@@ -775,8 +784,16 @@ pub trait SeleniumManager {
                     self.get_major_browser_version()
                 ));
             }
-            self.set_driver_version(version.to_string());
-            return Ok(PathBuf::from(path));
+            if self.is_skip_driver_in_path() {
+                self.get_logger().debug(format!(
+                    "Skipping {} in path: {}",
+                    self.get_driver_name(),
+                    path
+                ));
+            } else {
+                self.set_driver_version(version.to_string());
+                return Ok(PathBuf::from(path));
+            }
         }
 
         // If driver was not in the PATH, try to find it in the cache
@@ -1327,6 +1344,26 @@ pub trait SeleniumManager {
         }
     }
 
+    fn is_skip_driver_in_path(&self) -> bool {
+        self.get_config().skip_driver_in_path
+    }
+
+    fn set_skip_driver_in_path(&mut self, skip_driver_in_path: bool) {
+        if skip_driver_in_path {
+            self.get_config_mut().skip_driver_in_path = true;
+        }
+    }
+
+    fn is_skip_browser_in_path(&self) -> bool {
+        self.get_config().skip_browser_in_path
+    }
+
+    fn set_skip_browser_in_path(&mut self, skip_browser_in_path: bool) {
+        if skip_browser_in_path {
+            self.get_config_mut().skip_browser_in_path = true;
+        }
+    }
+
     fn get_cache_path(&self) -> Result<Option<PathBuf>, Error> {
         let path = Path::new(&self.get_config().cache_path);
         match create_path_if_not_exists(path) {
diff --git a/rust/src/main.rs b/rust/src/main.rs
@@ -131,6 +131,14 @@ struct Cli {
     /// Avoid to download browser (even when browser-version is specified)
     #[clap(long)]
     avoid_browser_download: bool,
+
+    /// Not using drivers found in the PATH
+    #[clap(long)]
+    skip_driver_in_path: bool,
+
+    /// Not using browsers found in the PATH
+    #[clap(long)]
+    skip_browser_in_path: bool,
 }
 
 fn main() {
@@ -196,6 +204,8 @@ fn main() {
     selenium_manager.set_avoid_browser_download(cli.avoid_browser_download);
     selenium_manager.set_cache_path(cache_path.clone());
     selenium_manager.set_offline(cli.offline);
+    selenium_manager.set_skip_driver_in_path(cli.skip_driver_in_path);
+    selenium_manager.set_skip_browser_in_path(cli.skip_browser_in_path);
 
     if cli.clear_cache || BooleanKey("clear-cache", false).get_value() {
         clear_cache(selenium_manager.get_logger(), &cache_path);

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,8 @@ pub struct ManagerConfig {`
`55`	`55`	`pub offline: bool,`
`56`	`56`	`pub force_browser_download: bool,`
`57`	`57`	`pub avoid_browser_download: bool,`
	`58`	`+ pub skip_driver_in_path: bool,`
	`59`	`+ pub skip_browser_in_path: bool,`
`58`	`60`	`}`
`59`	`61`
`60`	`62`	`impl ManagerConfig {`
`@@ -111,6 +113,8 @@ impl ManagerConfig {`
`111`	`113`	`offline: BooleanKey("offline", false).get_value(),`
`112`	`114`	`force_browser_download: BooleanKey("force-browser-download", false).get_value(),`
`113`	`115`	`avoid_browser_download: BooleanKey("avoid-browser-download", false).get_value(),`
	`116`	`+ skip_driver_in_path: BooleanKey("skip-driver-in-path", false).get_value(),`
	`117`	`+ skip_browser_in_path: BooleanKey("skip-browser-in-path", false).get_value(),`
`114`	`118`	`}`
`115`	`119`	`}`
`116`	`120`	`}`