Added config file

Added Steam and Among Us process detection

Added ability to auto-run the blessed build

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "town-of-us-updater"
-version = "3.0.0"
+version = "4.1.0"
 edition = "2021"
 build = "src/build.rs"
 
@@ -12,11 +12,15 @@ regex = "1.5"
 fs_extra = "1.2.0"
 dirs = "4.0.0"
 reqwest = {version = "0.11.11", features = ["blocking"]}
-iui = "0.3.0"
+serde = {version= "1.0.143", features = ["derive"]}
 serde_json = "1.0"
+md-5 = "0.10.5"
 tokio = {version="1", features=["full"]}
-druid = "0.7.0"
 registry = "1"
+egui = "0.20.1"
+eframe = "0.20.1"
+rfd = "0.10"
+tasklist = "0.2.12"
 
 [build-dependencies]
 embed-resource = "1.6"

src/among_us_launcher_widget.rs

@@ -1,205 +0,0 @@
-use crate::AmongUsVersion;
-use crate::AppData;
-use druid::{
-    widget::*, BoxConstraints, Color, Env, Event, EventCtx, FileDialogOptions, LayoutCtx,
-    LifeCycle, LifeCycleCtx, PaintCtx, Selector, Size, UpdateCtx, WidgetExt, WidgetPod,
-};
-use std::{fs, io, path::PathBuf};
-
-pub const ATTEMPT_INSTALL: Selector = Selector::new("town-of-us-updater.attempt_install");
-pub const DETERMINE_AMONG_US_VERSION: Selector =
-    Selector::new("town-of-us-updater.determine_among_us_version");
-pub const COPY_FOLDER: Selector = Selector::new("town-of-us-updater.copy_folder");
-
-pub struct AmongUsLauncherWidget {
-    pub root: WidgetPod<AppData, Flex<AppData>>,
-}
-
-impl AmongUsLauncherWidget {
-    pub fn build_widget(&mut self, data: &AppData) {
-        let mut flex: Flex<AppData> = Flex::column();
-
-        match &data.app_state {
-            crate::GlobalAppState::Initializing(_a) => {
-                let label = Label::new("Initializing...").with_text_size(24.0).center();
-                flex.add_flex_child(label, 1.0);
-                self.root = WidgetPod::new(flex);
-                return;
-            }
-            _ => {}
-        }
-        // Find existing installs, make buttons for them
-        let install_iter = fs::read_dir(data.installs_path.clone());
-
-        if let Ok(iter) = install_iter {
-            let mut collection: Vec<Result<fs::DirEntry, io::Error>> = iter.collect();
-            collection.reverse();
-
-            if collection.is_empty() {
-                if data.among_us_path.is_empty() {
-                    // We did not find an install path, let's add a button to prompt the user
-                    // to find their install path
-                    let open_button = Button::new("Locate Among Us")
-                        .fix_height(45.0)
-                        .on_click(move |ctx, _: &mut AppData, _| {
-                            ctx.submit_command(
-                                druid::commands::SHOW_OPEN_PANEL.with(FileDialogOptions::new()),
-                            );
-                        })
-                        .center();
-                    flex.add_flex_child(open_button, 1.0);
-                } else {
-                    let label: druid::widget::Label<AppData> =
-                        druid::widget::Label::new("We found Among Us but you have no installs");
-                    flex.add_flex_child(label, 1.0);
-                }
-            } else {
-                // Iterate first to find labels:
-
-                let mut flexbox_array: Vec<druid::widget::Flex<AppData>> = Vec::new();
-                let mut auv_array: Vec<AmongUsVersion> = Vec::new();
-
-                for i in &collection {
-                    let existing_ver_smash = i.as_ref().unwrap().file_name();
-                    let mut ver_smash_split = existing_ver_smash.to_str().unwrap().split('-');
-                    let among_us_version = AmongUsVersion::from(ver_smash_split.next().unwrap());
-                    if !auv_array.contains(&among_us_version) {
-                        auv_array.push(among_us_version);
-                    }
-                }
-
-                auv_array.sort();
-
-                for among_us_version in &auv_array {
-                    println!("{}", among_us_version);
-                    let label_text = format!("Among Us {}", among_us_version);
-                    let flex: druid::widget::Flex<AppData> = druid::widget::Flex::column()
-                        .with_flex_child(
-                            druid::widget::Label::new(label_text.as_str()).with_text_size(24.0),
-                            1.0,
-                        )
-                        .with_default_spacer();
-                    flexbox_array.push(flex);
-                }
-
-                println!("Installs list:");
-
-                for i in collection {
-                    let existing_ver_smash = i.unwrap().file_name();
-                    let mut ver_smash_split = existing_ver_smash.to_str().unwrap().split('-');
-                    let mut blessed_split = data.blessed_version.as_str().split('-');
-                    let blessed_version = AmongUsVersion::from(blessed_split.next().unwrap());
-                    let among_us_version = AmongUsVersion::from(ver_smash_split.next().unwrap());
-                    let tou_version = ver_smash_split.next().unwrap();
-                    let blessed_tou_version = blessed_split.next().unwrap();
-                    let button_string: String = format!("Town of Us {}", tou_version);
-
-                    for (index, j) in auv_array.iter().enumerate() {
-                        if j == &among_us_version {
-                            let mut clone: PathBuf = PathBuf::from(data.installs_path.clone());
-                            clone.push(existing_ver_smash.clone());
-
-                            let mut button_label: Label<AppData> =
-                                Label::new(button_string.as_str()).with_text_size(24.0);
-
-                            if j == &blessed_version && tou_version == blessed_tou_version {
-                                button_label.set_text_color(Color::GREEN);
-                            }
-
-                            let mut button_row: Flex<AppData> = Flex::row();
-
-                            let fybutton = druid::widget::Button::from_label(button_label)
-                                .fix_height(45.0)
-                                .center()
-                                .on_click(move |_, _: &mut AppData, _| {
-                                    crate::attempt_run_among_us(&clone);
-                                    // crate::launch_better_crewlink().unwrap();
-                                });
-
-                            button_row.add_flex_child(fybutton, 1.0);
-
-                            // TODO: Uncomment
-                            // let delete_button = druid::widget::Button::new("Delete")
-                            //     .fix_height(45.0)
-                            //     .on_click(move |_, _: &mut AppData, _| {});
-
-                            // button_row.add_flex_child(delete_button, 1.0);
-
-                            flexbox_array
-                                .get_mut(index)
-                                .unwrap()
-                                .add_flex_child(button_row, 1.0);
-
-                            println!("- {}", existing_ver_smash.clone().to_str().unwrap());
-                        }
-                    }
-                }
-
-                flexbox_array.reverse();
-
-                for i in flexbox_array {
-                    flex.add_flex_child(i, 1.0);
-                }
-            }
-        }
-        self.root = WidgetPod::new(flex);
-    }
-}
-
-impl Widget<AppData> for AmongUsLauncherWidget {
-    fn event(&mut self, ctx: &mut EventCtx, event: &Event, data: &mut AppData, env: &Env) {
-        // println!("{:?}", event);
-        // println!("{:?}", data);
-        match event {
-            Event::MouseDown(_a) => {
-                // println!("Mouse Down!");
-                self.root.event(ctx, event, data, env);
-            }
-            Event::WindowConnected => {
-                self.build_widget(data);
-                ctx.children_changed();
-            }
-            Event::KeyDown(evt) => {
-                if evt.code == druid::Code::F5 {
-                    ctx.submit_command(ATTEMPT_INSTALL);
-                }
-            }
-            _ => {
-                self.root.event(ctx, event, data, env);
-            }
-        }
-    }
-    fn lifecycle(&mut self, ctx: &mut LifeCycleCtx, event: &LifeCycle, data: &AppData, env: &Env) {
-        self.root.lifecycle(ctx, event, data, env);
-        // println!("Lifecycle!")
-    }
-    fn update(&mut self, ctx: &mut UpdateCtx, old_data: &AppData, data: &AppData, env: &Env) {
-        self.root.update(ctx, data, env);
-        println!("{:?}", data);
-        if old_data.among_us_path.is_empty() && !data.among_us_path.is_empty() {
-            ctx.submit_command(DETERMINE_AMONG_US_VERSION);
-            // println!("Detect Stuff");
-        } else if old_data.among_us_version != data.among_us_version {
-            ctx.submit_command(ATTEMPT_INSTALL);
-        }
-        // println!("Update!");
-        self.build_widget(data);
-        ctx.children_changed();
-    }
-    fn layout(
-        &mut self,
-        ctx: &mut LayoutCtx,
-        bc: &BoxConstraints,
-        data: &AppData,
-        env: &Env,
-    ) -> Size {
-        self.root.layout(ctx, bc, data, env);
-        // println!("Layout!");
-        bc.constrain((400.0, 400.0))
-    }
-
-    fn paint(&mut self, ctx: &mut PaintCtx, data: &AppData, env: &Env) {
-        self.root.paint(ctx, data, env);
-        // println!("Paint!");
-    }
-}

