[rust] Simplify browser names per module in Selenium Manager

Author: bonigarcia

rust/src/chrome.rs

@@ -35,7 +35,7 @@ use crate::{
     FALLBACK_RETRIES, NIGHTLY, REG_QUERY, STABLE, WMIC_COMMAND, WMIC_COMMAND_ENV,
 };
 
-pub const CHROME_NAMES: &[&str] = &["chrome"];
+pub const CHROME_NAME: &str = "chrome";
 pub const CHROMEDRIVER_NAME: &str = "chromedriver";
 const DRIVER_URL: &str = "https://chromedriver.storage.googleapis.com/";
 const LATEST_RELEASE: &str = "LATEST_RELEASE";
@@ -51,7 +51,7 @@ pub struct ChromeManager {
 impl ChromeManager {
     pub fn new() -> Box<Self> {
         Box::new(ChromeManager {
-            browser_name: CHROME_NAMES[0],
+            browser_name: CHROME_NAME,
             driver_name: CHROMEDRIVER_NAME,
             config: ManagerConfig::default(),
             http_client: create_default_http_client(),

rust/src/edge.rs

@@ -34,7 +34,7 @@ use crate::{
     REG_QUERY, STABLE, WMIC_COMMAND, WMIC_COMMAND_ENV,
 };
 
-pub const EDGE_NAME: &[&str] = &["edge", "msedge", "microsoftedge"];
+pub const EDGE_NAMES: &[&str] = &["edge", "msedge", "microsoftedge"];
 pub const EDGEDRIVER_NAME: &str = "msedgedriver";
 const DRIVER_URL: &str = "https://msedgedriver.azureedge.net/";
 const LATEST_STABLE: &str = "LATEST_STABLE";
@@ -51,7 +51,7 @@ pub struct EdgeManager {
 impl EdgeManager {
     pub fn new() -> Box<Self> {
         Box::new(EdgeManager {
-            browser_name: EDGE_NAME[0],
+            browser_name: EDGE_NAMES[0],
             driver_name: EDGEDRIVER_NAME,
             config: ManagerConfig::default(),
             http_client: create_default_http_client(),

rust/src/firefox.rs

@@ -34,7 +34,7 @@ use crate::{
     WMIC_COMMAND_ENV,
 };
 
-pub const FIREFOX_NAME: &[&str] = &["firefox"];
+pub const FIREFOX_NAME: &str = "firefox";
 pub const GECKODRIVER_NAME: &str = "geckodriver";
 const DRIVER_URL: &str = "https://github.com/mozilla/geckodriver/releases/";
 const LATEST_RELEASE: &str = "latest";
@@ -50,7 +50,7 @@ pub struct FirefoxManager {
 impl FirefoxManager {
     pub fn new() -> Box<Self> {
         Box::new(FirefoxManager {
-            browser_name: FIREFOX_NAME[0],
+            browser_name: FIREFOX_NAME,
             driver_name: GECKODRIVER_NAME,
             config: ManagerConfig::default(),
             http_client: create_default_http_client(),

rust/src/iexplorer.rs

@@ -30,7 +30,7 @@ use crate::metadata::{
     create_driver_metadata, get_driver_version_from_metadata, get_metadata, write_metadata,
 };
 
-pub const IE_NAME: &[&str] = &[
+pub const IE_NAMES: &[&str] = &[
     "iexplorer",
     "ie",
     "internetexplorer",
@@ -52,7 +52,7 @@ pub struct IExplorerManager {
 impl IExplorerManager {
     pub fn new() -> Box<Self> {
         Box::new(IExplorerManager {
-            browser_name: IE_NAME[0],
+            browser_name: IE_NAMES[0],
             driver_name: IEDRIVER_NAME,
             config: ManagerConfig::default(),
             http_client: create_default_http_client(),

rust/src/lib.rs

@@ -15,11 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use crate::chrome::{ChromeManager, CHROMEDRIVER_NAME, CHROME_NAMES};
-use crate::edge::{EdgeManager, EDGEDRIVER_NAME, EDGE_NAME};
+use crate::chrome::{ChromeManager, CHROMEDRIVER_NAME, CHROME_NAME};
+use crate::edge::{EdgeManager, EDGEDRIVER_NAME, EDGE_NAMES};
 use crate::files::compose_cache_folder;
 use crate::firefox::{FirefoxManager, FIREFOX_NAME, GECKODRIVER_NAME};
-use crate::iexplorer::{IExplorerManager, IEDRIVER_NAME, IE_NAME};
+use crate::iexplorer::{IExplorerManager, IEDRIVER_NAME, IE_NAMES};
 use crate::safari::{SafariManager, SAFARIDRIVER_NAME, SAFARI_NAME};
 use std::fs;
 
@@ -38,7 +38,7 @@ use crate::logger::Logger;
 use crate::metadata::{
     create_browser_metadata, get_browser_version_from_metadata, get_metadata, write_metadata,
 };
-use crate::safaritp::{SafariTPManager, SAFARITP_NAME};
+use crate::safaritp::{SafariTPManager, SAFARITP_NAMES};
 
 pub mod chrome;
 pub mod config;
@@ -257,7 +257,7 @@ pub trait SeleniumManager {
     }
 
     fn is_safari(&self) -> bool {
-        self.get_browser_name().contains(SAFARI_NAME[0])
+        self.get_browser_name().contains(SAFARI_NAME)
     }
 
     fn is_browser_version_unstable(&self) -> bool {
@@ -435,17 +435,17 @@ pub trait SeleniumManager {
 
 pub fn get_manager_by_browser(browser_name: String) -> Result<Box<dyn SeleniumManager>, String> {
     let browser_name_lower_case = browser_name.to_ascii_lowercase();
-    if CHROME_NAMES.contains(&browser_name_lower_case.as_str()) {
+    if browser_name_lower_case.eq(CHROME_NAME) {
         Ok(ChromeManager::new())
-    } else if FIREFOX_NAME.contains(&browser_name_lower_case.as_str()) {
+    } else if browser_name_lower_case.eq(FIREFOX_NAME) {
         Ok(FirefoxManager::new())
-    } else if EDGE_NAME.contains(&browser_name_lower_case.as_str()) {
+    } else if EDGE_NAMES.contains(&browser_name_lower_case.as_str()) {
         Ok(EdgeManager::new())
-    } else if IE_NAME.contains(&browser_name_lower_case.as_str()) {
+    } else if IE_NAMES.contains(&browser_name_lower_case.as_str()) {
         Ok(IExplorerManager::new())
-    } else if SAFARI_NAME.contains(&browser_name_lower_case.as_str()) {
+    } else if browser_name_lower_case.eq(SAFARI_NAME) {
         Ok(SafariManager::new())
-    } else if SAFARITP_NAME.contains(&browser_name_lower_case.as_str()) {
+    } else if SAFARITP_NAMES.contains(&browser_name_lower_case.as_str()) {
         Ok(SafariTPManager::new())
     } else {
         Err(format!("Invalid browser name: {browser_name}"))

rust/src/safari.rs

@@ -29,7 +29,7 @@ use crate::{
     create_default_http_client, format_one_arg, Logger, SeleniumManager, PLIST_COMMAND, STABLE,
 };
 
-pub const SAFARI_NAME: &[&str] = &["safari"];
+pub const SAFARI_NAME: &str = "safari";
 pub const SAFARIDRIVER_NAME: &str = "safaridriver";
 
 pub struct SafariManager {
@@ -43,7 +43,7 @@ pub struct SafariManager {
 impl SafariManager {
     pub fn new() -> Box<Self> {
         Box::new(SafariManager {
-            browser_name: SAFARI_NAME[0],
+            browser_name: SAFARI_NAME,
             driver_name: SAFARIDRIVER_NAME,
             config: ManagerConfig::default(),
             http_client: create_default_http_client(),

rust/src/safaritp.rs

@@ -29,7 +29,7 @@ use crate::{
     create_default_http_client, format_one_arg, Logger, SeleniumManager, PLIST_COMMAND, STABLE,
 };
 
-pub const SAFARITP_NAME: &[&str] = &[
+pub const SAFARITP_NAMES: &[&str] = &[
     "safaritp",
     "safari technology preview",
     r#"safari\ technology\ preview"#,
@@ -48,7 +48,7 @@ pub struct SafariTPManager {
 impl SafariTPManager {
     pub fn new() -> Box<Self> {
         Box::new(SafariTPManager {
-            browser_name: SAFARITP_NAME[0],
+            browser_name: SAFARITP_NAMES[0],
             driver_name: SAFARITPDRIVER_NAME,
             config: ManagerConfig::default(),
             http_client: create_default_http_client(),