Massive GUI code improvements!

Almost all data initialization and processing happens through druid

Tokio removed for now, web requests block again

.gitignore

@@ -1 +1,2 @@
 /target
+Cargo.lock

Cargo.toml

@@ -1,7 +1,8 @@
 [package]
 name = "town-of-us-updater"
-version = "0.1.0"
+version = "2.0.0"
 edition = "2021"
+build = "src/build.rs"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -12,3 +13,10 @@ fs_extra = "1.2.0"
 dirs = "4.0.0"
 reqwest = {version = "0.11.11", features = ["blocking"]}
 iui = "0.3.0"
+serde_json = "1.0"
+tokio = {version="1", features=["full"]}
+druid = "0.7.0"
+registry = "1"
+
+[build-dependencies]
+embed-resource = "1.6"

README.md

@@ -1,2 +1,20 @@
-# town-of-us-updater
+# Town of Us Updater
 
+A tool to automatically install the **Town of Us R** mod for **Among Us**.
+
+## Features
+
+- Caches old builds to allow you to continue playing the mod in case of a breaking Among Us update
+- GUI to select which build to play
+- Auto-detection of Among Us install directory
+
+# Contributing
+
+Help. I have no standards. Just look at the code.
+
+## How to Build
+
+- [Install Rust](https://www.rust-lang.org/learn/get-started)
+- Download repository
+- Navigate to repository
+- `cargo build`

assets/main.rc

@@ -0,0 +1 @@
+1 ICON "icon.ico"

src/among_us_launcher_widget.rs

@@ -0,0 +1,166 @@
+use crate::AppData;
+use druid::{
+    widget::*, BoxConstraints, 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 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();
+
+        // 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<String> = 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 auv = ver_smash_split.next().unwrap();
+                    if !auv_array.contains(&auv.to_string()) {
+                        let label_text = format!("Among Us {}", auv);
+                        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);
+                        auv_array.push(auv.to_string());
+                    }
+                }
+
+                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 auv = ver_smash_split.next().unwrap();
+                    let button_string: String =
+                        format!("Town of Us {}", ver_smash_split.next().unwrap());
+
+                    for (index, j) in auv_array.iter().enumerate() {
+                        if j == auv {
+                            let mut clone: PathBuf = PathBuf::from(data.installs_path.clone());
+                            clone.push(existing_ver_smash.clone());
+
+                            let mut button_row: Flex<AppData> = Flex::row();
+
+                            let fybutton = druid::widget::Button::new(button_string.as_str())
+                                .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());
+                        }
+                    }
+                }
+
+                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();
+            }
+            _ => {
+                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);
+        if old_data.among_us_path.is_empty() && !data.among_us_path.is_empty() {
+            ctx.submit_command(ATTEMPT_INSTALL);
+            println!("Detect Stuff");
+        }
+        // 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

@@ -0,0 +1,50 @@
+use druid::Data;
+use std::fmt;
+
+#[derive(Ord, PartialOrd, Eq, PartialEq, Clone, Debug, Data)]
+pub struct AmongUsVersion {
+    year: i32,
+    month: i32,
+    day: i32,
+}
+
+impl fmt::Display for AmongUsVersion {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}.{}.{}", self.year, self.month, self.day)
+    }
+}
+
+impl Default for AmongUsVersion {
+    fn default() -> Self {
+        AmongUsVersion {
+            year: 0,
+            month: 0,
+            day: 0,
+        }
+    }
+}
+
+impl From<&str> for AmongUsVersion {
+    fn from(s: &str) -> AmongUsVersion {
+        // Ignore a prepending "v"
+        let tmp_str = s.replace("v", "");
+
+        let v: Vec<&str> = tmp_str.split('.').collect();
+
+        AmongUsVersion {
+            year: v[0].parse().unwrap(),
+            month: v[1].parse().unwrap(),
+            day: v[2].parse().unwrap(),
+        }
+    }
+}
+
+impl From<(i32, i32, i32)> for AmongUsVersion {
+    fn from(s: (i32, i32, i32)) -> AmongUsVersion {
+        AmongUsVersion {
+            year: s.0,
+            month: s.1,
+            day: s.2,
+        }
+    }
+}

