[rust] Include registry query command (for Windows) to discover Firefox version

Author: bonigarcia

rust/src/firefox.rs

@@ -29,9 +29,9 @@ use crate::metadata::{
  create_driver_metadata, get_driver_version_from_metadata, get_metadata, write_metadata,
 };
 use crate::{
- create_http_client, format_one_arg, format_three_args, Logger, SeleniumManager, BETA,
- DASH_VERSION, DEV, ENV_PROGRAM_FILES, ENV_PROGRAM_FILES_X86, NIGHTLY, REMOVE_X86, STABLE,
- WMIC_COMMAND, WMIC_COMMAND_ENV,
+ create_http_client, format_one_arg, format_three_args, format_two_args, Logger,
+ SeleniumManager, BETA, DASH_VERSION, DEV, ENV_PROGRAM_FILES, ENV_PROGRAM_FILES_X86, NIGHTLY,
+ REG_QUERY_FIND, REMOVE_X86, STABLE, WMIC_COMMAND, WMIC_COMMAND_ENV,
 };
 
 pub const FIREFOX_NAME: &str = "firefox";
@@ -139,6 +139,13 @@ impl SeleniumManager for FirefoxManager {
  browser_path,
  ),
  ];
+ if !self.is_browser_version_unstable() {
+ commands.push(format_two_args(
+ REG_QUERY_FIND,
+ r#"HKCU\Software\Mozilla"#,
+ self.browser_name,
+ ));
+ }
  }
  _ => return None,
  }

rust/src/lib.rs

@@ -65,6 +65,7 @@ pub const WMIC_COMMAND_ENV: &str =
  r#"set PFILES=%{}{}%&& wmic datafile where name='!PFILES:\=\\!{}' get Version /value"#;
 pub const WMIC_COMMAND_OS: &str = r#"wmic os get osarchitecture"#;
 pub const REG_QUERY: &str = r#"REG QUERY {} /v version"#;
+pub const REG_QUERY_FIND: &str = r#"REG QUERY {} /f {}"#;
 pub const PLIST_COMMAND: &str =
  r#"/usr/libexec/PlistBuddy -c "print :CFBundleShortVersionString" {}/Contents/Info.plist"#;
 pub const DASH_VERSION: &str = "{} -v";
@@ -542,6 +543,10 @@ pub fn format_one_arg(string: &str, arg1: &str) -> String {
  string.replacen("{}", arg1, 1)
 }
 
+pub fn format_two_args(string: &str, arg1: &str, arg2: &str) -> String {
+ string.replacen("{}", arg1, 1).replacen("{}", arg2, 1)
+}
+
 pub fn format_three_args(string: &str, arg1: &str, arg2: &str, arg3: &str) -> String {
  string
  .replacen("{}", arg1, 1)