13 Commits

Author SHA1 Message Date
ed50979397 Version 4.0.2
Fixed delete mode being on by default
2023-01-29 16:27:10 -08:00
762b2f61aa Version 4.0.1
Fix updater not installing new versions
2023-01-28 23:57:51 -08:00
3bd05ba8dd Bump to version 4.0.0
Switch from druid to egui

Support deletion of builds

Auto-updater!

Add a test
2023-01-28 23:29:20 -08:00
ff311475dc Add blessed build text coloring 2023-01-15 14:31:55 -08:00
8e61c8a2f2 Merge branch 'hotfix-2.0.0' 2022-11-28 19:37:10 -08:00
97cdf4829a push to 2.3 2022-11-28 19:23:30 -08:00
7244c24fe4 Fix sorting 2022-11-28 19:20:05 -08:00
fbc4c747a5 Merge branch 'hotfix-2.0.0' 2022-11-14 18:37:53 -08:00
9468194718 Remove windows-only components
Attempt to divide initialization
2022-10-11 21:03:33 -07:00
69f67d303e Merge branch 'master' of http://git.dormedas.com/dormedas/town-of-us-updater 2022-09-26 19:08:26 -07:00
6d05440d98 Merge branch 'hotfix-2.0.0' 2022-09-26 19:07:54 -07:00
972c310673 Update 'README.md' 2022-09-26 14:47:01 -07:00
90b703ee30 Bump to 3.0.0 2022-09-26 08:15:17 -07:00
6 changed files with 464 additions and 358 deletions

View File

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

View File

@@ -7,6 +7,7 @@ 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 - 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 - GUI to select which build to play
- Auto-detection of Among Us install directory - Auto-detection of Among Us install directory
- Auto-launch of BetterCrewLink if installed
# Contributing # Contributing

View File

@@ -1,171 +0,0 @@
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();
}
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);
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!");
}
}

View File

