Install Instances in Custom Directories

Cargo.toml

@@ -23,7 +23,10 @@ espim = "0.2"
 flate2 = "1.0"
 fs_extra = "1.3.0"
 futures = "0.3"
-iced_aw = { git = "https://github.com/iced-rs/iced_aw.git", rev = "9ed46bffd0d819f22e07db6c282fbef733007df5", default-features = false, features = ["tabs", "icons"] }
+iced_aw = { git = "https://github.com/iced-rs/iced_aw.git", rev = "9ed46bffd0d819f22e07db6c282fbef733007df5", default-features = false, features = [
+    "tabs",
+    "icons",
+] }
 lazy_static = "1.5"
 log = { version = "0.4.22", features = ["std"] }
 open = "5"
@@ -41,17 +44,29 @@ time = "0.3"
 tokio = { version = "1", default-features = false, features = ["fs"] }
 ureq = { version = "2.9", default-features = false, features = ["json", "tls"] }
 version = "3"
-zip-extract = { version = "0.1.3", default-features = false, features = ["deflate"] }
+zip-extract = { version = "0.1.3", default-features = false, features = [
+    "deflate",
+] }
+rfd = { version = "0.14.1", default-features = false, features = [
+    "tokio",
+    "xdg-portal",
+] }
 
 [dependencies.iced]
 version = "0.12.1"
 default-features = false
-features = ["web-colors", "advanced", "image", "tokio"]
+features = [
+    "web-colors",
+    "advanced",
+    "image",
+    "tokio",
+    "wgpu",       # tiny-skia backend panics with text in rows: https://github.com/iced-rs/iced/issues/2332
+]
 
 [target.'cfg(windows)'.build-dependencies]
 winres = "0.1"
 
 [profile.release]
 strip = true
-opt-level = 'z'  # Optimize for size.
+opt-level = 'z' # Optimize for size.
 lto = true

src/install_frame.rs

@@ -1,4 +1,5 @@
 use crate::instance::{get_instances_dir, InstanceType};
+use crate::settings::Settings;
 use crate::style::text_button;
 use crate::{instance, Message};
 use core::fmt;
@@ -57,10 +58,18 @@ impl fmt::Display for InstanceSourceType {
 }
 
 impl InstallFrame {
-    pub fn update(&mut self, message: InstallFrameMessage) -> Command<Message> {
+    pub fn update(
+        &mut self,
+        message: InstallFrameMessage,
+        settings: &mut Settings,
+    ) -> Command<Message> {
         match message {
             InstallFrameMessage::StartInstallation(instance_type) => {
-                if let Some(mut destination) = get_instances_dir() {
+                if let Some(mut destination) = if settings.use_custom_install_dir {
+                    settings.custom_install_dir.clone()
+                } else {
+                    get_instances_dir()
+                } {
                     destination.push(&self.name);
                     return Command::perform(
                         instance::perform_install(

src/main.rs

@@ -157,7 +157,9 @@ impl Application for ESLauncher {
 
     fn update(&mut self, message: Self::Message) -> Command<Message> {
         match message {
-            Message::InstallFrameMessage(msg) => return self.install_frame.update(msg),
+            Message::InstallFrameMessage(msg) => {
+                return self.install_frame.update(msg, &mut self.settings)
+            }
             Message::InstanceMessage(name, msg) => {
                 match self.instances_frame.instances.get_mut(&name) {
                     None => error!("Failed to find internal Instance with name {}", &name),
@@ -174,7 +176,7 @@ impl Application for ESLauncher {
                     }
                 }
             }
-            Message::SettingsMessage(msg) => self.settings.update(msg),
+            Message::SettingsMessage(msg) => return self.settings.update(msg),
             Message::AddInstance(instance) => {
                 let is_ready = instance.state.is_ready();
                 self.instances_frame
@@ -197,9 +199,7 @@ impl Application for ESLauncher {
                     MusicCommand::Play => MusicState::Playing,
                     _ => self.settings.music_state,
                 };
-                if let Err(e) = self.settings.save() {
-                    error!("Failed to save settings.json: {:#?}", e);
-                };
+                self.settings.save();
             }
             Message::TabSelected(active_tab) => self.active_tab = active_tab,
             Message::PluginFrameLoaded(plugins) => {