src/among_us_version.rs

@@ -1,13 +1,18 @@
-use druid::Data;
 use std::fmt;
 
-#[derive(Ord, PartialOrd, Eq, PartialEq, Clone, Debug, Data)]
+#[derive(Ord, PartialOrd, Eq, PartialEq, Clone, Debug)]
 pub struct AmongUsVersion {
     year: i32,
     month: i32,
     day: i32,
 }
 
+impl AmongUsVersion {
+    pub fn as_american_string(&self) -> String {
+        format!("{}-{}-{}", self.month, self.day, self.year)
+    }
+}
+
 impl fmt::Display for AmongUsVersion {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "{}.{}.{}", self.year, self.month, self.day)
@@ -48,3 +53,39 @@ impl From<(i32, i32, i32)> for AmongUsVersion {
         }
     }
 }
+
+#[test]
+fn ordering_test() {
+    let mut vec = Vec::new();
+    vec.push(AmongUsVersion {
+        year: 2019,
+        month: 1,
+        day: 25,
+    });
+
+    vec.push(AmongUsVersion {
+        year: 2022,
+        month: 12,
+        day: 25,
+    });
+
+    vec.push(AmongUsVersion {
+        year: 2022,
+        month: 12,
+        day: 14,
+    });
+
+    vec.push(AmongUsVersion {
+        year: 2022,
+        month: 12,
+        day: 8,
+    });
+    vec.sort();
+    assert_eq!(vec[0].year, 2019);
+    assert_eq!(vec[1].year, 2022);
+    assert_eq!(vec[1].day, 8);
+    assert_eq!(vec[2].year, 2022);
+    assert_eq!(vec[2].day, 14);
+    assert_eq!(vec[3].year, 2022);
+    assert_eq!(vec[3].day, 25);
+}

src/app_data.rs

