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

Fully implemented tokio runtime. Added build script. Executable has an icon.

Browse Source
This commit is contained in:
Ian Mason
2022-08-16 08:06:06 -07:00
parent 0b940aea70
commit 91579d333e
6 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/main.rs
View File

@@ -63,7 +63,7 @@ fn unmod_among_us_folder(folder_path: &Path) {
fs::remove_dir_all(mono_path).unwrap_or_default();
}
fn get_latest_updater_version() -> (String, String) {
async fn get_latest_updater_version() -> Result<(String, String), reqwest::Error> {
let version = env!("CARGO_PKG_VERSION");
let mut cur_vers = version.split('.');
@@ -71,10 +71,9 @@ fn get_latest_updater_version() -> (String, String) {
let minor_ver = cur_vers.next().unwrap().parse::<i32>().unwrap();
let patch_ver = cur_vers.next().unwrap().parse::<i32>().unwrap();
let body = reqwest::blocking::get(
"https://git.dormedas.com/api/v1/repos/dormedas/town-of-us-updater/releases",
);
let root: serde_json::Value = serde_json::from_str(&body.unwrap().text().unwrap()).unwrap();
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();
@@ -109,13 +108,15 @@ fn get_latest_updater_version() -> (String, String) {
}
}
(String::from("no"), String::from("yes"))
Ok((String::from("no"), String::from("yes")))
}
fn main() {
#[tokio::main]
async fn main() {
let version = env!("CARGO_PKG_VERSION");
println!("Updater Version: {}", version);
let _version_check_thread_handle = thread::spawn(move || get_latest_updater_version());
get_latest_updater_version().await.unwrap();
//let _version_check_thread_handle = thread::spawn(move || get_latest_updater_version());
// CREATE PROGRAM DIRECTORY
let mut data_path = dirs::data_dir().unwrap();
@@ -177,7 +178,9 @@ fn main() {
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.to_string().clone()).unwrap();
determine_town_of_us_url(among_us_version.to_string().clone())
.await
.unwrap();
let version_smash = format!(
"{}-{}",
@@ -266,11 +269,15 @@ fn main() {
// for i in iter {
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!(
"Among Us {} ToU {}",
ver_smash_split.next().unwrap(),
"Among Us {} Town of Us {}",
auv,
ver_smash_split.next().unwrap()
);
let mut group_vbox = VerticalBox::new(&ui);
let mut group = Group::new(&ui, auv.clone());
let mut button = Button::new(&ui, button_string.as_str());
button.on_clicked(&ui, {
let ui = ui.clone();
@@ -284,7 +291,9 @@ fn main() {
btn.set_text(&ui, "Launching Among Us...");
}
});
vbox.append(&ui, button, LayoutStrategy::Stretchy);
group_vbox.append(&ui, button, LayoutStrategy::Stretchy);
group.set_child(&ui, group_vbox);
vbox.append(&ui, group, LayoutStrategy::Stretchy);
println!("{}", existing_ver_smash.clone().to_str().unwrap());
}
}
@@ -321,13 +330,14 @@ fn main() {
}
// Returns (Version, URL)
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();
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();
let mut line = markdown.find(&among_us_version);
let mut line_offset = 0;
let mut official_compatibility = false;