Allow manually configuring the path to Firefox

src/cmd/launch_profile.rs

@@ -42,9 +42,12 @@ pub fn process_cmd_launch_profile(app_state: &AppState,
         Err(e) => { log::info!("Failed to focus current browser window, launching new window: {:?}", e); }
     }
 
-    let parent_proc = match get_parent_proc_path() {
-        Ok(v) => v,
-        Err(e) => return NativeResponse::error_with_dbg_msg("Unable to find browser binary!", e)
+    let parent_proc = match app_state.config.browser_binary() {
+        Some(v) => v.clone(),
+        None => match get_parent_proc_path() {
+            Ok(v) => v,
+            Err(e) => return NativeResponse::error_with_dbg_msg("Unable to find browser binary!", e)
+        }
     };
 
     if !parent_proc.exists() {

src/config.rs

@@ -7,17 +7,25 @@ use std::fs::OpenOptions;
 
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct Config {
-    pub browser_profile_dir: PathBuf
+    browser_profile_dir: Option<PathBuf>,
+    browser_binary: Option<PathBuf>
 }
 
 impl Config {
+    pub fn browser_profile_dir(&self) -> PathBuf {
+        self.browser_profile_dir.clone().unwrap_or_else(get_default_browser_profile_folder)
+    }
+    pub fn browser_binary(&self) -> Option<&PathBuf> {
+        self.browser_binary.as_ref()
+    }
+
     pub fn profiles_ini_path(&self) -> PathBuf {
-        let mut profiles_ini = self.browser_profile_dir.clone();
+        let mut profiles_ini = self.browser_profile_dir().clone();
         profiles_ini.push("profiles.ini");
         return profiles_ini;
     }
     pub fn installs_ini_path(&self) -> PathBuf {
-        let mut installs_ini = self.browser_profile_dir.clone();
+        let mut installs_ini = self.browser_profile_dir().clone();
         installs_ini.push("installs.ini");
         return installs_ini;
     }
@@ -51,7 +59,8 @@ fn get_default_browser_profile_folder() -> PathBuf {
 impl Default for Config {
     fn default() -> Self {
         Config {
-            browser_profile_dir: get_default_browser_profile_folder()
+            browser_profile_dir: None,
+            browser_binary: None
         }
     }
 }

src/profiles.rs

@@ -24,7 +24,7 @@ pub struct ProfileEntry {
 impl ProfileEntry {
     pub fn full_path(&self, config: &Config) -> PathBuf {
         return if self.is_relative {
-            let mut result = config.browser_profile_dir.clone();
+            let mut result = config.browser_profile_dir().clone();
             result.push(&self.path);
             result
         } else {