@@ -0,0 +1,636 @@
+// Crate imports
+use crate::among_us_version::*;
+use crate::config;
+use crate::config::*;
+use crate::semver::*;
+
+// Other imports
+use eframe::egui;
+use std::thread::JoinHandle;
+use std::{
+    fs,
+    path::{Path, PathBuf},
+    process, thread,
+};
+
+#[derive(PartialEq, Eq, Clone, Debug)]
+pub enum InitializingState {
+    StartingGUI,
+    FindingAmongUs,
+    DeterminingVersion,
+    DeterminingToUVersion,
+    CopyingAmongUs,
+    UnmoddingAmongUs,
+    DownloadingZip,
+    Unzipping,
+    ModdingAmongUs,
+}
+
+#[derive(PartialEq, Eq, Clone, Debug)]
+pub enum GlobalAppState {
+    Initializing(InitializingState),
+    Initialized,
+    Installing,
+    Playing,
+}
+
+#[derive(Debug)]
+pub struct AppData {
+    pub among_us_path: String,
+    pub installs_path: String,
+    pub version: SemVer,
+    pub delete_mode: bool,
+    pub among_us_version: AmongUsVersion,
+    pub data_path: String,
+    pub app_state: GlobalAppState,
+    pub blessed_version: String,
+    pub update_installs_list: bool,
+    pub installs_last_update_time: std::time::Instant,
+    pub installs_list: Vec<PathBuf>,
+    pub init_install_path: Option<PathBuf>,
+    pub init_download_url: Option<String>,
+    pub launcher_running: bool,
+    pub config: AppConfig,
+    pub among_us_launched: bool,
+    pub among_us_running: bool,
+
+    // Thread handles
+    pub find_among_us_handle: Option<JoinHandle<Option<(String, LauncherType)>>>,
+    pub determine_au_version_handle: Option<JoinHandle<Option<AmongUsVersion>>>,
+    pub determine_tou_version_handle: Option<JoinHandle<Option<(String, String, bool)>>>,
+    pub copy_au_handle: Option<JoinHandle<()>>,
+    pub download_tou_handle: Option<JoinHandle<()>>,
+}
+
+impl Default for AppData {
+    fn default() -> AppData {
+        AppData {
+            among_us_path: String::new(),
+            installs_path: String::new(),
+            version: SemVer {
+                major: 0,
+                minor: 0,
+                patch: 0,
+            },
+            delete_mode: false,
+            among_us_version: AmongUsVersion::default(),
+            data_path: String::new(),
+            app_state: GlobalAppState::Initialized,
+            blessed_version: String::new(),
+            update_installs_list: true,
+            installs_last_update_time: std::time::Instant::now(),
+            installs_list: Vec::new(),
+            init_install_path: None,
+            init_download_url: None,
+            launcher_running: false,
+            config: AppConfig::default(),
+            among_us_launched: false,
+            among_us_running: false,
+            find_among_us_handle: None,
+            determine_au_version_handle: None,
+            determine_tou_version_handle: None,
+            copy_au_handle: None,
+            download_tou_handle: None,
+        }
+    }
+}
+
+impl AppData {
+    pub fn detect_running_stores(&mut self) {
+        if cfg!(windows) {
+            unsafe {
+                let tl = tasklist::Tasklist::new();
+                self.launcher_running = false;
+                for i in tl {
+                    if i.get_pname() == "steam.exe" {
+                        self.launcher_running = true;
+                        // println!("Steam running!");
+                    } else if i.get_pname() == "EpicGamesLauncher.exe" {
+                        // println!("Epic is running!");
+                    } else {
+                    }
+                }
+            }
+        }
+    }
+
+    pub fn detect_running_among_us(&mut self) {
+        if cfg!(windows) {
+            unsafe {
+                let tl = tasklist::Tasklist::new();
+                self.among_us_running = false;
+                for i in tl {
+                    if i.get_pname() == "Among Us.exe" {
+                        self.among_us_running = true;
+                    }
+                }
+            }
+        }
+    }
+
+    pub fn on_path_added(&mut self) {
+        if self.among_us_path.is_empty() {
+            return;
+        }
+
+        if let Some(among_us_version) =
+            crate::determine_among_us_version(String::from(self.among_us_path.clone()))
+        {
+            self.among_us_version = among_us_version.clone();
+            println!("AmongUsVersion: {}", among_us_version);
+        }
+
+        self.app_state = GlobalAppState::Initializing(InitializingState::DeterminingVersion);
+        let ver_url: (String, String, bool) =
+            crate::determine_town_of_us_url(self.among_us_version.to_string().clone()).unwrap();
+
+        let version_smash = format!("{}-{}", self.among_us_version, ver_url.0.clone());
+        let new_installed_path: PathBuf = [self.installs_path.as_str(), version_smash.as_str()]
+            .iter()
+            .collect();
+
+        if !Path::exists(&new_installed_path) {
+            println!("Copying Among Us to cache location...");
+            crate::copy_folder_to_target(self.among_us_path.clone(), self.installs_path.clone());
+
+            let among_us_path: PathBuf = [self.installs_path.as_str(), "Among Us"].iter().collect();
+
+            if !among_us_path.to_str().unwrap().contains("Among Us") {
+                process::exit(0);
+            }
+
+            // Un-mod whatever we found if it's modded
+            crate::unmod_among_us_folder(&among_us_path);
+
+            println!(
+                "Renaming {} to {}",
+                among_us_path.to_str().unwrap(),
+                new_installed_path.to_str().unwrap()
+            );
+
+            let mut perms = fs::metadata(among_us_path.clone()).unwrap().permissions();
+            perms.set_readonly(false);
+            fs::set_permissions(among_us_path.clone(), perms).unwrap();
+
+            fs::rename(among_us_path, new_installed_path.clone()).unwrap();
+            let mut download_path: PathBuf = [self.data_path.as_str()].iter().collect();
+            let downloaded_filename: &str = ver_url.1.rsplit('/').next().unwrap();
+            download_path.push(downloaded_filename);
+
+            if !download_path.exists() {
+                // println!("{:?}", download_path);
+                println!(
+                    "Downloading Town of Us... Please be patient! [{}]",
+                    ver_url.1.clone()
+                );
+                let client = reqwest::blocking::Client::builder()
+                    .timeout(None)
+                    .build()
+                    .unwrap();
+                let zip_request = client.get(ver_url.1.clone()).build().unwrap();
+                let zip = client.execute(zip_request).unwrap().bytes().unwrap();
+                fs::write(download_path.clone(), zip).unwrap();
+            }
+
+            let opened_zip = fs::File::open(download_path.clone()).unwrap();
+            println!("Extracting mod zip file...");
+            let mut archive = zip::ZipArchive::new(opened_zip).unwrap();
+            archive.extract(self.data_path.clone()).unwrap();
+
+            fs::remove_file(download_path).unwrap();
+
+            let mut root_folder_path = String::new();
+            for i in archive.file_names() {
+                root_folder_path = String::from(i.split('/').next().unwrap());
+                break;
+            }
+            let extracted_path: PathBuf = [self.data_path.as_str(), root_folder_path.as_str(), "."]
+                .iter()
+                .collect();
+            println!("{}", extracted_path.to_str().unwrap());
+            crate::copy_folder_contents_to_target(
+                extracted_path.to_str().unwrap(),
+                new_installed_path.to_str().unwrap(),
+            );
+        }
+        self.app_state = GlobalAppState::Initialized;
+        self.update_installs_list = true;
+    }
+
+    pub fn detect_installs(&mut self) {
+        let install_iter = fs::read_dir(self.installs_path.clone());
+        if let Ok(iter) = install_iter {
+            self.installs_list = iter
+                .map(|elem| PathBuf::from(elem.unwrap().file_name()))
+                .collect();
+        } else {
+            self.installs_list.clear();
+        }
+        self.installs_last_update_time = std::time::Instant::now();
+    }
+
+    fn draw_layout(&mut self, ui: &mut egui::Ui) {
+        let now = std::time::Instant::now();
+        if now.duration_since(self.installs_last_update_time) > std::time::Duration::from_secs(10) {
+            self.detect_installs();
+        }
+
+        let mut collection = self.installs_list.clone();
+
+        if collection.is_empty() {
+            if ui.button("Locate your Among Us Directory").clicked() {
+                if let Some(mut path) = rfd::FileDialog::new().pick_file() {
+                    path.pop();
+                    self.among_us_path = path.display().to_string();
+                    self.on_path_added();
+                }
+            }
+            return;
+        }
+
+        collection.reverse();
+        let mut auv_array: Vec<AmongUsVersion> = Vec::new();
+
+        for i in &collection {
+            let existing_ver_smash = i;
+            let mut ver_smash_split = existing_ver_smash.to_str().unwrap().split('-');
+            let among_us_version = AmongUsVersion::from(ver_smash_split.next().unwrap());
+            if !auv_array.contains(&among_us_version) {
+                auv_array.push(among_us_version);
+            }
+        }
+
+        auv_array.sort();
+        auv_array.reverse();
+
+        ui.separator();
+        for i in &auv_array {
+            ui.label(
+                egui::RichText::new(format!("Among Us {}", i.as_american_string())).size(35.0),
+            );
+            for j in &collection {
+                let existing_ver_smash = j;
+                let mut ver_smash_split = existing_ver_smash.to_str().unwrap().split('-');
+                let mut blessed_split = self.blessed_version.as_str().split('-');
+                let among_us_version = AmongUsVersion::from(ver_smash_split.next().unwrap());
+                let tou_version = ver_smash_split.next().unwrap();
+                let blessed_version = AmongUsVersion::from(blessed_split.next().unwrap());
+                let blessed_tou_version = blessed_split.next().unwrap();
+                let button_string: String = format!("Town of Us {}", tou_version);
+                if i == &among_us_version {
+                    let mut clone: PathBuf = PathBuf::from(self.installs_path.clone());
+                    clone.push(existing_ver_smash.clone());
+                    ui.horizontal(|ui| {
+                        if i == &blessed_version && tou_version == blessed_tou_version {
+                            let button_text = egui::RichText::new(button_string.clone())
+                                .size(25.0)
+                                .color(egui::Color32::GREEN);
+
+                            let auto_run = self.config.auto_run_blessed
+                                && !self.among_us_launched
+                                && self.launcher_running;
+
+                            if ui
+                                .add_enabled(!self.among_us_running, egui::Button::new(button_text))
+                                .clicked()
+                                || auto_run
+                            {
+                                crate::attempt_run_among_us(&clone);
+                                self.among_us_launched = true;
+                            }
+                        } else {
+                            let button_text = egui::RichText::new(button_string.clone()).size(25.0);
+                            if ui
+                                .add_enabled(!self.among_us_running, egui::Button::new(button_text))
+                                .clicked()
+                            {
+                                crate::attempt_run_among_us(&clone);
+                                self.among_us_launched = true;
+                            }
+                        }
+
+                        ui.set_enabled(true);
+
+                        if !self.delete_mode {
+                            ui.set_visible(false);
+                        }
+
+                        let button_text = egui::RichText::new("DELETE")
+                            .size(25.0)
+                            .color(egui::Color32::RED);
+
+                        if ui.button(button_text).clicked() {
+                            if i != &blessed_version || tou_version != blessed_tou_version {
+                                crate::attempt_delete_among_us(&clone);
+                                self.update_installs_list = true;
+                            }
+                        }
+
+                        ui.set_visible(true);
+                    });
+                }
+            }
+            ui.separator();
+        }
+    }
+}
+
+impl eframe::App for AppData {
+    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
+        match &mut self.app_state {
+            GlobalAppState::Initializing(sub_state) => match sub_state {
+                InitializingState::StartingGUI => {
+                    if !self.among_us_path.is_empty() {
+                        // If we pulled in a cached location, skip straight to ToU version check
+                        self.app_state =
+                            GlobalAppState::Initializing(InitializingState::DeterminingVersion);
+                    } else {
+                        self.app_state =
+                            GlobalAppState::Initializing(InitializingState::FindingAmongUs);
+                    }
+
+                    egui::CentralPanel::default().show(ctx, |ui| {
+                        ui.heading("Initializing...");
+                    });
+                    ctx.request_repaint();
+                }
+                InitializingState::FindingAmongUs => {
+                    // if !self.among_us_path.is_empty() {
+                    //     self.app_state =
+                    //         GlobalAppState::Initializing(InitializingState::DeterminingVersion);
+                    // }
+                    if self.find_among_us_handle.as_ref().is_some() {
+                        if self.find_among_us_handle.as_ref().unwrap().is_finished() {
+                            if let Some(handle) = self.find_among_us_handle.take() {
+                                println!("Thread done, retrieving data...");
+                                let (path, launcher_type) = handle.join().unwrap().unwrap();
+                                self.among_us_path = path.clone();
+                                self.config.among_us_path = Some(PathBuf::from(path));
+                                self.config.launcher_type = launcher_type;
+                                config::save_config(&self.config);
+                                self.app_state = GlobalAppState::Initializing(
+                                    InitializingState::DeterminingVersion,
+                                );
+                            }
+                        }
+                    } else {
+                        println!("Spawning thread...");
+                        self.find_among_us_handle = Some(thread::spawn(|| {
+                            return crate::detect_among_us_folder();
+                        }));
+                    }
+                    egui::CentralPanel::default().show(ctx, |ui| {
+                        ui.heading("Finding Among Us...");
+                    });
+                    ctx.request_repaint();
+                }
+                InitializingState::DeterminingVersion => {
+                    if self.among_us_version != AmongUsVersion::default() {
+                        self.app_state =
+                            GlobalAppState::Initializing(InitializingState::DeterminingToUVersion);
+                    } else {
+                        if self.determine_au_version_handle.as_ref().is_some() {
+                            if self
+                                .determine_au_version_handle
+                                .as_ref()
+                                .unwrap()
+                                .is_finished()
+                            {
+                                if let Some(handle) = self.determine_au_version_handle.take() {
+                                    println!("Thread done, retrieving data...");
+                                    self.among_us_version = handle.join().unwrap().unwrap();
+                                }
+                            }
+                        } else {
+                            println!("Spawning thread...");
+                            let path = self.among_us_path.clone();
+                            self.determine_au_version_handle = Some(thread::spawn(move || {
+                                return crate::determine_among_us_version(path);
+                            }));
+                        }
+                    }
+
+                    egui::CentralPanel::default().show(ctx, |ui| {
+                        ui.heading("Determining Among Us Version...");
+                    });
+                    ctx.request_repaint();
+                }
+                InitializingState::DeterminingToUVersion => {
+                    if self.determine_tou_version_handle.as_ref().is_some() {
+                        if self
+                            .determine_tou_version_handle
+                            .as_ref()
+                            .unwrap()
+                            .is_finished()
+                        {
+                            if let Some(handle) = self.determine_tou_version_handle.take() {
+                                println!("Thread done, retrieving data...");
+                                let result = handle.join().unwrap().unwrap();
+                                let version_smash =
+                                    format!("{}-{}", self.among_us_version, result.0.clone());
+                                let new_path: PathBuf =
+                                    [self.installs_path.as_str(), version_smash.as_str()]
+                                        .iter()
+                                        .collect();
+                                self.init_install_path = Some(new_path.clone());
+                                self.init_download_url = Some(result.1.clone());
+
+                                if !Path::exists(&new_path) {
+                                    self.app_state = GlobalAppState::Initializing(
+                                        InitializingState::CopyingAmongUs,
+                                    );
+                                } else {
+                                    self.app_state = GlobalAppState::Initialized;
+                                }
+                            }
+                        }
+                    } else {
+                        println!("Spawning thread...");
+                        let ver = self.among_us_version.clone();
+                        self.determine_tou_version_handle = Some(thread::spawn(move || {
+                            return crate::determine_town_of_us_url(ver.to_string());
+                        }));
+                    }
+
+                    egui::CentralPanel::default().show(ctx, |ui| {
+                        ui.heading("Determining Among Us Version...");
+                    });
+                    ctx.request_repaint();
+                }
+                InitializingState::CopyingAmongUs => {
+                    if self.copy_au_handle.as_ref().is_some() {
+                        if self.copy_au_handle.as_ref().unwrap().is_finished() {
+                            self.copy_au_handle = None;
+                            self.app_state =
+                                GlobalAppState::Initializing(InitializingState::UnmoddingAmongUs);
+                        }
+                    } else {
+                        println!("Spawning thread...");
+                        let among_us_path = self.among_us_path.clone();
+                        let installs_path = self.installs_path.clone();
+                        self.copy_au_handle = Some(thread::spawn(move || {
+                            println!("Copying Among Us to cache location...");
+                            crate::copy_folder_to_target(among_us_path, installs_path);
+                        }));
+                    }
+                    egui::CentralPanel::default().show(ctx, |ui| {
+                        ui.heading("Copying Among Us...");
+                    });
+                    ctx.request_repaint();
+                }
+                InitializingState::UnmoddingAmongUs => {
+                    if self.copy_au_handle.as_ref().is_some() {
+                        if self.copy_au_handle.as_ref().unwrap().is_finished() {
+                            self.copy_au_handle = None;
+                            self.app_state =
+                                GlobalAppState::Initializing(InitializingState::DownloadingZip);
+                        }
+                    } else {
+                        // TODO: This sucks
+                        let new_installed_path = self.init_install_path.as_ref().unwrap().clone();
+                        let installs_path = self.installs_path.clone();
+                        self.copy_au_handle = Some(thread::spawn(move || {
+                            let among_us_path: PathBuf =
+                                [installs_path.as_str(), "Among Us"].iter().collect();
+                            // Un-mod whatever we found if it's modded
+                            crate::unmod_among_us_folder(&among_us_path);
+
+                            println!(
+                                "Renaming {} to {}",
+                                among_us_path.to_str().unwrap(),
+                                new_installed_path.to_str().unwrap()
+                            );
+
+                            let mut perms =
+                                fs::metadata(among_us_path.clone()).unwrap().permissions();
+                            perms.set_readonly(false);
+                            fs::set_permissions(among_us_path.clone(), perms).unwrap();
+
+                            fs::rename(among_us_path, new_installed_path.clone()).unwrap();
+                        }));
+                    }
+                    egui::CentralPanel::default().show(ctx, |ui| {
+                        ui.heading("Unmodding Among Us...");
+                    });
+                    ctx.request_repaint();
+                }
+                InitializingState::DownloadingZip => {
+                    if self.download_tou_handle.as_ref().is_some() {
+                        if self.download_tou_handle.as_ref().unwrap().is_finished() {
+                            self.download_tou_handle = None;
+                            self.app_state =
+                                GlobalAppState::Initializing(InitializingState::Unzipping);
+                        }
+                    } else {
+                        let data_path = self.data_path.clone();
+                        let download_url = self.init_download_url.as_ref().unwrap().clone();
+                        self.download_tou_handle = Some(thread::spawn(move || {
+                            let mut download_path: PathBuf = [data_path.as_str()].iter().collect();
+                            let downloaded_filename: &str =
+                                download_url.rsplit('/').next().unwrap();
+                            download_path.push(downloaded_filename);
+
+                            if !download_path.exists() {
+                                println!(
+                                    "Downloading Town of Us... Please be patient! [{}]",
+                                    download_url.clone()
+                                );
+                                let client = reqwest::blocking::Client::builder()
+                                    .timeout(None)
+                                    .build()
+                                    .unwrap();
+                                let zip_request = client.get(download_url.clone()).build().unwrap();
+                                let zip = client.execute(zip_request).unwrap().bytes().unwrap();
+                                fs::write(download_path.clone(), zip).unwrap();
+                            }
+                        }));
+                    }
+                    egui::CentralPanel::default().show(ctx, |ui| {
+                        ui.heading("Downloading Town of Us...");
+                    });
+                    ctx.request_repaint();
+                }
+                InitializingState::Unzipping => {
+                    if self.download_tou_handle.as_ref().is_some() {
+                        if self.download_tou_handle.as_ref().unwrap().is_finished() {
+                            self.download_tou_handle = None;
+                            self.app_state = GlobalAppState::Initialized;
+                        }
+                    } else {
+                        let data_path = self.data_path.clone();
+                        let download_url = self.init_download_url.as_ref().unwrap().clone();
+                        let new_installed_path = self.init_install_path.as_ref().unwrap().clone();
+                        self.download_tou_handle = Some(thread::spawn(move || {
+                            let mut download_path: PathBuf = [data_path.as_str()].iter().collect();
+                            let downloaded_filename: &str =
+                                download_url.rsplit('/').next().unwrap();
+                            download_path.push(downloaded_filename);
+                            let opened_zip = fs::File::open(download_path.clone()).unwrap();
+                            println!("Extracting mod zip file...");
+                            let mut archive = zip::ZipArchive::new(opened_zip).unwrap();
+                            archive.extract(data_path.clone()).unwrap();
+
+                            fs::remove_file(download_path).unwrap();
+
+                            let mut root_folder_path = String::new();
+                            for i in archive.file_names() {
+                                root_folder_path = String::from(i.split('/').next().unwrap());
+                                break;
+                            }
+                            let extracted_path: PathBuf =
+                                [data_path.as_str(), root_folder_path.as_str(), "."]
+                                    .iter()
+                                    .collect();
+                            println!("{}", extracted_path.to_str().unwrap());
+                            crate::copy_folder_contents_to_target(
+                                extracted_path.to_str().unwrap(),
+                                new_installed_path.to_str().unwrap(),
+                            );
+                        }));
+                    }
+                    egui::CentralPanel::default().show(ctx, |ui| {
+                        ui.heading("Extracting Town of Us...");
+                        ui.heading("Modding Among Us...");
+                    });
+                    ctx.request_repaint();
+                }
+                _ => {}
+            },
+            GlobalAppState::Initialized => {
+                self.detect_running_stores();
+                self.detect_running_among_us();
+                if self.update_installs_list {
+                    self.detect_installs();
+                    self.update_installs_list = false;
+                }
+                egui::TopBottomPanel::bottom("bottom_panel").show(ctx, |ui| {
+                    ui.checkbox(&mut self.delete_mode, "DELETE MODE");
+                    if ui
+                        .checkbox(&mut self.config.auto_run_blessed, "Auto run blessed build")
+                        .clicked()
+                    {
+                        config::save_config(&self.config);
+                    };
+                });
+                egui::CentralPanel::default().show(ctx, |ui| {
+                    if !self.launcher_running {
+                        let warning_string = match self.config.launcher_type {
+                            LauncherType::Steam => "STEAM IS NOT RUNNING",
+                            LauncherType::Epic => "EPIC IS NOT RUNNING",
+                            _ => "UNKNOWN LAUNCHER USED",
+                        };
+                        let warning_text = egui::RichText::new(warning_string)
+                            // .size(25.0)
+                            .color(egui::Color32::RED);
+                        ui.heading(warning_text);
+                        ctx.request_repaint();
+                    }
+                    self.draw_layout(ui);
+                });
+            }
+            _ => {}
+        }
+        // app_data.on_path_added();
+        // app_data.detect_installs(); // Initial check since we only update every 10s
+    }
+}

