scrapped refactors from old PR (#11907)

oriongonza · OrionGonzalez · bonigarcia · web-flow · commit bd7bdcb3abc8 · 2023-04-19T12:54:11.000+02:00
* scrapped refactors from old PR

* Revert str_to_os

---------

Co-authored-by: ogonzalez &lt;ogonzalez@iconmm.com&gt;
Co-authored-by: Boni García &lt;boni.garcia@uc3m.es&gt;
diff --git a/rust/src/config.rs b/rust/src/config.rs
@@ -88,21 +88,6 @@ impl ManagerConfig {
             driver_ttl: IntegerKey("driver-ttl", TTL_DRIVERS_SEC).get_value(),
         }
     }
-
-    #[allow(clippy::should_implement_trait)]
-    pub fn clone(config: &ManagerConfig) -> ManagerConfig {
-        ManagerConfig {
-            browser_version: config.browser_version.as_str().to_string(),
-            driver_version: config.driver_version.as_str().to_string(),
-            os: config.os.as_str().to_string(),
-            arch: config.arch.as_str().to_string(),
-            browser_path: config.browser_path.as_str().to_string(),
-            proxy: config.proxy.as_str().to_string(),
-            timeout: config.timeout,
-            browser_ttl: config.browser_ttl,
-            driver_ttl: config.driver_ttl,
-        }
-    }
 }
 
 #[allow(dead_code)]
diff --git a/rust/src/files.rs b/rust/src/files.rs
@@ -60,8 +60,8 @@ pub fn create_path_if_not_exists(path: &Path) {
 }
 
 pub fn uncompress(
-    compressed_file: &String,
-    target: PathBuf,
+    compressed_file: &str,
+    target: &PathBuf,
     log: &Logger,
 ) -> Result<(), Box<dyn Error>> {
     let file = File::open(compressed_file)?;
@@ -89,7 +89,7 @@ pub fn uncompress(
     Ok(())
 }
 
-pub fn untargz(file: File, target: PathBuf, log: &Logger) -> Result<(), Box<dyn Error>> {
+pub fn untargz(file: File, target: &PathBuf, log: &Logger) -> Result<(), Box<dyn Error>> {
     log.trace(format!("Untargz file to {}", target.display()));
     let tar = GzDecoder::new(&file);
     let mut archive = Archive::new(tar);
@@ -102,7 +102,7 @@ pub fn untargz(file: File, target: PathBuf, log: &Logger) -> Result<(), Box<dyn
     Ok(())
 }
 
-pub fn unzip(file: File, target: PathBuf, log: &Logger) -> Result<(), Box<dyn Error>> {
+pub fn unzip(file: File, target: &Path, log: &Logger) -> Result<(), Box<dyn Error>> {
     log.trace(format!("Unzipping file to {}", target.display()));
     let mut archive = ZipArchive::new(file)?;
 
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
@@ -131,7 +131,7 @@ pub trait SeleniumManager {
         let (_tmp_folder, driver_zip_file) =
             download_driver_to_tmp_folder(self.get_http_client(), driver_url, self.get_logger())?;
         let driver_path_in_cache = Self::get_driver_path_in_cache(self);
-        uncompress(&driver_zip_file, driver_path_in_cache, self.get_logger())
+        uncompress(&driver_zip_file, &driver_path_in_cache, self.get_logger())
     }
 
     fn detect_browser_path(&self) -> Option<&str> {

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ pub trait SeleniumManager {`
`131`	`131`	`let (_tmp_folder, driver_zip_file) =`
`132`	`132`	`download_driver_to_tmp_folder(self.get_http_client(), driver_url, self.get_logger())?;`
`133`	`133`	`let driver_path_in_cache = Self::get_driver_path_in_cache(self);`
`134`		`- uncompress(&driver_zip_file, driver_path_in_cache, self.get_logger())`
	`134`	`+ uncompress(&driver_zip_file, &driver_path_in_cache, self.get_logger())`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`fn detect_browser_path(&self) -> Option<&str> {`