[rust] Improve logic for checking files that already exists while unzipping

Author: bonigarcia

rust/src/files.rs

@@ -136,6 +136,9 @@ pub fn unzip(
         if single_file.is_none() {
             create_path_if_not_exists(target)?;
             out_path = target.join(path);
+        } else if out_path.exists() {
+            unzipped_files = 1;
+            break;
         }
 
         if single_file.is_none() && file.name().ends_with('/') {
@@ -151,11 +154,11 @@ pub fn unzip(
                 file.size()
             ));
             create_parent_path_if_not_exists(out_path.as_path())?;
+            unzipped_files += 1;
 
             if !out_path.exists() {
                 let mut outfile = File::create(&out_path)?;
                 io::copy(&mut file, &mut outfile)?;
-                unzipped_files += 1;
 
                 // Set permissions in Unix-like systems
                 #[cfg(unix)]

rust/src/lib.rs

@@ -840,7 +840,8 @@ pub trait SeleniumManager {
 
     fn set_offline(&mut self, offline: bool) {
         if offline {
-            self.get_logger().debug("Using Selenium Manager in offline mode");
+            self.get_logger()
+                .debug("Using Selenium Manager in offline mode");
             self.get_config_mut().offline = true;
         }
     }

rust/tests/cache_tests.rs

@@ -43,6 +43,6 @@ fn cache_path_test() {
     assert!(!driver_path.contains(r#"cache\selenium"#));
 
     let tmp_cache_path = Path::new(tmp_cache_folder_name);
-    fs::remove_dir_all(&tmp_cache_path).unwrap();
+    fs::remove_dir_all(tmp_cache_path).unwrap();
     assert!(!tmp_cache_path.exists());
 }

rust/tests/common.rs

@@ -58,8 +58,8 @@ pub fn get_driver_path(cmd: &mut Command) -> String {
 
 #[allow(dead_code)]
 pub fn exec_driver(cmd: &mut Command) -> String {
-    let mut cmd_mut = cmd.borrow_mut();
-    let driver_path = get_driver_path(&mut cmd_mut);
+    let cmd_mut = cmd.borrow_mut();
+    let driver_path = get_driver_path(cmd_mut);
     let driver_version_command = shell::Command::new_single(format!("{} --version", &driver_path));
     let output = run_shell_command_by_os(OS, driver_version_command).unwrap();
     println!("**** EXEC DRIVER: {}", output);

rust/tests/offline_tests.rs

@@ -21,15 +21,10 @@ use std::str;
 #[test]
 fn offline_test() {
     let mut cmd = Command::new(env!("CARGO_BIN_EXE_selenium-manager"));
-    cmd.args([
-        "--debug",
-        "--browser",
-        "chrome",
-        "--offline",
-    ])
-    .assert()
-    .success()
-    .code(0);
+    cmd.args(["--debug", "--browser", "chrome", "--offline"])
+        .assert()
+        .success()
+        .code(0);
 
     let stdout = &cmd.unwrap().stdout;
     let output = str::from_utf8(stdout).unwrap();

rust/tests/timeout_tests.rs

@@ -20,13 +20,7 @@ use assert_cmd::Command;
 #[test]
 fn timeout_error_test() {
     let mut cmd = Command::new(env!("CARGO_BIN_EXE_selenium-manager"));
-    cmd.args([
-        "--debug",
-        "--browser",
-        "edge",
-        "--timeout",
-        "-1",
-    ])
-    .assert()
-    .failure();
+    cmd.args(["--debug", "--browser", "edge", "--timeout", "-1"])
+        .assert()
+        .failure();
 }