src/config.rs

@@ -0,0 +1,39 @@
+use serde::{Deserialize, Serialize};
+use std::{fs, path::PathBuf};
+
+#[derive(Serialize, Deserialize, Default, Debug)]
+pub enum LauncherType {
+    #[default]
+    None,
+    Steam,
+    Epic,
+}
+
+#[derive(Serialize, Deserialize, Default, Debug)]
+pub struct AppConfig {
+    pub launcher_type: LauncherType,
+    pub among_us_path: Option<PathBuf>,
+    pub auto_run_blessed: bool,
+}
+
+pub fn load_config() -> Option<AppConfig> {
+    let mut config_path = dirs::data_dir().unwrap();
+    config_path.push("town-of-us-updater");
+    config_path.push("settings.json");
+    if let Ok(string) = fs::read_to_string(config_path) {
+        let app_config: AppConfig = serde_json::from_str(string.as_str()).unwrap();
+        return Some(app_config);
+    } else {
+        None
+    }
+}
+
+pub fn save_config(app_data: &AppConfig) {
+    println!("Saving config");
+    let mut config_path = dirs::data_dir().unwrap();
+    config_path.push("town-of-us-updater");
+    config_path.push("settings.json");
+
+    let json = serde_json::to_string_pretty(app_data).unwrap();
+    fs::write(config_path, json).unwrap();
+}

