Skip to content

Commit 3b16504

Browse files
bonigarciabonigarcia
committed
[rust] Simplify browser names per module in Selenium Manager
1 parent 50bf0ac commit 3b16504

7 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎rust/src/chrome.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ use crate::{
3535
FALLBACK_RETRIES, NIGHTLY, REG_QUERY, STABLE, WMIC_COMMAND, WMIC_COMMAND_ENV,
3636
};
3737

38-
pub const CHROME_NAMES: &[&str] = &["chrome"];
38+
pub const CHROME_NAME: &str = "chrome";
3939
pub const CHROMEDRIVER_NAME: &str = "chromedriver";
4040
const DRIVER_URL: &str = "https://chromedriver.storage.googleapis.com/";
4141
const LATEST_RELEASE: &str = "LATEST_RELEASE";
@@ -51,7 +51,7 @@ pub struct ChromeManager {
5151
impl ChromeManager {
5252
pub fn new() -> Box<Self> {
5353
Box::new(ChromeManager {
54-
browser_name: CHROME_NAMES[0],
54+
browser_name: CHROME_NAME,
5555
driver_name: CHROMEDRIVER_NAME,
5656
config: ManagerConfig::default(),
5757
http_client: create_default_http_client(),

‎rust/src/edge.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use crate::{
3434
REG_QUERY, STABLE, WMIC_COMMAND, WMIC_COMMAND_ENV,
3535
};
3636

37-
pub const EDGE_NAME: &[&str] = &["edge", "msedge", "microsoftedge"];
37+
pub const EDGE_NAMES: &[&str] = &["edge", "msedge", "microsoftedge"];
3838
pub const EDGEDRIVER_NAME: &str = "msedgedriver";
3939
const DRIVER_URL: &str = "https://msedgedriver.azureedge.net/";
4040
const LATEST_STABLE: &str = "LATEST_STABLE";
@@ -51,7 +51,7 @@ pub struct EdgeManager {
5151
impl EdgeManager {
5252
pub fn new() -> Box<Self> {
5353
Box::new(EdgeManager {
54-
browser_name: EDGE_NAME[0],
54+
browser_name: EDGE_NAMES[0],
5555
driver_name: EDGEDRIVER_NAME,
5656
config: ManagerConfig::default(),
5757
http_client: create_default_http_client(),

‎rust/src/firefox.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use crate::{
3434
WMIC_COMMAND_ENV,
3535
};
3636

37-
pub const FIREFOX_NAME: &[&str] = &["firefox"];
37+
pub const FIREFOX_NAME: &str = "firefox";
3838
pub const GECKODRIVER_NAME: &str = "geckodriver";
3939
const DRIVER_URL: &str = "https://github.com/mozilla/geckodriver/releases/";
4040
const LATEST_RELEASE: &str = "latest";
@@ -50,7 +50,7 @@ pub struct FirefoxManager {
5050
impl FirefoxManager {
5151
pub fn new() -> Box<Self> {
5252
Box::new(FirefoxManager {
53-
browser_name: FIREFOX_NAME[0],
53+
browser_name: FIREFOX_NAME,
5454
driver_name: GECKODRIVER_NAME,
5555
config: ManagerConfig::default(),
5656
http_client: create_default_http_client(),

‎rust/src/iexplorer.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use crate::metadata::{
3030
create_driver_metadata, get_driver_version_from_metadata, get_metadata, write_metadata,
3131
};
3232

33-
pub const IE_NAME: &[&str] = &[
33+
pub const IE_NAMES: &[&str] = &[
3434
"iexplorer",
3535
"ie",
3636
"internetexplorer",
@@ -52,7 +52,7 @@ pub struct IExplorerManager {
5252
impl IExplorerManager {
5353
pub fn new() -> Box<Self> {
5454
Box::new(IExplorerManager {
55-
browser_name: IE_NAME[0],
55+
browser_name: IE_NAMES[0],
5656
driver_name: IEDRIVER_NAME,
5757
config: ManagerConfig::default(),
5858
http_client: create_default_http_client(),

‎rust/src/lib.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
use crate::chrome::{ChromeManager, CHROMEDRIVER_NAME, CHROME_NAMES};
19-
use crate::edge::{EdgeManager, EDGEDRIVER_NAME, EDGE_NAME};
18+
use crate::chrome::{ChromeManager, CHROMEDRIVER_NAME, CHROME_NAME};
19+
use crate::edge::{EdgeManager, EDGEDRIVER_NAME, EDGE_NAMES};
2020
use crate::files::compose_cache_folder;
2121
use crate::firefox::{FirefoxManager, FIREFOX_NAME, GECKODRIVER_NAME};
22-
use crate::iexplorer::{IExplorerManager, IEDRIVER_NAME, IE_NAME};
22+
use crate::iexplorer::{IExplorerManager, IEDRIVER_NAME, IE_NAMES};
2323
use crate::safari::{SafariManager, SAFARIDRIVER_NAME, SAFARI_NAME};
2424
use std::fs;
2525

@@ -38,7 +38,7 @@ use crate::logger::Logger;
3838
use crate::metadata::{
3939
create_browser_metadata, get_browser_version_from_metadata, get_metadata, write_metadata,
4040
};
41-
use crate::safaritp::{SafariTPManager, SAFARITP_NAME};
41+
use crate::safaritp::{SafariTPManager, SAFARITP_NAMES};
4242

4343
pub mod chrome;
4444
pub mod config;
@@ -257,7 +257,7 @@ pub trait SeleniumManager {
257257
}
258258

259259
fn is_safari(&self) -> bool {
260-
self.get_browser_name().contains(SAFARI_NAME[0])
260+
self.get_browser_name().contains(SAFARI_NAME)
261261
}
262262

263263
fn is_browser_version_unstable(&self) -> bool {
@@ -435,17 +435,17 @@ pub trait SeleniumManager {
435435

436436
pub fn get_manager_by_browser(browser_name: String) -> Result<Box<dyn SeleniumManager>, String> {
437437
let browser_name_lower_case = browser_name.to_ascii_lowercase();
438-
if CHROME_NAMES.contains(&browser_name_lower_case.as_str()) {
438+
if browser_name_lower_case.eq(CHROME_NAME) {
439439
Ok(ChromeManager::new())
440-
} else if FIREFOX_NAME.contains(&browser_name_lower_case.as_str()) {
440+
} else if browser_name_lower_case.eq(FIREFOX_NAME) {
441441
Ok(FirefoxManager::new())
442-
} else if EDGE_NAME.contains(&browser_name_lower_case.as_str()) {
442+
} else if EDGE_NAMES.contains(&browser_name_lower_case.as_str()) {
443443
Ok(EdgeManager::new())
444-
} else if IE_NAME.contains(&browser_name_lower_case.as_str()) {
444+
} else if IE_NAMES.contains(&browser_name_lower_case.as_str()) {
445445
Ok(IExplorerManager::new())
446-
} else if SAFARI_NAME.contains(&browser_name_lower_case.as_str()) {
446+
} else if browser_name_lower_case.eq(SAFARI_NAME) {
447447
Ok(SafariManager::new())
448-
} else if SAFARITP_NAME.contains(&browser_name_lower_case.as_str()) {
448+
} else if SAFARITP_NAMES.contains(&browser_name_lower_case.as_str()) {
449449
Ok(SafariTPManager::new())
450450
} else {
451451
Err(format!("Invalid browser name: {browser_name}"))

‎rust/src/safari.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ use crate::{
2929
create_default_http_client, format_one_arg, Logger, SeleniumManager, PLIST_COMMAND, STABLE,
3030
};
3131

32-
pub const SAFARI_NAME: &[&str] = &["safari"];
32+
pub const SAFARI_NAME: &str = "safari";
3333
pub const SAFARIDRIVER_NAME: &str = "safaridriver";
3434

3535
pub struct SafariManager {
@@ -43,7 +43,7 @@ pub struct SafariManager {
4343
impl SafariManager {
4444
pub fn new() -> Box<Self> {
4545
Box::new(SafariManager {
46-
browser_name: SAFARI_NAME[0],
46+
browser_name: SAFARI_NAME,
4747
driver_name: SAFARIDRIVER_NAME,
4848
config: ManagerConfig::default(),
4949
http_client: create_default_http_client(),

‎rust/src/safaritp.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ use crate::{
2929
create_default_http_client, format_one_arg, Logger, SeleniumManager, PLIST_COMMAND, STABLE,
3030
};
3131

32-
pub const SAFARITP_NAME: &[&str] = &[
32+
pub const SAFARITP_NAMES: &[&str] = &[
3333
"safaritp",
3434
"safari technology preview",
3535
r#"safari\ technology\ preview"#,
@@ -48,7 +48,7 @@ pub struct SafariTPManager {
4848
impl SafariTPManager {
4949
pub fn new() -> Box<Self> {
5050
Box::new(SafariTPManager {
51-
browser_name: SAFARITP_NAME[0],
51+
browser_name: SAFARITP_NAMES[0],
5252
driver_name: SAFARITPDRIVER_NAME,
5353
config: ManagerConfig::default(),
5454
http_client: create_default_http_client(),

0 commit comments

Comments
 (0)