push to 2.3

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "town-of-us-updater"
-version = "3.0.0"
+version = "2.3.0"
 edition = "2021"
 build = "src/build.rs"
 

README.md

@@ -7,7 +7,6 @@ A tool to automatically install the **Town of Us R** mod for **Among Us**.
 - 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
-- Auto-launch of BetterCrewLink if installed
 
 # Contributing
 

src/among_us_launcher_widget.rs

@@ -1,3 +1,4 @@
+use crate::AmongUsVersion;
 use crate::AppData;
 use druid::{
     widget::*, BoxConstraints, Env, Event, EventCtx, FileDialogOptions, LayoutCtx, LifeCycle,
@@ -6,9 +7,6 @@ use druid::{
 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>>,
@@ -18,15 +16,6 @@ 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());
 
@@ -56,14 +45,22 @@ impl AmongUsLauncherWidget {
                 // Iterate first to find labels:
 
                 let mut flexbox_array: Vec<druid::widget::Flex<AppData>> = Vec::new();
-                let mut auv_array: Vec<String> = 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 auv = ver_smash_split.next().unwrap();
+                    let among_us_version = AmongUsVersion::from(ver_smash_split.next().unwrap());
-                    if !auv_array.contains(&auv.to_string()) {
+                    if !auv_array.contains(&among_us_version) {
-                        let label_text = format!("Among Us {}", auv);
+                        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),
@@ -71,8 +68,6 @@ impl AmongUsLauncherWidget {
                         )
                         .with_default_spacer();
                     flexbox_array.push(flex);
-                        auv_array.push(auv.to_string());
-                    }
                 }
 
                 println!("Installs list:");
@@ -80,12 +75,12 @@ impl AmongUsLauncherWidget {
                 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 among_us_version = AmongUsVersion::from(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 {
+                        if j == &among_us_version {
                             let mut clone: PathBuf = PathBuf::from(data.installs_path.clone());
                             clone.push(existing_ver_smash.clone());
 
@@ -118,6 +113,8 @@ impl AmongUsLauncherWidget {
                     }
                 }
 
+                flexbox_array.reverse();
+
                 for i in flexbox_array {
                     flex.add_flex_child(i, 1.0);
                 }
@@ -156,12 +153,9 @@ impl Widget<AppData> for AmongUsLauncherWidget {
     }
     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!("Detect Stuff");
         }
         // println!("Update!");
         self.build_widget(data);

src/main.rs

@@ -19,7 +19,6 @@ use fs_extra::{copy_items, dir};
 
 use regex::Regex;
 
-#[cfg(target_os = "windows")]
 use registry::Hive;
 
 // GUI stuff
@@ -28,25 +27,6 @@ use druid::{
     WidgetPod, WindowDesc, WindowId,
 };
 
-#[derive(PartialEq, Eq, Data, Clone, Debug)]
-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)]
@@ -57,7 +37,6 @@ pub struct AppData {
     pub initialized: bool,
     pub among_us_version: AmongUsVersion,
     pub data_path: String,
-    pub app_state: GlobalAppState,
 }
 
 static AMONG_US_APPID: &str = "945360";
@@ -147,7 +126,7 @@ impl AppDelegate<AppData> for Delegate {
         ctx: &mut DelegateCtx,
     ) {
         if !data.among_us_path.is_empty() {
-            ctx.submit_command(DETERMINE_AMONG_US_VERSION);
+            ctx.submit_command(ATTEMPT_INSTALL);
         }
     }
     fn command(
@@ -172,20 +151,18 @@ impl AppDelegate<AppData> for Delegate {
             //Application::global().quit();
 
             return Handled::Yes;
-        } else if let Some(_a) = cmd.get(among_us_launcher_widget::DETERMINE_AMONG_US_VERSION) {
+        } 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);
-            }
-        } 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();
+                    determine_town_of_us_url(among_us_version.to_string().clone()).unwrap();
 
-            let version_smash = format!("{}-{}", data.among_us_version, ver_url.0.clone());
+                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()]
+                let new_installed_path: PathBuf =
+                    [data.installs_path.as_str(), version_smash.as_str()]
                         .iter()
                         .collect();
 
@@ -194,7 +171,7 @@ impl AppDelegate<AppData> for Delegate {
                     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();
+                        [data.installs_path.as_str(), "Among Us\\"].iter().collect();
 
                     if !among_us_path.to_str().unwrap().contains("Among Us") {
                         process::exit(0);
@@ -224,10 +201,12 @@ impl AppDelegate<AppData> for Delegate {
                             "Downloading Town of Us... Please be patient! [{}]",
                             ver_url.1.clone()
                         );
-                    let zip = reqwest::blocking::get(ver_url.1.clone())
+                        let client = reqwest::blocking::Client::builder()
-                        .unwrap()
+                            .timeout(None)
-                        .bytes()
+                            .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();
                     }
 
@@ -253,8 +232,8 @@ impl AppDelegate<AppData> for Delegate {
                         new_installed_path.to_str().unwrap(),
                     );
                 }
+            }
             data.initialized = !data.initialized;
-            data.app_state = GlobalAppState::Initialized;
 
             return Handled::Yes;
         }
@@ -307,7 +286,6 @@ fn main() {
         initialized: false,
         among_us_version: AmongUsVersion::default(),
         data_path: String::from(data_path.clone().to_str().unwrap()),
-        app_state: GlobalAppState::Initializing(InitializingState::StartingGUI),
     };
 
     let mut root_column: druid::widget::Flex<AppData> = druid::widget::Flex::column();
@@ -410,7 +388,7 @@ fn determine_town_of_us_url(among_us_version: String) -> Option<(String, String,
 }
 
 fn determine_among_us_version(folder_root: String) -> Option<AmongUsVersion> {
-    let asset_file = format!("{}/Among Us_Data/globalgamemanagers", folder_root);
+    let asset_file = format!("{}\\Among Us_Data\\globalgamemanagers", folder_root);
 
     const TARGET_BYTES_LEN: usize = 16;
 
@@ -476,25 +454,20 @@ fn _detect_epic() -> Option<String> {
 }
 
 fn detect_among_us_folder() -> Option<String> {
-    if cfg!(windows) {
-        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());
         }
     }
 
     let library_folder =
-            fs::read_to_string(library_folder_path.to_str().expect("Path invalid"));
+        fs::read_to_string("C:\\Program Files (x86)\\Steam\\steamapps\\libraryfolders.vdf");
 
     if library_folder.is_ok() {
+        println!("Steam is on C:\\ drive!");
         let mut library_folder_string: String = library_folder.unwrap();
         let appid_index = library_folder_string.find(AMONG_US_APPID);
         if appid_index.is_none() {
@@ -510,13 +483,11 @@ fn detect_among_us_folder() -> Option<String> {
         let start = last_path.get(last_path.len() - 1).unwrap();
 
         return Some(format!(
-                r"{}\\steamapps\\common\\Among Us\\",
+            "{}\\\\steamapps\\\\common\\\\Among Us\\\\",
             library_folder_string
                 .get(start.start()..start.end())
                 .unwrap()
         ));
     }
-    } else {
-    }
     None
 }