src/main.rs

@@ -1,18 +1,22 @@
-// Modules
+// Module definitions
-mod among_us_launcher_widget;
 mod among_us_version;
+mod app_data;
+mod config;
 mod semver;
 
-// Uses
+// Crate imports
-use among_us_launcher_widget::*;
 use among_us_version::*;
+use app_data::*;
+use config::LauncherType;
 
+// Other imports
+use md5::{Digest, Md5};
 use semver::*;
 
 use std::{
-    fs,
+    fs, io,
     path::{Path, PathBuf},
-    process, str,
+    process, str, thread,
 };
 
 use fs_extra::{copy_items, dir};
@@ -23,45 +27,12 @@ use regex::Regex;
 use registry::Hive;
 
 // GUI stuff
-use druid::{
+
-    commands, widget::*, AppDelegate, AppLauncher, Data, DelegateCtx, Env, Handled, Target,
+use eframe::egui;
-    WidgetPod, WindowDesc, WindowId,
-};
 
 use reqwest::StatusCode;
 
-#[derive(PartialEq, Eq, Data, Clone, Debug)]
+struct CombinedVersion(AmongUsVersion, SemVer);
-pub enum InitializingState {
-    StartingGUI,
-    DeterminingVersion,
-    CopyingAmongUs,
-    UnmoddingAmongUs,
-    DownloadingZip,
-    Unzipping,
-    CopyingZipIn,
-}
-
-#[derive(PartialEq, Eq, Data, Clone, Debug)]
-pub enum GlobalAppState {
-    Initializing(InitializingState),
-    Initialized,
-    Installing,
-    Playing,
-}
-
-struct Delegate;
-
-#[derive(Data, Clone, Debug)]
-pub struct AppData {
-    pub among_us_path: String,
-    pub installs_path: String,
-    pub version: SemVer,
-    pub initialized: bool,
-    pub among_us_version: AmongUsVersion,
-    pub data_path: String,
-    pub app_state: GlobalAppState,
-    pub blessed_version: String,
-}
 
 static AMONG_US_APPID: &str = "945360";
 