@@ -1,13 +1,18 @@
use druid::Data;
use std::fmt; use std::fmt;
#[derive(Ord, PartialOrd, Eq, PartialEq, Clone, Debug, Data)] #[derive(Ord, PartialOrd, Eq, PartialEq, Clone, Debug)]
pub struct AmongUsVersion { pub struct AmongUsVersion {
year: i32, year: i32,
month: i32, month: i32,
day: i32, day: i32,
} }
impl AmongUsVersion {
pub fn as_american_string(&self) -> String {
format!("{}-{}-{}", self.month, self.day, self.year)
}
}
impl fmt::Display for AmongUsVersion { impl fmt::Display for AmongUsVersion {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{}.{}.{}", self.year, self.month, self.day) 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);
}

View File

@@ -1,16 +1,15 @@
// Modules // Modules
mod among_us_launcher_widget;
mod among_us_version; mod among_us_version;
mod semver; mod semver;
// Uses // Uses
use among_us_launcher_widget::*;
use among_us_version::*; use among_us_version::*;
use md5::{Digest, Md5};
use semver::*; use semver::*;
use std::{ use std::{
fs, fs, io,
path::{Path, PathBuf}, path::{Path, PathBuf},
process, str, process, str,
}; };
@@ -19,24 +18,187 @@ use fs_extra::{copy_items, dir};
use regex::Regex; use regex::Regex;
#[cfg(target_os = "windows")]
use registry::Hive; use registry::Hive;
// GUI stuff // GUI stuff
use druid::{
commands, widget::*, AppDelegate, AppLauncher, Data, DelegateCtx, Env, Handled, Target,
WidgetPod, WindowDesc, WindowId,
};
struct Delegate; use eframe::egui;
#[derive(Data, Clone, Debug)] use reqwest::StatusCode;
#[derive(PartialEq, Eq, Clone, Debug)]
pub enum InitializingState {
StartingGUI,
DeterminingVersion,
CopyingAmongUs,
UnmoddingAmongUs,
DownloadingZip,
Unzipping,
CopyingZipIn,
}
#[derive(PartialEq, Eq, Clone, Debug)]
pub enum GlobalAppState {
Initializing(InitializingState),
Initialized,
Installing,
Playing,
}
#[derive(Clone, Debug)]
pub struct AppData { pub struct AppData {
pub among_us_path: String, pub among_us_path: String,
pub installs_path: String, pub installs_path: String,
pub version: SemVer, pub version: SemVer,
pub initialized: bool, pub delete_mode: bool,
pub among_us_version: AmongUsVersion, pub among_us_version: AmongUsVersion,
pub data_path: String, 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>,
}
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(),
}
}
}
impl AppData {
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);
if ui.button(button_text).clicked() {
crate::attempt_run_among_us(&clone);
}
} else {
let button_text = egui::RichText::new(button_string.clone()).size(25.0);
if ui.button(button_text).clicked() {
crate::attempt_run_among_us(&clone);
}
}
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) {
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");
});
egui::CentralPanel::default().show(ctx, |ui| {
self.draw_layout(ui);
});
}
} }
static AMONG_US_APPID: &str = "945360"; static AMONG_US_APPID: &str = "945360";
@@ -51,6 +213,10 @@ fn attempt_run_among_us(install_path: &Path) {
.unwrap(); .unwrap();
} }
fn attempt_delete_among_us(install_path: &Path) {
fs::remove_dir_all(install_path).unwrap();
}
fn unmod_among_us_folder(folder_path: &Path) { fn unmod_among_us_folder(folder_path: &Path) {
println!("Unmodding Among Us..."); println!("Unmodding Among Us...");
let doorstop_path: PathBuf = [folder_path.to_str().unwrap(), "doorstop_config.ini"] let doorstop_path: PathBuf = [folder_path.to_str().unwrap(), "doorstop_config.ini"]
@@ -117,137 +283,109 @@ async fn _get_latest_updater_version() -> Result<(String, String), reqwest::Erro
Ok((String::from("no"), String::from("yes"))) Ok((String::from("no"), String::from("yes")))
} }
impl AppDelegate<AppData> for Delegate { impl AppData {
fn window_added( fn on_path_added(&mut self) {
&mut self, if self.among_us_path.is_empty() {
_id: WindowId, return;
data: &mut AppData,
_env: &Env,
ctx: &mut DelegateCtx,
) {
if !data.among_us_path.is_empty() {
ctx.submit_command(ATTEMPT_INSTALL);
} }
}
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 if let Some(among_us_version) =
// among_us_folder.pop(); determine_among_us_version(String::from(self.among_us_path.clone()))
println!("{}", buf.to_str().unwrap()); {
// println!("Handled!"); self.among_us_version = among_us_version.clone();
//Application::global().quit(); println!("AmongUsVersion: {}", among_us_version);
}
return Handled::Yes; self.app_state = GlobalAppState::Initializing(InitializingState::DeterminingVersion);
} else if let Some(_a) = cmd.get(among_us_launcher_widget::ATTEMPT_INSTALL) { let ver_url: (String, String, bool) =
if let Some(among_us_version) = determine_town_of_us_url(self.among_us_version.to_string().clone()).unwrap();
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 version_smash = format!("{}-{}", self.among_us_version, ver_url.0.clone());
let new_installed_path: PathBuf = let new_installed_path: PathBuf = [self.installs_path.as_str(), version_smash.as_str()]
[data.installs_path.as_str(), version_smash.as_str()] .iter()
.iter() .collect();
.collect();
if !Path::exists(&new_installed_path) { if !Path::exists(&new_installed_path) {
println!("Copying Among Us to cache location..."); println!("Copying Among Us to cache location...");
copy_folder_to_target(data.among_us_path.clone(), data.installs_path.clone()); copy_folder_to_target(self.among_us_path.clone(), self.installs_path.clone());
let among_us_path: PathBuf = let among_us_path: PathBuf = [self.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") { if !among_us_path.to_str().unwrap().contains("Among Us") {
process::exit(0); 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;
return Handled::Yes; // 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 = [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());
copy_folder_contents_to_target(
extracted_path.to_str().unwrap(),
new_installed_path.to_str().unwrap(),
);
} }
self.app_state = GlobalAppState::Initialized;
Handled::No self.update_installs_list = true;
} }
} }
fn main() { fn main() {
let version = env!("CARGO_PKG_VERSION"); let version = env!("CARGO_PKG_VERSION");
let title_string: String = format!("Town of Us Updater - {}", version); let title_string: String = format!("Town of Us Updater - {}", version);
let blessed_body = reqwest::blocking::get("https://tou.dormedas.com/blessed");
let response = blessed_body.unwrap();
// println!("Updater Version: {}", version); let blessed_version: String = match response.status() {
// get_latest_updater_version().await.unwrap(); StatusCode::OK => response.text().unwrap(),
_ => String::from("0.0.0-v0.0.0"),
};
println!("Blessed Version: {}", blessed_version);
// CREATE PROGRAM DIRECTORY // CREATE PROGRAM DIRECTORY
let mut data_path = dirs::data_dir().unwrap(); let mut data_path = dirs::data_dir().unwrap();
@@ -258,6 +396,102 @@ fn main() {
installs_path.push("installs"); installs_path.push("installs");
fs::create_dir(installs_path.clone()).unwrap_or(()); 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 version = env!("CARGO_PKG_VERSION");
let mut among_us_folder = PathBuf::new(); let mut among_us_folder = PathBuf::new();
@@ -279,17 +513,20 @@ 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()),
installs_path: String::from(installs_path.clone().to_str().unwrap()), installs_path: String::from(installs_path.clone().to_str().unwrap()),
version: SemVer::from(version), version: SemVer::from(version),
initialized: false, delete_mode: false,
among_us_version: AmongUsVersion::default(), among_us_version: AmongUsVersion::default(),
data_path: String::from(data_path.clone().to_str().unwrap()), 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(),
}; };
let mut root_column: druid::widget::Flex<AppData> = druid::widget::Flex::column();
// DETERMINE AMONG US VERSION // DETERMINE AMONG US VERSION
if let Some(among_us_folder_str) = among_us_folder.to_str() { if let Some(among_us_folder_str) = among_us_folder.to_str() {
@@ -300,34 +537,23 @@ 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 // TODO: Auto launch latest sanctioned if the user has a setting like that
// Auto launch latest experimental as well // Auto launch latest experimental as well
println!("Launching main window..."); println!("Launching main window...");
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),
));
let widget: AmongUsLauncherWidget = AmongUsLauncherWidget {
root: WidgetPod::new(Flex::column()),
};
root_column.add_flex_child(widget, 1.0);
launch_better_crewlink().unwrap_or(()); launch_better_crewlink().unwrap_or(());
let main_window = WindowDesc::new(|| root_column) let mut native_options = eframe::NativeOptions::default();
.title(title_string) native_options.min_window_size = Some(egui::vec2(425.0, 400.0));
// .menu(main_menu) native_options.initial_window_size = Some(egui::vec2(425.0, 400.0));
.window_size((400.0, 400.0)); app_data.on_path_added();
let app_launcher = AppLauncher::with_window(main_window).delegate(Delegate {}); app_data.detect_installs(); // Initial check since we only update every 10s
let _external_handler = app_launcher.get_external_handle(); eframe::run_native(
app_launcher.launch(app_data).unwrap(); title_string.as_str(),
native_options,
Box::new(|_cc| Box::new(app_data)),
);
} }
fn launch_better_crewlink() -> std::result::Result<(), String> { fn launch_better_crewlink() -> std::result::Result<(), String> {
@@ -388,7 +614,7 @@ fn determine_town_of_us_url(among_us_version: String) -> Option<(String, String,
} }
fn determine_among_us_version(folder_root: String) -> Option<AmongUsVersion> { 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; const TARGET_BYTES_LEN: usize = 16;
@@ -454,40 +680,47 @@ fn _detect_epic() -> Option<String> {
} }
fn detect_among_us_folder() -> Option<String> { fn detect_among_us_folder() -> Option<String> {
if let Ok(steam_regkey) = Hive::LocalMachine.open( if cfg!(windows) {
r"SOFTWARE\WOW6432Node\Valve\Steam", let mut library_folder_path: PathBuf =
registry::Security::Read, PathBuf::from("C:\\Program Files (x86)\\Steam\\steamapps\\libraryfolders.vdf");
) { if let Ok(steam_regkey) = Hive::LocalMachine.open(
if let Ok(steam_folder) = steam_regkey.value("InstallPath") { r"SOFTWARE\WOW6432Node\Valve\Steam",
println!("{:?}", steam_folder); registry::Security::Read,
} ) {
} if let Ok(steam_folder) = steam_regkey.value("InstallPath") {
library_folder_path = PathBuf::from(steam_folder.to_string());
let library_folder = library_folder_path.push("steamapps\\libraryfolders.vdf");
fs::read_to_string("C:\\Program Files (x86)\\Steam\\steamapps\\libraryfolders.vdf"); println!("{:?}", steam_folder);
println!("{:?}", library_folder_path.to_str());
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() {
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 library_folder =
let caps: regex::CaptureMatches = path_regex.captures_iter(&library_folder_string); fs::read_to_string(library_folder_path.to_str().expect("Path invalid"));
let last_path = caps.last().unwrap();
let start = last_path.get(last_path.len() - 1).unwrap();
return Some(format!( if library_folder.is_ok() {
"{}\\\\steamapps\\\\common\\\\Among Us\\\\", let mut library_folder_string: String = library_folder.unwrap();
library_folder_string let appid_index = library_folder_string.find(AMONG_US_APPID);
.get(start.start()..start.end()) if appid_index.is_none() {
.unwrap() 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()
));
}
} else {
} }
None None
} }

View File

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