dormedas/town-of-us-updater
1
1
Fork 0
Code Issues 8 Pull Requests Projects Releases 11 Wiki Activity

Massive GUI code improvements!

Browse Source 
Almost all data initialization and processing happens through druid

Tokio removed for now, web requests block again
This commit is contained in:
Ian Mason
2022-09-25 23:50:07 -07:00
parent 762d96baee
commit 38c975b44c
4 changed files with 349 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

402
src/main.rs
View File

@@ -1,19 +1,18 @@
// 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::{
cell::RefCell,
fs, io,
fs,
path::{Path, PathBuf},
process,
rc::Rc,
str,
process, str,
};
use fs_extra::{copy_items, dir};
@@ -24,16 +23,20 @@ use registry::Hive;
// GUI stuff
use druid::{
commands, widget::*, AppDelegate, AppLauncher, Application, Data, DelegateCtx, Env,
FileDialogOptions, Handled, Target, WidgetExt, WindowDesc,
commands, widget::*, AppDelegate, AppLauncher, Data, DelegateCtx, Env, Handled, Target,
WidgetPod, WindowDesc, WindowId,
};
struct Delegate;
#[derive(Data, Clone)]
struct AppData {
pub among_us_path: Rc<RefCell<String>>,
#[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,
}
static AMONG_US_APPID: &str = "945360";
@@ -69,7 +72,7 @@ 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> {
async fn _get_latest_updater_version() -> Result<(String, String), reqwest::Error> {
let version = env!("CARGO_PKG_VERSION");
let local_sem_ver = SemVer::from(version);
@@ -115,6 +118,14 @@ async fn get_latest_updater_version() -> Result<(String, String), reqwest::Error
}
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,
@@ -123,33 +134,114 @@ impl AppDelegate<AppData> for Delegate {
data: &mut AppData,
_env: &Env,
) -> Handled {
// println!("Command!");
if let Some(file_info) = cmd.get(commands::OPEN_FILE) {
println!("{:?}", file_info);
let among_us_folder = file_info.path();
let mut buf = among_us_folder.to_path_buf();
buf.pop();
let mut borrow = data.among_us_path.borrow_mut();
*borrow = String::from(buf.to_str().unwrap());
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();
// 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
}
}
#[tokio::main]
async fn main() {
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();
// println!("Updater Version: {}", version);
// get_latest_updater_version().await.unwrap();
// CREATE PROGRAM DIRECTORY
let mut data_path = dirs::data_dir().unwrap();
@@ -160,14 +252,7 @@ async fn main() {
installs_path.push("installs");
fs::create_dir(installs_path.clone()).unwrap_or(());
let app_data: AppData = AppData {
among_us_path: Rc::new(RefCell::new(String::from(""))),
installs_path: String::from(""),
};
let mut root_column: druid::widget::Flex<AppData> = druid::widget::Flex::column();
// DETERMINE AMONG US VERSION
let version = env!("CARGO_PKG_VERSION");
let mut among_us_folder = PathBuf::new();
@@ -178,25 +263,9 @@ async fn main() {
if let Ok(existing_folder) = existing_found_folder {
among_us_folder.push(existing_folder);
} else {
let folder_opt = detect_among_us_folder();
let folder_opt: Option<String> = detect_among_us_folder();
if folder_opt.is_some() {
among_us_folder.push(folder_opt.unwrap());
} else {
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()),
);
},
);
// If we can't find Among Us, add the locate button.
// TODO: make this button then update the UI assuming it's valid
root_column.add_flex_child(open_button, 1.0);
// Pop the selected file off the end of the path
// among_us_folder.pop();
}
if among_us_folder.exists() {
@@ -204,6 +273,19 @@ async fn main() {
}
}
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 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() {
if among_us_folder_str.len() > 0 {
println!("Among Us Folder: {}", among_us_folder_str);
@@ -212,167 +294,6 @@ async fn main() {
}
}
if let Some(among_us_version) =
determine_among_us_version(String::from(among_us_folder.to_str().unwrap()))
{
println!("AmongUsVersion: {}", among_us_version);
let ver_url: (String, String, bool) =
determine_town_of_us_url(among_us_version.to_string().clone())
.await
.unwrap();
let version_smash = format!("{}-{}", among_us_version, ver_url.0.clone());
let new_installed_path: PathBuf = [installs_path.to_str().unwrap(), version_smash.as_str()]
.iter()
.collect();
if !Path::exists(&new_installed_path) {
println!("Copying Among Us to cache location...");
copy_folder_to_target(
among_us_folder.to_str().unwrap(),
installs_path.to_str().unwrap(),
);
let among_us_path: PathBuf = [installs_path.to_str().unwrap(), "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 = data_path.clone();
let downloaded_filename = ver_url.1.rsplit('/').next().unwrap();
download_path.push(downloaded_filename.clone());
if !Path::exists(&download_path) {
// println!("{:?}", download_path);
println!("Downloading Town of Us... [{}]", ver_url.1.clone());
let zip = reqwest::get(ver_url.1.clone())
.await
.unwrap()
.bytes()
.await
.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_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.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(),
);
} else {
println!("Modded install already found");
}
// Find existing installs, make buttons for them
let install_iter = fs::read_dir(installs_path.clone());
if let Ok(iter) = install_iter {
let mut collection: Vec<Result<fs::DirEntry, io::Error>> = iter.collect();
collection.reverse();
// 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 = 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, _| {
attempt_run_among_us(&clone);
});
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 {
root_column.add_flex_child(i, 1.0);
}
}
}
// println!("Checking for updater updates...");
// let vals: (String, String) = version_check_thread_handle.join().unwrap();
@@ -381,38 +302,55 @@ async fn main() {
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(());
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);
let app_launcher = AppLauncher::with_window(main_window).delegate(Delegate {});
let _external_handler = app_launcher.get_external_handle();
app_launcher.launch(app_data).unwrap();
}
// 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();
// process::Command::new(executable_path.to_str().unwrap())
// .spawn()
// .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 {
Err("Better Crew Link not found".to_string())
}
}
// Returns (Version, URL)
async fn determine_town_of_us_url(among_us_version: String) -> Option<(String, String, bool)> {
let markdown =
reqwest::get("https://raw.githubusercontent.com/eDonnes124/Town-Of-Us-R/master/README.md")
.await
.unwrap()
.text()
.await
.unwrap();
fn determine_town_of_us_url(among_us_version: String) -> Option<(String, String, bool)> {
let markdown = reqwest::blocking::get(
"https://raw.githubusercontent.com/eDonnes124/Town-Of-Us-R/master/README.md",
)
.unwrap()
.text()
.unwrap();
let mut line = markdown.find(&among_us_version);
let mut line_offset = 0;
let mut official_compatibility = false;
@@ -500,12 +438,12 @@ 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> {
None
}
fn detect_epic() -> Option<String> {
let default_folder = String::from("C:\\Program Files\\Epic Games\\AmongUs");
fn _detect_epic() -> Option<String> {
let _default_folder = String::from("C:\\Program Files\\Epic Games\\AmongUs");
None
}