@@ -75,6 +46,10 @@ fn attempt_run_among_us(install_path: &Path) {
         .unwrap();
 }
 
+fn attempt_delete_among_us(install_path: &Path) {
+    fs::remove_dir_all(install_path).unwrap();
+}
+
 fn unmod_among_us_folder(folder_path: &Path) {
     println!("Unmodding Among Us...");
     let doorstop_path: PathBuf = [folder_path.to_str().unwrap(), "doorstop_config.ini"]
@@ -141,134 +116,8 @@ async fn _get_latest_updater_version() -> Result<(String, String), reqwest::Erro
     Ok((String::from("no"), String::from("yes")))
 }
 
-impl AppDelegate<AppData> for Delegate {
-    fn window_added(
-        &mut self,
-        _id: WindowId,
-        data: &mut AppData,
-        _env: &Env,
-        ctx: &mut DelegateCtx,
-    ) {
-        if !data.among_us_path.is_empty() {
-            ctx.submit_command(DETERMINE_AMONG_US_VERSION);
-        }
-    }
-    fn command(
-        &mut self,
-        _ctx: &mut DelegateCtx,
-        _target: Target,
-        cmd: &druid::Command,
-        data: &mut AppData,
-        _env: &Env,
-    ) -> Handled {
-        // println!("Command!");
-        if let Some(file_info) = cmd.get(commands::OPEN_FILE) {
-            let among_us_folder = file_info.path();
-            let mut buf = among_us_folder.to_path_buf();
-            buf.pop();
-            data.among_us_path = String::from(buf.to_str().unwrap());
-
-            // Pop the selected file off the end of the path
-            // among_us_folder.pop();
-            println!("{}", buf.to_str().unwrap());
-            // println!("Handled!");
-            //Application::global().quit();
-
-            return Handled::Yes;
-        } else if let Some(_a) = cmd.get(among_us_launcher_widget::DETERMINE_AMONG_US_VERSION) {
-            if let Some(among_us_version) =
-                determine_among_us_version(String::from(data.among_us_path.clone()))
-            {
-                data.among_us_version = among_us_version.clone();
-                println!("AmongUsVersion: {}", among_us_version);
-            }
-        } else if let Some(_a) = cmd.get(among_us_launcher_widget::ATTEMPT_INSTALL) {
-            data.app_state = GlobalAppState::Initializing(InitializingState::DeterminingVersion);
-            let ver_url: (String, String, bool) =
-                determine_town_of_us_url(data.among_us_version.to_string().clone()).unwrap();
-
-            let version_smash = format!("{}-{}", data.among_us_version, ver_url.0.clone());
-            let new_installed_path: PathBuf = [data.installs_path.as_str(), version_smash.as_str()]
-                .iter()
-                .collect();
-
-            if !Path::exists(&new_installed_path) {
-                println!("Copying Among Us to cache location...");
-                copy_folder_to_target(data.among_us_path.clone(), data.installs_path.clone());
-
-                let among_us_path: PathBuf =
-                    [data.installs_path.as_str(), "Among Us"].iter().collect();
-
-                if !among_us_path.to_str().unwrap().contains("Among Us") {
-                    process::exit(0);
-                }
-
-                // Un-mod whatever we found if it's modded
-                unmod_among_us_folder(&among_us_path);
-
-                println!(
-                    "Renaming {} to {}",
-                    among_us_path.to_str().unwrap(),
-                    new_installed_path.to_str().unwrap()
-                );
-
-                let mut perms = fs::metadata(among_us_path.clone()).unwrap().permissions();
-                perms.set_readonly(false);
-                fs::set_permissions(among_us_path.clone(), perms).unwrap();
-
-                fs::rename(among_us_path, new_installed_path.clone()).unwrap();
-                let mut download_path: PathBuf = [data.data_path.as_str()].iter().collect();
-                let downloaded_filename: &str = ver_url.1.rsplit('/').next().unwrap();
-                download_path.push(downloaded_filename);
-
-                if !download_path.exists() {
-                    // println!("{:?}", download_path);
-                    println!(
-                        "Downloading Town of Us... Please be patient! [{}]",
-                        ver_url.1.clone()
-                    );
-                    let client = reqwest::blocking::Client::builder()
-                        .timeout(None)
-                        .build()
-                        .unwrap();
-                    let zip_request = client.get(ver_url.1.clone()).build().unwrap();
-                    let zip = client.execute(zip_request).unwrap().bytes().unwrap();
-                    fs::write(download_path.clone(), zip).unwrap();
-                }
-
-                let opened_zip = fs::File::open(download_path.clone()).unwrap();
-                println!("Extracting mod zip file...");
-                let mut archive = zip::ZipArchive::new(opened_zip).unwrap();
-                archive.extract(data.data_path.clone()).unwrap();
-
-                fs::remove_file(download_path).unwrap();
-
-                let mut root_folder_path = String::new();
-                for i in archive.file_names() {
-                    root_folder_path = String::from(i.split('/').next().unwrap());
-                    break;
-                }
-                let extracted_path: PathBuf =
-                    [data.data_path.as_str(), root_folder_path.as_str(), "."]
-                        .iter()
-                        .collect();
-                println!("{}", extracted_path.to_str().unwrap());
-                copy_folder_contents_to_target(
-                    extracted_path.to_str().unwrap(),
-                    new_installed_path.to_str().unwrap(),
-                );
-            }
-            data.initialized = !data.initialized;
-            data.app_state = GlobalAppState::Initialized;
-
-            return Handled::Yes;
-        }
-
-        Handled::No
-    }
-}
-
 fn main() {
+    let app_config = config::load_config().unwrap_or_default();
     let version = env!("CARGO_PKG_VERSION");
     let title_string: String = format!("Town of Us Updater - {}", version);
     let blessed_body = reqwest::blocking::get("https://tou.dormedas.com/blessed");
@@ -281,9 +130,6 @@ fn main() {
 
     println!("Blessed Version: {}", blessed_version);
 
-    // println!("Updater Version: {}", version);
-    // get_latest_updater_version().await.unwrap();
-
     // CREATE PROGRAM DIRECTORY
     let mut data_path = dirs::data_dir().unwrap();
     data_path.push("town-of-us-updater");
@@ -293,6 +139,102 @@ fn main() {
     installs_path.push("installs");
     fs::create_dir(installs_path.clone()).unwrap_or(());
 
+    let mut true_env = false;
+    for argument in std::env::args() {
+        if argument == "true" {
+            true_env = true;
+        }
+    }
+
+    if !true_env {
+        let mut exe_path = data_path.clone();
+        if cfg!(windows) {
+            exe_path.push("town-of-us-updater.exe");
+        } else if cfg!(unix) {
+            exe_path.push("town-of-us-updater");
+        }
+
+        let mut updated_exe_hash = String::new();
+
+        if let Ok(response) = reqwest::blocking::get("https://tou.dormedas.com/release/hash") {
+            if let Ok(text) = response.text() {
+                updated_exe_hash = text;
+            }
+        } else {
+            println!("Failed to get hash. Running local version.")
+        }
+
+        // If we heard back, try to update, otherwise run normally
+        if !updated_exe_hash.is_empty() {
+            let mut our_hash = String::new();
+            let mut try_continue = false;
+            match fs::read(&exe_path) {
+                Ok(bytes) => {
+                    let mut hasher = Md5::new();
+                    hasher.update(bytes);
+                    let finalized = hasher.finalize();
+                    our_hash = format!("{finalized:x}");
+                    try_continue = true;
+                }
+                Err(e) => match e.kind() {
+                    io::ErrorKind::NotFound => try_continue = true,
+                    _ => {
+                        println!("{}", e.to_string());
+                    }
+                },
+            }
+
+            if !our_hash.is_empty() {
+                println!("{} vs {}", our_hash, updated_exe_hash);
+            } else {
+                println!("Local executable didn't exist");
+            }
+
+            if try_continue {
+                if our_hash != updated_exe_hash {
+                    println!("Newer version detected, downloading...");
+                    let client = reqwest::blocking::Client::builder()
+                        .timeout(None)
+                        .build()
+                        .unwrap();
+                    let updated_exe_data_req = client
+                        .get("https://tou.dormedas.com/release")
+                        .build()
+                        .unwrap();
+
+                    let updated_exe_data = client.execute(updated_exe_data_req);
+
+                    if let Ok(response) = updated_exe_data {
+                        if response.status() == StatusCode::OK {
+                            if let Ok(file_bytes) = response.bytes() {
+                                match fs::write(&exe_path, file_bytes) {
+                                    Ok(_) => {
+                                        println!("Successfully updated executable");
+                                    }
+                                    _ => {
+                                        println!("Failed to update executable");
+                                    }
+                                };
+                            }
+                        }
+                    }
+                }
+
+                // We can fail to download a good binary, just continue with our current executable
+                if exe_path.exists() {
+                    process::Command::new(&exe_path)
+                        .arg("true")
+                        .stdout(process::Stdio::null())
+                        .stderr(process::Stdio::null())
+                        .spawn()
+                        .unwrap();
+
+                    process::exit(0);
+                }
+            }
+        }
+    }
+
     let version = env!("CARGO_PKG_VERSION");
 
     let mut among_us_folder = PathBuf::new();
@@ -304,9 +246,9 @@ fn main() {
     if let Ok(existing_folder) = existing_found_folder {
         among_us_folder.push(existing_folder);
     } else {
-        let folder_opt: Option<String> = detect_among_us_folder();
+        let folder_opt: Option<(String, LauncherType)> = detect_among_us_folder();
         if folder_opt.is_some() {
-            among_us_folder.push(folder_opt.unwrap());
+            among_us_folder.push(folder_opt.unwrap().0);
         }
 
         if among_us_folder.exists() {
@@ -314,19 +256,32 @@ fn main() {
         }
     }
 
-    let app_data: AppData = AppData {
+    let mut app_data: AppData = AppData {
-        among_us_path: String::from(among_us_folder.clone().to_str().unwrap()),
+        // among_us_path: String::from(among_us_folder.clone().to_str().unwrap()),
+        among_us_path: String::new(),
         installs_path: String::from(installs_path.clone().to_str().unwrap()),
         version: SemVer::from(version),
-        initialized: false,
+        delete_mode: false,
         among_us_version: AmongUsVersion::default(),
         data_path: String::from(data_path.clone().to_str().unwrap()),
         app_state: GlobalAppState::Initializing(InitializingState::StartingGUI),
         blessed_version,
+        update_installs_list: true,
+        installs_last_update_time: std::time::Instant::now(),
+        installs_list: Vec::new(),
+        init_install_path: None,
+        init_download_url: None,
+        launcher_running: false,
+        config: app_config,
+        among_us_launched: false,
+        among_us_running: false,
+        find_among_us_handle: None,
+        determine_au_version_handle: None,
+        determine_tou_version_handle: None,
+        copy_au_handle: None,
+        download_tou_handle: None,
     };
 
-    let mut root_column: druid::widget::Flex<AppData> = druid::widget::Flex::column();
-
     // DETERMINE AMONG US VERSION
 
     if let Some(among_us_folder_str) = among_us_folder.to_str() {
@@ -337,34 +292,27 @@ fn main() {
         }
     }
 
-    // println!("Checking for updater updates...");
-    // let vals: (String, String) = version_check_thread_handle.join().unwrap();
-
     // TODO: Auto launch latest sanctioned if the user has a setting like that
     //       Auto launch latest experimental as well
 
     println!("Launching main window...");
 
-    let _main_menu: druid::MenuDesc<AppData> =
+    // Tell better crewlink to launch somewhere else
-        druid::MenuDesc::empty().append(druid::MenuItem::new(
+    thread::spawn(|| {
-            druid::LocalizedString::new("File"),
+        launch_better_crewlink().unwrap_or(());
-            druid::Command::new(druid::Selector::new("test"), 0, Target::Auto),
+    });
-        ));
 
-    let widget: AmongUsLauncherWidget = AmongUsLauncherWidget {
+    let mut native_options = eframe::NativeOptions::default();
-        root: WidgetPod::new(Flex::column()),
+    native_options.min_window_size = Some(egui::vec2(425.0, 400.0));
-    };
+    native_options.initial_window_size = Some(egui::vec2(425.0, 400.0));
 
-    root_column.add_flex_child(widget, 1.0);
+    app_data.detect_running_stores();
-    launch_better_crewlink().unwrap_or(());
 
-    let main_window = WindowDesc::new(|| root_column)
+    eframe::run_native(
-        .title(title_string)
+        title_string.as_str(),
-        // .menu(main_menu)
+        native_options,
-        .window_size((400.0, 400.0));
+        Box::new(|_cc| Box::new(app_data)),
-    let app_launcher = AppLauncher::with_window(main_window).delegate(Delegate {});
+    );
-    let _external_handler = app_launcher.get_external_handle();
-    app_launcher.launch(app_data).unwrap();
 }
 
 fn launch_better_crewlink() -> std::result::Result<(), String> {
@@ -481,55 +429,67 @@ fn copy_folder_contents_to_target<T: AsRef<Path>>(source: T, dest: T) {
     fs_extra::dir::copy(source, dest, &copy_opts).unwrap();
 }
 
-fn _detect_steam() -> Option<String> {
+fn detect_steam() -> Option<(String, LauncherType)> {
-    None
+    let mut library_folder_path: PathBuf =
-}
+        PathBuf::from("C:\\Program Files (x86)\\Steam\\steamapps\\libraryfolders.vdf");
+    if let Ok(steam_regkey) = Hive::LocalMachine.open(
+        r"SOFTWARE\WOW6432Node\Valve\Steam",
+        registry::Security::Read,
+    ) {
+        if let Ok(steam_folder) = steam_regkey.value("InstallPath") {
+            library_folder_path = PathBuf::from(steam_folder.to_string());
+            library_folder_path.push("steamapps\\libraryfolders.vdf");
+            println!("{:?}", steam_folder);
+            println!("{:?}", library_folder_path.to_str());
+        }
+    }
 
-fn _detect_epic() -> Option<String> {
+    let library_folder = fs::read_to_string(library_folder_path.to_str().expect("Path invalid"));
-    let _default_folder = String::from("C:\\Program Files\\Epic Games\\AmongUs");
-    None
-}
 
-fn detect_among_us_folder() -> Option<String> {
+    if library_folder.is_ok() {
-    if cfg!(windows) {
+        let mut library_folder_string: String = library_folder.unwrap();
-        let mut library_folder_path: PathBuf =
+        let appid_index = library_folder_string.find(AMONG_US_APPID);
-            PathBuf::from("C:\\Program Files (x86)\\Steam\\steamapps\\libraryfolders.vdf");
+        if appid_index.is_none() {
-        if let Ok(steam_regkey) = Hive::LocalMachine.open(
+            println!("Among Us not found!");
-            r"SOFTWARE\WOW6432Node\Valve\Steam",
+            return None;
-            registry::Security::Read,
+        } else {
-        ) {
+            library_folder_string.truncate(appid_index.unwrap());
-            if let Ok(steam_folder) = steam_regkey.value("InstallPath") {
-                library_folder_path = PathBuf::from(steam_folder.to_string());
-                library_folder_path.push("steamapps\\libraryfolders.vdf");
-                println!("{:?}", steam_folder);
-                println!("{:?}", library_folder_path.to_str());
-            }
         }
 
-        let library_folder =
+        let path_regex = Regex::new(r#"path"\s+"([Z-a\w\d\s\\\(\):]+)""#).unwrap();
-            fs::read_to_string(library_folder_path.to_str().expect("Path invalid"));
+        let caps: regex::CaptureMatches = path_regex.captures_iter(&library_folder_string);
+        let last_path = caps.last().unwrap();
+        let start = last_path.get(last_path.len() - 1).unwrap();
 
-        if library_folder.is_ok() {
+        return Some((
-            let mut library_folder_string: String = library_folder.unwrap();
+            format!(
-            let appid_index = library_folder_string.find(AMONG_US_APPID);
-            if appid_index.is_none() {
-                println!("Among Us not found!");
-                return None;
-            } else {
-                library_folder_string.truncate(appid_index.unwrap());
-            }
-
-            let path_regex = Regex::new(r#"path"\s+"([Z-a\w\d\s\\\(\):]+)""#).unwrap();
-            let caps: regex::CaptureMatches = path_regex.captures_iter(&library_folder_string);
-            let last_path = caps.last().unwrap();
-            let start = last_path.get(last_path.len() - 1).unwrap();
-
-            return Some(format!(
                 r"{}\\steamapps\\common\\Among Us\\",
                 library_folder_string
                     .get(start.start()..start.end())
                     .unwrap()
-            ));
+            ),
+            LauncherType::Steam,
+        ));
+    }
+    None
+}
+
+fn detect_epic() -> Option<(String, LauncherType)> {
+    let default_folder = Path::new("C:\\Program Files\\Epic Games\\AmongUs");
+    if default_folder.exists() {
+        return Some((default_folder.to_string_lossy().into(), LauncherType::Epic));
+    }
+    None
+}
+
+fn detect_among_us_folder() -> Option<(String, LauncherType)> {
+    if cfg!(windows) {
+        // Default to Steam
+        let return_val = detect_steam();
+        if return_val.is_none() {
+            return detect_epic();
+        } else {
+            return return_val;
         }
     } else {
     }

src/semver.rs

@@ -5,7 +5,7 @@
 // Uses
 use std::fmt;
 
-#[derive(druid::Data, Clone, Ord, PartialOrd, Eq, PartialEq, Debug)]
+#[derive(Clone, Ord, PartialOrd, Eq, PartialEq, Debug)]
 pub struct SemVer {
     pub major: i32,
     pub minor: i32,