src/build.rs

@@ -0,0 +1,5 @@
+extern crate embed_resource;
+
+fn main() {
+    embed_resource::compile("assets/main.rc");
+}

src/main.rs

@@ -1,48 +1,58 @@
-use std::path::{Path, PathBuf};
-use std::str;
-use std::*;
+// Modules
+mod among_us_launcher_widget;
+mod among_us_version;
+mod semver;
+
+// Uses
+use among_us_launcher_widget::*;
+use among_us_version::*;
+
+use semver::*;
+
+use std::{
+    fs,
+    path::{Path, PathBuf},
+    process, str,
+};
 
 use fs_extra::{copy_items, dir};
-use iui::controls::{Button, Group, Label, VerticalBox};
-use iui::prelude::*;
+
 use regex::Regex;
 
-static AMONG_US_APPID: &'static str = "945360";
+use registry::Hive;
 
-struct AmongUsVersion {
-    year: i32,
-    month: i32,
-    day: i32,
+// GUI stuff
+use druid::{
+    commands, widget::*, AppDelegate, AppLauncher, Data, DelegateCtx, Env, Handled, Target,
+    WidgetPod, WindowDesc, WindowId,
+};
+
+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,
 }
 
-impl fmt::Display for AmongUsVersion {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}.{}.{}", self.year, self.month, self.day)
-    }
-}
-
-impl From<&str> for AmongUsVersion {
-    fn from(s: &str) -> AmongUsVersion {
-        let v: Vec<&str> = s.split(".").collect();
-        AmongUsVersion {
-            year: i32::from_str_radix(v[0], 10).unwrap(),
-            month: i32::from_str_radix(v[1], 10).unwrap(),
-            day: i32::from_str_radix(v[2], 10).unwrap(),
-        }
-    }
-}
+static AMONG_US_APPID: &str = "945360";
 
 fn attempt_run_among_us(install_path: &Path) {
-    let executable_path: path::PathBuf = [install_path.to_str().unwrap(), "Among Us.exe"]
+    let executable_path: PathBuf = [install_path.to_str().unwrap(), "Among Us.exe"]
         .iter()
         .collect();
 
-    std::process::Command::new(executable_path.to_str().unwrap())
+    process::Command::new(executable_path.to_str().unwrap())
         .spawn()
         .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"]
         .iter()
         .collect();
@@ -52,6 +62,7 @@ fn unmod_among_us_folder(folder_path: &Path) {
     let winhttp_path: PathBuf = [folder_path.to_str().unwrap(), "winhttp.dll"]
         .iter()
         .collect();
+
     let bepinex_path: PathBuf = [folder_path.to_str().unwrap(), "BepInEx"].iter().collect();
     let mono_path: PathBuf = [folder_path.to_str().unwrap(), "mono"].iter().collect();
     fs::remove_file(doorstop_path).unwrap_or_default();
@@ -61,7 +72,177 @@ fn unmod_among_us_folder(folder_path: &Path) {
     fs::remove_dir_all(mono_path).unwrap_or_default();
 }
 
+async fn _get_latest_updater_version() -> Result<(String, String), reqwest::Error> {
+    let version = env!("CARGO_PKG_VERSION");
+
+    let local_sem_ver = SemVer::from(version);
+
+    let body =
+        reqwest::get("https://git.dormedas.com/api/v1/repos/dormedas/town-of-us-updater/releases");
+    let root: serde_json::Value = serde_json::from_str(&body.await?.text().await?).unwrap();
+
+    for i in root.as_array().unwrap() {
+        let tag_name = i["tag_name"].as_str().unwrap();
+        if let Some(trimmed_str) = tag_name.strip_prefix('v') {
+            let remote_sem_ver = SemVer::from(trimmed_str);
+            if remote_sem_ver > local_sem_ver {
+                for j in i["assets"].as_array().unwrap() {
+                    if j["name"].as_str().unwrap().contains(".exe") {
+                        // let url = j["browser_download_url"].as_str().unwrap();
+                        // let data = reqwest::get(url).await?.bytes().await?;
+                        // let mut exe_dir = std::env::current_dir().unwrap();
+                        // exe_dir.push("town-of-us-updater-new.exe");
+                        // fs::write(exe_dir, data).unwrap();
+                    }
+                }
+                println!("New version ({}) of the updater detected!", remote_sem_ver);
+            }
+        } else {
+            let remote_sem_ver = SemVer::from(tag_name);
+            if remote_sem_ver > local_sem_ver {
+                for j in i["assets"].as_array().unwrap() {
+                    if j["name"].as_str().unwrap().contains(".exe") {
+                        // let url = j["browser_download_url"].as_str().unwrap();
+                        // let data = reqwest::get(url).await?.bytes().await?;
+                        // let mut exe_dir = std::env::current_dir().unwrap();
+                        // exe_dir.push("town-of-us-updater-new.exe");
+                        // fs::write(exe_dir, data).unwrap();
+                    }
+                }
+                println!("New version ({}) of the updater detected!", remote_sem_ver);
+            }
+        }
+    }
+
+    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,
+    ) {
+    }
+    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::ATTEMPT_INSTALL) {
+            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);
+                let ver_url: (String, String, bool) =
+                    determine_town_of_us_url(among_us_version.to_string().clone()).unwrap();
+
+                let version_smash = format!("{}-{}", 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 zip = reqwest::blocking::get(ver_url.1.clone())
+                            .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(),
+                    );
+                }
+            }
+
+            return Handled::Yes;
+        }
+
+        Handled::No
+    }
+}
+
 fn main() {
+    let version = env!("CARGO_PKG_VERSION");
+    let title_string: String = format!("Town of Us Updater - {}", 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");
@@ -71,163 +252,94 @@ fn main() {
     installs_path.push("installs");
     fs::create_dir(installs_path.clone()).unwrap_or(());
 
-    let ui = UI::init().expect("UI failed to init");
+    let version = env!("CARGO_PKG_VERSION");
 
-    let mut win = Window::new(&ui, "Town of Us Updater", 600, 400, WindowType::NoMenubar);
+    let mut among_us_folder = PathBuf::new();
 
-    let mut vbox = VerticalBox::new(&ui);
+    let mut existing_file_path = data_path.clone();
+    existing_file_path.push("existing_among_us_dir.txt");
+    let existing_found_folder = fs::read_to_string(existing_file_path.clone());
 
-    vbox.set_padded(&ui, true);
-
-    let mut button = Button::new(&ui, "Button");
-    button.on_clicked(&ui, {
-        let ui = ui.clone();
-        move |btn| {
-            let folder_opt = detect_among_us_folder();
-            if folder_opt.is_some() {
-                btn.set_text(&ui, "Amogus");
-                ui.quit();
-            }
-        }
-    });
-
-    let folder_opt = detect_among_us_folder();
-    let mut among_us_folder = path::PathBuf::new();
-    if folder_opt.is_some() {
-        among_us_folder.push(folder_opt.unwrap());
+    if let Ok(existing_folder) = existing_found_folder {
+        among_us_folder.push(existing_folder);
     } else {
-        win.modal_msg(&ui, "Find Among Us", "On the following Open File dialog, navigate to your Among Us folder and select Among Us.exe");
-        let open_window = win.open_file(&ui);
-        // println!("{}", open_window.unwrap().to_str().unwrap());
-        among_us_folder = open_window.unwrap().clone();
-        among_us_folder.pop();
+        let folder_opt: Option<String> = detect_among_us_folder();
+        if folder_opt.is_some() {
+            among_us_folder.push(folder_opt.unwrap());
+        }
+
+        if among_us_folder.exists() {
+            fs::write(existing_file_path, among_us_folder.to_str().unwrap()).unwrap();
+        }
     }
 
-    println!("Among Us Folder: {}", among_us_folder.to_str().unwrap());
+    let app_data: AppData = AppData {
+        among_us_path: String::from(among_us_folder.clone().to_str().unwrap()),
+        installs_path: String::from(installs_path.clone().to_str().unwrap()),
+        version: SemVer::from(version),
+        initialized: false,
+        among_us_version: AmongUsVersion::default(),
+        data_path: String::from(data_path.clone().to_str().unwrap()),
+    };
 
-    let among_us_version =
-        determine_among_us_version(String::from(among_us_folder.to_str().unwrap())).unwrap();
-    let ver_url: (String, String, bool) =
-        determine_town_of_us_url(among_us_version.clone()).unwrap();
+    let mut root_column: druid::widget::Flex<AppData> = druid::widget::Flex::column();
 
-    let version_smash = format!("{}-{}", among_us_version.clone(), ver_url.0.clone());
-    let new_installed_path: path::PathBuf =
-        [installs_path.to_str().unwrap(), version_smash.as_str()]
-            .iter()
-            .collect();
+    // DETERMINE AMONG US VERSION
 
-    if !path::Path::exists(&new_installed_path) {
-        copy_folder_to_target(
-            among_us_folder.to_str().unwrap(),
-            installs_path.to_str().unwrap(),
-        );
-
-        let among_us_path: path::PathBuf = [installs_path.to_str().unwrap(), "Among Us\\"]
-            .iter()
-            .collect();
-
-        if !among_us_path.to_str().unwrap().contains("Among Us") {
-            process::exit(0);
+    if let Some(among_us_folder_str) = among_us_folder.to_str() {
+        if among_us_folder_str.len() > 0 {
+            println!("Among Us Folder: {}", among_us_folder_str);
+        } else {
+            println!("Among Us Folder not automatically determined");
         }
+    }
 
-        // Un-mod whatever we found if it's modded
-        unmod_among_us_folder(&among_us_path);
+    // println!("Checking for updater updates...");
+    // let vals: (String, String) = version_check_thread_handle.join().unwrap();
 
-        println!(
-            "Rename {} to {}",
-            among_us_path.to_str().unwrap(),
-            new_installed_path.to_str().unwrap()
-        );
+    // TODO: Auto launch latest sanctioned if the user has a setting like that
+    //       Auto launch latest experimental as well
 
-        let mut perms = fs::metadata(among_us_path.clone()).unwrap().permissions();
-        perms.set_readonly(false);
-        fs::set_permissions(among_us_path.clone(), perms).unwrap();
+    println!("Launching main window...");
 
-        fs::rename(among_us_path, new_installed_path.clone()).unwrap();
-        let mut download_path = data_path.clone();
-        let downloaded_filename = ver_url.1.rsplit("/").nth(0).unwrap();
-        download_path.push(downloaded_filename.clone());
+    let _main_menu: druid::MenuDesc<AppData> =
+        druid::MenuDesc::empty().append(druid::MenuItem::new(
+            druid::LocalizedString::new("File"),
+            druid::Command::new(druid::Selector::new("test"), 0, Target::Auto),
+        ));
 
-        if !path::Path::exists(&download_path) {
-            println!("{:?}", download_path);
-            println!("Downloading Town of Us [{}]", ver_url.1.clone());
-            let zip = reqwest::blocking::get(ver_url.1.clone())
-                .unwrap()
-                .bytes()
-                .unwrap();
-            fs::write(download_path.clone(), zip).unwrap();
-        }
+    let widget: AmongUsLauncherWidget = AmongUsLauncherWidget {
+        root: WidgetPod::new(Flex::column()),
+    };
 
-        let opened_zip = fs::File::open(download_path).unwrap();
-        println!("Extracting...");
-        let mut archive = zip::ZipArchive::new(opened_zip).unwrap();
-        archive.extract(data_path.clone()).unwrap();
+    root_column.add_flex_child(widget, 1.0);
+    launch_better_crewlink().unwrap_or(());
 
-        let mut root_folder_path = String::new();
-        for i in archive.file_names() {
-            root_folder_path = String::from(i.split("/").nth(0).unwrap());
-            break;
-        }
-        let extracted_path: path::PathBuf =
-            [data_path.to_str().unwrap(), 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(),
-        );
+    let main_window = WindowDesc::new(|| root_column)
+        .title(title_string)
+        // .menu(main_menu)
+        .window_size((400.0, 400.0));
+    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> {
+    let mut dir = dirs::data_local_dir().unwrap();
+    dir.push("Programs");
+    dir.push("bettercrewlink");
+    dir.push("Better-CrewLink.exe");
+    println!("Attempting to launch Better Crew Link");
+    if dir.exists() {
+        process::Command::new(dir.as_path().to_str().unwrap())
+            .stdout(process::Stdio::null())
+            .stderr(process::Stdio::null())
+            .spawn()
+            .unwrap();
+        Ok(())
     } else {
-        println!("Modded install already found");
+        Err("Better Crew Link not found".to_string())
     }
-
-    // Find existing installs, make buttons for them
-    let install_iter = fs::read_dir(installs_path.clone());
-
-    match install_iter {
-        Ok(iter) => {
-            let mut collection: Vec<Result<fs::DirEntry, io::Error>> = iter.collect();
-            collection.reverse();
-            for i in collection {
-                // for i in iter {
-                let existing_ver_smash = i.unwrap().file_name();
-                let mut button = Button::new(&ui, existing_ver_smash.clone().to_str().unwrap());
-                button.on_clicked(&ui, {
-                    let ui = ui.clone();
-                    let installs_path = installs_path.clone();
-                    let existing_ver_smash = existing_ver_smash.clone();
-                    move |btn| {
-                        let mut new_path = installs_path.clone();
-                        new_path.push(existing_ver_smash.clone());
-                        println!("{}", new_path.clone().to_str().unwrap());
-                        attempt_run_among_us(&new_path);
-                        btn.set_text(&ui, "Launching...");
-                    }
-                });
-                vbox.append(&ui, button, LayoutStrategy::Stretchy);
-                println!("{}", existing_ver_smash.clone().to_str().unwrap());
-            }
-        }
-        _ => (),
-    }
-
-    win.set_child(&ui, vbox);
-    win.show(&ui);
-    ui.main();
-    // let mut install_folder_path = installs_path.clone();
-    // install_folder_path.push(version_smash);
-    // fs::create_dir(install_folder_path.clone()).unwrap_or(());
-
-    // Copy Among Us Out
-    // Create destination path
-
-    // let executable_path: path::PathBuf = [new_installed_path.to_str().unwrap(), "Among Us.exe"]
-    //     .iter()
-    //     .collect();
-
-    // std::process::Command::new(executable_path.to_str().unwrap())
-    //     .spawn()
-    //     .unwrap();
 }
 
 // Returns (Version, URL)
@@ -238,33 +350,17 @@ fn determine_town_of_us_url(among_us_version: String) -> Option<(String, String,
     .unwrap()
     .text()
     .unwrap();
+
     let mut line = markdown.find(&among_us_version);
     let mut line_offset = 0;
     let mut official_compatibility = false;
     if line.is_some() {
-        println!("Found official version!");
+        println!("Found sanctioned version!");
         official_compatibility = true;
     } else {
-        println!("Official version cannot be determined, installing experimental latest...");
+        println!("Sanctioned version cannot be determined, installing experimental latest...");
         line = markdown.find("[Download]");
         line_offset = 15;
-        // println!("At this point, there are two options:");
-        // println!(" [1] Revert Among Us to public-previous in Steam THEN select this option.");
-        // println!(" [2] Attempt to use the latest version of Town of Us anyway");
-        // let mut input = String::new();
-        // io::stdin().read_line(&mut input).unwrap();
-        // match input.trim() {
-        //     "1" => {
-        //         println!("Re-attempting...");
-        //         return None;
-        //     }
-        //     "2" => {
-        //         println!("Continuing...");
-        //         line = markdown.find("[Download]");
-        //         line_offset = 15;
-        //     }
-        //     _ => return None,
-        // };
     }
     // 100% scientific "-15" here to get the correct version since we find to [Download] above which is after the version number for that line
     let splits = markdown.split_at(line.unwrap() - line_offset);
@@ -273,7 +369,7 @@ fn determine_town_of_us_url(among_us_version: String) -> Option<(String, String,
     let captures = url_regex.captures(splits.1).unwrap();
     let capture = captures.get(captures.len() - 1).unwrap();
     let url = splits.1.get(capture.start()..capture.end()).unwrap();
-    println!("Official URL is: {}", url);
+    println!("Mod URL is: {}", url);
     let ver_regex = Regex::new(r#"\| (v\d\.\d\.\d) \|"#).unwrap();
     let ver_captures = ver_regex.captures(splits.1).unwrap();
     let ver_capture = ver_captures.get(ver_captures.len() - 1).unwrap();
@@ -281,66 +377,49 @@ fn determine_town_of_us_url(among_us_version: String) -> Option<(String, String,
         .1
         .get(ver_capture.start()..ver_capture.end())
         .unwrap();
-    println!("Matching version is: {}", ver);
+    println!("Installing Town of Us version: {}", ver);
     Some((String::from(ver), String::from(url), official_compatibility))
 }
 
-fn determine_among_us_version(folder_root: String) -> Option<String> {
+fn determine_among_us_version(folder_root: String) -> Option<AmongUsVersion> {
     let asset_file = format!("{}\\Among Us_Data\\globalgamemanagers", folder_root);
 
     const TARGET_BYTES_LEN: usize = 16;
 
     let target_bytes: [u8; TARGET_BYTES_LEN] = [3, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0];
 
-    let file_bytes = fs::read(asset_file).unwrap();
-    //println!("{:?}", file_bytes);
+    if let Ok(file_bytes) = fs::read(asset_file) {
+        let mut bytes_str = String::new();
+        let mut target_head = 0;
+        let mut file_index = 0;
+        for i in &file_bytes {
+            if target_head == TARGET_BYTES_LEN {
+                break;
+            }
 
-    let mut bytes_str = String::new();
-    let mut target_head = 0;
-    let mut file_index = 0;
-    for i in &file_bytes {
-        if target_head == TARGET_BYTES_LEN {
-            break;
+            if *i == target_bytes[target_head] {
+                target_head += 1;
+            } else {
+                target_head = 0;
+            }
+            file_index += 1;
+            bytes_str += &format!("{i:x}");
         }
 
-        if *i == target_bytes[target_head] {
-            target_head += 1;
-        } else {
-            target_head = 0;
-        }
-        file_index += 1;
-        bytes_str += &format!("{i:x}");
+        let offset: usize = usize::from(file_bytes[file_index]);
+        file_index += 4;
+
+        Some(AmongUsVersion::from(
+            str::from_utf8(file_bytes.get(file_index..file_index + offset).unwrap()).unwrap(),
+        ))
+    } else {
+        None
     }
 
-    let offset: usize = usize::from(file_bytes[file_index]);
-    file_index += 4;
-
-    // let mut offset = 10;
-
-    // if file_bytes[file_index + 9] == 0 {
-    //     offset -= 1;
-    // }
-    // if file_bytes[file_index + 8] == 0 {
-    //     offset -= 1;
-    // }
-
-    println!(
-        "|{}|",
-        str::from_utf8(file_bytes.get(file_index..file_index + offset).unwrap()).unwrap()
-    );
-    let ver = AmongUsVersion::from(
-        str::from_utf8(file_bytes.get(file_index..file_index + offset).unwrap()).unwrap(),
-    );
-    println!("AmongUsVersion: {}", ver);
-    Some(String::from(
-        str::from_utf8(file_bytes.get(file_index..file_index + offset).unwrap()).unwrap(),
-    ))
-    //println!("{}", bytes_str);
-
-    //None
+    //println!("{:?}", file_bytes);
 }
 
-fn copy_folder_to_target<T: AsRef<path::Path>>(source: T, dest: T) {
+fn copy_folder_to_target<T: AsRef<Path>>(source: T, dest: T) {
     let mut copy_opts = dir::CopyOptions::new();
     copy_opts.overwrite = true;
     copy_opts.skip_exist = true;
@@ -350,7 +429,7 @@ fn copy_folder_to_target<T: AsRef<path::Path>>(source: T, dest: T) {
     copy_items(&from_paths, dest, &copy_opts).unwrap();
 }
 
-fn copy_folder_contents_to_target<T: AsRef<path::Path>>(source: T, dest: T) {
+fn copy_folder_contents_to_target<T: AsRef<Path>>(source: T, dest: T) {
     let mut copy_opts = dir::CopyOptions::new();
     copy_opts.overwrite = true;
     copy_opts.skip_exist = true;
@@ -358,7 +437,26 @@ fn copy_folder_contents_to_target<T: AsRef<path::Path>>(source: T, dest: T) {
     copy_opts.content_only = true;
     fs_extra::dir::copy(source, dest, &copy_opts).unwrap();
 }
+
+fn _detect_steam() -> Option<String> {
+    None
+}
+
+fn _detect_epic() -> Option<String> {
+    let _default_folder = String::from("C:\\Program Files\\Epic Games\\AmongUs");
+    None
+}
+
 fn detect_among_us_folder() -> Option<String> {
+    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") {
+            println!("{:?}", steam_folder);
+        }
+    }
+
     let library_folder =
         fs::read_to_string("C:\\Program Files (x86)\\Steam\\steamapps\\libraryfolders.vdf");
 
@@ -372,20 +470,11 @@ fn detect_among_us_folder() -> Option<String> {
         } else {
             library_folder_string.truncate(appid_index.unwrap());
         }
-        //println!("{}", library_folder_string);
 
         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();
-        /*
-        println!(
-            "{}",
-            library_folder_string
-                .get(start.start()..start.end())
-                .unwrap()
-        );
-        */
 
         return Some(format!(
             "{}\\\\steamapps\\\\common\\\\Among Us\\\\",

src/semver.rs

@@ -0,0 +1,31 @@
+//! # SemVer
+
+//! A simple Semantic Versioning struct to handle comparisons and ordering
+
+// Uses
+use std::fmt;
+
+#[derive(druid::Data, Clone, Ord, PartialOrd, Eq, PartialEq, Debug)]
+pub struct SemVer {
+    pub major: i32,
+    pub minor: i32,
+    pub patch: i32,
+}
+
+impl fmt::Display for SemVer {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}.{}.{}", self.major, self.minor, self.patch)
+    }
+}
+
+impl From<&str> for SemVer {
+    fn from(s: &str) -> SemVer {
+        let v: Vec<&str> = s.split('.').collect();
+
+        SemVer {
+            major: v[0].parse().unwrap(),
+            minor: v[1].parse().unwrap(),
+            patch: v[2].parse().unwrap(),
+        }
+    }
+}