[Rust] Refactors (#11832)

oriongonza · OrionGonzalez · diemol · web-flow · commit 4bf979b33426 · 2023-04-05T11:16:47.000+02:00
* Refactor so that it's more concise

* cargo fmt

* I found it too verbose

* String interpolation

* Since the error message is the same now put it in the chain.

* Added never return type so I can remove the calls to exit()

---------

Co-authored-by: ogonzalez &lt;ogonzalez@iconmm.com&gt;
Co-authored-by: Diego Molina &lt;diemol@users.noreply.github.com&gt;
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
@@ -307,24 +307,17 @@ pub trait SeleniumManager {
         }
 
         if !self.is_safari() {
-            let (in_path_driver_version, in_path_driver_path) = self.find_driver_in_path();
-            if let (Some(found_driver_version), Some(found_driver_path)) =
-                (in_path_driver_version, in_path_driver_path)
-            {
-                if found_driver_version.eq(self.get_driver_version()) {
+            if let (Some(version), Some(path)) = self.find_driver_in_path() {
+                if version == self.get_driver_version() {
                     self.get_logger().debug(format!(
-                        "Found {} {} in PATH: {}",
-                        self.get_driver_name(),
-                        found_driver_version,
-                        found_driver_path
+                        "Found {} {version} in PATH: {path}",
+                        self.get_driver_name()
                     ));
-                    return Ok(PathBuf::from(found_driver_path));
+                    return Ok(PathBuf::from(path));
                 } else {
                     self.get_logger().warn(format!(
-                        "Incompatible release of {} (version {}) detected in PATH: {}",
-                        self.get_driver_name(),
-                        found_driver_version,
-                        found_driver_path
+                        "Incompatible release of {} (version {version}) detected in PATH: {path}",
+                        self.get_driver_name()
                     ));
                 }
             }
diff --git a/rust/src/main.rs b/rust/src/main.rs
@@ -15,14 +15,13 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use std::error::Error;
-
 use std::process::exit;
 
 use clap::Parser;
 
 use exitcode::DATAERR;
 
+use exitcode::OK;
 use selenium_manager::config::BooleanKey;
 use selenium_manager::logger::Logger;
 use selenium_manager::REQUEST_TIMEOUT_SEC;
@@ -101,7 +100,7 @@ struct Cli {
     clear_metadata: bool,
 }
 
-fn main() -> Result<(), Box<dyn Error>> {
+fn main() {
     let cli = Cli::parse();
     let debug = cli.debug || BooleanKey("debug", false).get_value();
     let trace = cli.trace || BooleanKey("trace", false).get_value();
@@ -122,56 +121,39 @@ fn main() -> Result<(), Box<dyn Error>> {
         get_manager_by_browser(browser_name).unwrap_or_else(|err| {
             log.error(err);
             flush_and_exit(DATAERR, &log);
-            exit(DATAERR);
         })
     } else if !driver_name.is_empty() {
         get_manager_by_driver(driver_name).unwrap_or_else(|err| {
             log.error(err);
             flush_and_exit(DATAERR, &log);
-            exit(DATAERR);
         })
     } else {
         log.error("You need to specify a browser or driver".to_string());
         flush_and_exit(DATAERR, &log);
-        exit(DATAERR);
     };
 
     selenium_manager.set_logger(log);
     selenium_manager.set_browser_version(cli.browser_version.unwrap_or_default());
     selenium_manager.set_driver_version(cli.driver_version.unwrap_or_default());
     selenium_manager.set_browser_path(cli.browser_path.unwrap_or_default());
-    match selenium_manager.set_timeout(cli.timeout) {
-        Ok(_) => {}
-        Err(err) => {
-            selenium_manager.get_logger().error(err);
-            flush_and_exit(DATAERR, selenium_manager.get_logger());
-        }
-    }
-    match selenium_manager.set_proxy(cli.proxy.unwrap_or_default()) {
-        Ok(_) => {}
-        Err(err) => {
-            selenium_manager.get_logger().error(err);
-            flush_and_exit(DATAERR, selenium_manager.get_logger());
-        }
-    }
-
-    match selenium_manager.resolve_driver() {
-        Ok(driver_path) => {
-            selenium_manager
-                .get_logger()
-                .info(driver_path.display().to_string());
-            flush_and_exit(0, selenium_manager.get_logger());
-        }
-        Err(err) => {
-            selenium_manager.get_logger().error(err.to_string());
-            flush_and_exit(DATAERR, selenium_manager.get_logger());
-        }
-    };
 
-    Ok(())
+    selenium_manager
+        .set_timeout(cli.timeout)
+        .and_then(|_| selenium_manager.set_proxy(cli.proxy.unwrap_or_default()))
+        .and_then(|_| selenium_manager.resolve_driver().map_err(|x| x.to_string()))
+        .and_then(|path| {
+            let log = selenium_manager.get_logger();
+            log.info(path.display().to_string());
+            flush_and_exit(OK, &log);
+        })
+        .unwrap_or_else(|err| {
+            let log = selenium_manager.get_logger();
+            log.error(err);
+            flush_and_exit(DATAERR, &log);
+        });
 }
 
-fn flush_and_exit(code: i32, log: &Logger) {
+fn flush_and_exit(code: i32, log: &Logger) -> ! {
     log.set_code(code);
     log.flush();
     exit(code);
