Compare commits
15 Commits
81e8eaad0f
...
3.0.0
| Author | SHA1 | Date | |
|---|---|---|---|
| ff311475dc | |||
| 8e61c8a2f2 | |||
| 97cdf4829a | |||
| 7244c24fe4 | |||
| fbc4c747a5 | |||
| 7f1a6c6bc1 | |||
| 856cffd740 | |||
| 9468194718 | |||
| 69f67d303e | |||
| 6d05440d98 | |||
| 686d24f7b5 | |||
| 972c310673 | |||
| 90b703ee30 | |||
| 38c975b44c | |||
| 762d96baee |
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "town-of-us-updater"
|
name = "town-of-us-updater"
|
||||||
version = "2.0.0"
|
version = "3.0.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
build = "src/build.rs"
|
build = "src/build.rs"
|
||||||
|
|
||||||
@@ -16,6 +16,7 @@ iui = "0.3.0"
|
|||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
tokio = {version="1", features=["full"]}
|
tokio = {version="1", features=["full"]}
|
||||||
druid = "0.7.0"
|
druid = "0.7.0"
|
||||||
|
registry = "1"
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
embed-resource = "1.6"
|
embed-resource = "1.6"
|
||||||
|
|||||||
@@ -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
|
||||||
|
|
||||||
|
|||||||
205
src/among_us_launcher_widget.rs
Normal file
205
src/among_us_launcher_widget.rs
Normal file
@@ -0,0 +1,205 @@
|
|||||||
|
use crate::AmongUsVersion;
|
||||||
|
use crate::AppData;
|
||||||
|
use druid::{
|
||||||
|
widget::*, BoxConstraints, Color, 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 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>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
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());
|
||||||
|
|
||||||
|
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<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 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();
|
||||||
|
|
||||||
|
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),
|
||||||
|
1.0,
|
||||||
|
)
|
||||||
|
.with_default_spacer();
|
||||||
|
flexbox_array.push(flex);
|
||||||
|
}
|
||||||
|
|
||||||
|
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 mut blessed_split = data.blessed_version.as_str().split('-');
|
||||||
|
let blessed_version = AmongUsVersion::from(blessed_split.next().unwrap());
|
||||||
|
let among_us_version = AmongUsVersion::from(ver_smash_split.next().unwrap());
|
||||||
|
let tou_version = ver_smash_split.next().unwrap();
|
||||||
|
let blessed_tou_version = blessed_split.next().unwrap();
|
||||||
|
let button_string: String = format!("Town of Us {}", tou_version);
|
||||||
|
|
||||||
|
for (index, j) in auv_array.iter().enumerate() {
|
||||||
|
if j == &among_us_version {
|
||||||
|
let mut clone: PathBuf = PathBuf::from(data.installs_path.clone());
|
||||||
|
clone.push(existing_ver_smash.clone());
|
||||||
|
|
||||||
|
let mut button_label: Label<AppData> =
|
||||||
|
Label::new(button_string.as_str()).with_text_size(24.0);
|
||||||
|
|
||||||
|
if j == &blessed_version && tou_version == blessed_tou_version {
|
||||||
|
button_label.set_text_color(Color::GREEN);
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut button_row: Flex<AppData> = Flex::row();
|
||||||
|
|
||||||
|
let fybutton = druid::widget::Button::from_label(button_label)
|
||||||
|
.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());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
flexbox_array.reverse();
|
||||||
|
|
||||||
|
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);
|
||||||
|
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!("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!");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
|
use druid::Data;
|
||||||
use std::fmt;
|
use std::fmt;
|
||||||
|
|
||||||
#[derive(Ord, PartialOrd, Eq, PartialEq)]
|
#[derive(Ord, PartialOrd, Eq, PartialEq, Clone, Debug, Data)]
|
||||||
pub struct AmongUsVersion {
|
pub struct AmongUsVersion {
|
||||||
year: i32,
|
year: i32,
|
||||||
month: i32,
|
month: i32,
|
||||||
@@ -13,6 +14,16 @@ impl fmt::Display for AmongUsVersion {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Default for AmongUsVersion {
|
||||||
|
fn default() -> Self {
|
||||||
|
AmongUsVersion {
|
||||||
|
year: 0,
|
||||||
|
month: 0,
|
||||||
|
day: 0,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl From<&str> for AmongUsVersion {
|
impl From<&str> for AmongUsVersion {
|
||||||
fn from(s: &str) -> AmongUsVersion {
|
fn from(s: &str) -> AmongUsVersion {
|
||||||
// Ignore a prepending "v"
|
// Ignore a prepending "v"
|
||||||
|
|||||||
492
src/main.rs
492
src/main.rs
@@ -1,27 +1,66 @@
|
|||||||
// Modules
|
// Modules
|
||||||
|
mod among_us_launcher_widget;
|
||||||
mod among_us_version;
|
mod among_us_version;
|
||||||
|
mod semver;
|
||||||
|
|
||||||
// Uses
|
// Uses
|
||||||
|
use among_us_launcher_widget::*;
|
||||||
use among_us_version::*;
|
use among_us_version::*;
|
||||||
|
|
||||||
use std::{cell::RefCell, fs, io, path::Path, path::PathBuf, process, rc::Rc, str};
|
use semver::*;
|
||||||
|
|
||||||
|
use std::{
|
||||||
|
fs,
|
||||||
|
path::{Path, PathBuf},
|
||||||
|
process, str,
|
||||||
|
};
|
||||||
|
|
||||||
use fs_extra::{copy_items, dir};
|
use fs_extra::{copy_items, dir};
|
||||||
|
|
||||||
use regex::Regex;
|
use regex::Regex;
|
||||||
|
|
||||||
|
#[cfg(target_os = "windows")]
|
||||||
|
use registry::Hive;
|
||||||
|
|
||||||
// GUI stuff
|
// GUI stuff
|
||||||
use druid::{
|
use druid::{
|
||||||
commands, widget::*, AppDelegate, AppLauncher, Application, Data, DelegateCtx, Env,
|
commands, widget::*, AppDelegate, AppLauncher, Data, DelegateCtx, Env, Handled, Target,
|
||||||
FileDialogOptions, Handled, Target, WidgetExt, WindowDesc,
|
WidgetPod, WindowDesc, WindowId,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
use reqwest::StatusCode;
|
||||||
|
|
||||||
|
#[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;
|
struct Delegate;
|
||||||
|
|
||||||
#[derive(Data, Clone)]
|
#[derive(Data, Clone, Debug)]
|
||||||
struct AppData {
|
pub struct AppData {
|
||||||
pub among_us_path: Rc<RefCell<String>>,
|
pub among_us_path: String,
|
||||||
pub installs_path: String,
|
pub installs_path: String,
|
||||||
|
pub version: SemVer,
|
||||||
|
pub initialized: bool,
|
||||||
|
pub among_us_version: AmongUsVersion,
|
||||||
|
pub data_path: String,
|
||||||
|
pub app_state: GlobalAppState,
|
||||||
|
pub blessed_version: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
static AMONG_US_APPID: &str = "945360";
|
static AMONG_US_APPID: &str = "945360";
|
||||||
@@ -57,13 +96,10 @@ fn unmod_among_us_folder(folder_path: &Path) {
|
|||||||
fs::remove_dir_all(mono_path).unwrap_or_default();
|
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 version = env!("CARGO_PKG_VERSION");
|
||||||
|
|
||||||
let mut cur_vers = version.split('.');
|
let local_sem_ver = SemVer::from(version);
|
||||||
let major_ver = cur_vers.next().unwrap().parse::<i32>().unwrap();
|
|
||||||
let minor_ver = cur_vers.next().unwrap().parse::<i32>().unwrap();
|
|
||||||
let patch_ver = cur_vers.next().unwrap().parse::<i32>().unwrap();
|
|
||||||
|
|
||||||
let body =
|
let body =
|
||||||
reqwest::get("https://git.dormedas.com/api/v1/repos/dormedas/town-of-us-updater/releases");
|
reqwest::get("https://git.dormedas.com/api/v1/repos/dormedas/town-of-us-updater/releases");
|
||||||
@@ -72,33 +108,33 @@ async fn get_latest_updater_version() -> Result<(String, String), reqwest::Error
|
|||||||
for i in root.as_array().unwrap() {
|
for i in root.as_array().unwrap() {
|
||||||
let tag_name = i["tag_name"].as_str().unwrap();
|
let tag_name = i["tag_name"].as_str().unwrap();
|
||||||
if let Some(trimmed_str) = tag_name.strip_prefix('v') {
|
if let Some(trimmed_str) = tag_name.strip_prefix('v') {
|
||||||
let mut vers = trimmed_str.split('.');
|
let remote_sem_ver = SemVer::from(trimmed_str);
|
||||||
let tag_major_ver = vers.next().unwrap().parse::<i32>().unwrap();
|
if remote_sem_ver > local_sem_ver {
|
||||||
let tag_minor_ver = vers.next().unwrap().parse::<i32>().unwrap();
|
for j in i["assets"].as_array().unwrap() {
|
||||||
let tag_patch_ver = vers.next().unwrap().parse::<i32>().unwrap();
|
if j["name"].as_str().unwrap().contains(".exe") {
|
||||||
if tag_major_ver > major_ver
|
// let url = j["browser_download_url"].as_str().unwrap();
|
||||||
|| (tag_major_ver == major_ver && tag_minor_ver > minor_ver)
|
// let data = reqwest::get(url).await?.bytes().await?;
|
||||||
|| (tag_major_ver == major_ver
|
// let mut exe_dir = std::env::current_dir().unwrap();
|
||||||
&& tag_minor_ver == minor_ver
|
// exe_dir.push("town-of-us-updater-new.exe");
|
||||||
&& tag_patch_ver > patch_ver)
|
// fs::write(exe_dir, data).unwrap();
|
||||||
{
|
}
|
||||||
println!("New version of the updater detected!");
|
}
|
||||||
|
println!("New version ({}) of the updater detected!", remote_sem_ver);
|
||||||
}
|
}
|
||||||
println!("{}", trimmed_str);
|
|
||||||
} else {
|
} else {
|
||||||
let mut vers = tag_name.split('.');
|
let remote_sem_ver = SemVer::from(tag_name);
|
||||||
let tag_major_ver = vers.next().unwrap().parse::<i32>().unwrap();
|
if remote_sem_ver > local_sem_ver {
|
||||||
let tag_minor_ver = vers.next().unwrap().parse::<i32>().unwrap();
|
for j in i["assets"].as_array().unwrap() {
|
||||||
let tag_patch_ver = vers.next().unwrap().parse::<i32>().unwrap();
|
if j["name"].as_str().unwrap().contains(".exe") {
|
||||||
if tag_major_ver > major_ver
|
// let url = j["browser_download_url"].as_str().unwrap();
|
||||||
|| (tag_major_ver == major_ver && tag_minor_ver > minor_ver)
|
// let data = reqwest::get(url).await?.bytes().await?;
|
||||||
|| (tag_major_ver == major_ver
|
// let mut exe_dir = std::env::current_dir().unwrap();
|
||||||
&& tag_minor_ver == minor_ver
|
// exe_dir.push("town-of-us-updater-new.exe");
|
||||||
&& tag_patch_ver > patch_ver)
|
// fs::write(exe_dir, data).unwrap();
|
||||||
{
|
}
|
||||||
println!("New version of the updater detected!");
|
}
|
||||||
|
println!("New version ({}) of the updater detected!", remote_sem_ver);
|
||||||
}
|
}
|
||||||
println!("{}", i["tag_name"]);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -106,6 +142,17 @@ async fn get_latest_updater_version() -> Result<(String, String), reqwest::Error
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl AppDelegate<AppData> for Delegate {
|
impl AppDelegate<AppData> for Delegate {
|
||||||
|
fn window_added(
|
||||||
|
&mut self,
|
||||||
|
_id: WindowId,
|
||||||
|
data: &mut AppData,
|
||||||
|
_env: &Env,
|
||||||
|
ctx: &mut DelegateCtx,
|
||||||
|
) {
|
||||||
|
if !data.among_us_path.is_empty() {
|
||||||
|
ctx.submit_command(DETERMINE_AMONG_US_VERSION);
|
||||||
|
}
|
||||||
|
}
|
||||||
fn command(
|
fn command(
|
||||||
&mut self,
|
&mut self,
|
||||||
_ctx: &mut DelegateCtx,
|
_ctx: &mut DelegateCtx,
|
||||||
@@ -114,119 +161,43 @@ impl AppDelegate<AppData> for Delegate {
|
|||||||
data: &mut AppData,
|
data: &mut AppData,
|
||||||
_env: &Env,
|
_env: &Env,
|
||||||
) -> Handled {
|
) -> Handled {
|
||||||
|
// println!("Command!");
|
||||||
if let Some(file_info) = cmd.get(commands::OPEN_FILE) {
|
if let Some(file_info) = cmd.get(commands::OPEN_FILE) {
|
||||||
println!("{:?}", file_info);
|
|
||||||
let among_us_folder = file_info.path();
|
let among_us_folder = file_info.path();
|
||||||
let mut buf = among_us_folder.to_path_buf();
|
let mut buf = among_us_folder.to_path_buf();
|
||||||
buf.pop();
|
buf.pop();
|
||||||
let mut borrow = data.among_us_path.borrow_mut();
|
data.among_us_path = String::from(buf.to_str().unwrap());
|
||||||
*borrow = String::from(buf.to_str().unwrap());
|
|
||||||
|
|
||||||
// Pop the selected file off the end of the path
|
// Pop the selected file off the end of the path
|
||||||
// among_us_folder.pop();
|
// among_us_folder.pop();
|
||||||
println!("{}", buf.to_str().unwrap());
|
println!("{}", buf.to_str().unwrap());
|
||||||
println!("Handled!");
|
// println!("Handled!");
|
||||||
Application::global().quit();
|
//Application::global().quit();
|
||||||
|
|
||||||
return Handled::Yes;
|
return Handled::Yes;
|
||||||
}
|
} else if let Some(_a) = cmd.get(among_us_launcher_widget::DETERMINE_AMONG_US_VERSION) {
|
||||||
Handled::No
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::main]
|
|
||||||
async 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");
|
|
||||||
fs::create_dir(data_path.clone()).unwrap_or(());
|
|
||||||
|
|
||||||
let mut installs_path = data_path.clone();
|
|
||||||
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 mut among_us_folder = PathBuf::new();
|
|
||||||
|
|
||||||
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());
|
|
||||||
|
|
||||||
if let Ok(existing_folder) = existing_found_folder {
|
|
||||||
among_us_folder.push(existing_folder);
|
|
||||||
} else {
|
|
||||||
let folder_opt = 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() {
|
|
||||||
fs::write(existing_file_path, among_us_folder.to_str().unwrap()).unwrap();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(among_us_version) =
|
if let Some(among_us_version) =
|
||||||
determine_among_us_version(String::from(among_us_folder.to_str().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);
|
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) =
|
let ver_url: (String, String, bool) =
|
||||||
determine_town_of_us_url(among_us_version.to_string().clone())
|
determine_town_of_us_url(data.among_us_version.to_string().clone()).unwrap();
|
||||||
.await
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
let version_smash = format!("{}-{}", among_us_version, ver_url.0.clone());
|
let version_smash = format!("{}-{}", data.among_us_version, ver_url.0.clone());
|
||||||
let new_installed_path: PathBuf = [installs_path.to_str().unwrap(), version_smash.as_str()]
|
let new_installed_path: PathBuf = [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(
|
copy_folder_to_target(data.among_us_path.clone(), data.installs_path.clone());
|
||||||
among_us_folder.to_str().unwrap(),
|
|
||||||
installs_path.to_str().unwrap(),
|
|
||||||
);
|
|
||||||
|
|
||||||
let among_us_path: PathBuf = [installs_path.to_str().unwrap(), "Among Us\\"]
|
let among_us_path: PathBuf =
|
||||||
.iter()
|
[data.installs_path.as_str(), "Among Us"].iter().collect();
|
||||||
.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);
|
||||||
@@ -246,26 +217,31 @@ async fn main() {
|
|||||||
fs::set_permissions(among_us_path.clone(), perms).unwrap();
|
fs::set_permissions(among_us_path.clone(), perms).unwrap();
|
||||||
|
|
||||||
fs::rename(among_us_path, new_installed_path.clone()).unwrap();
|
fs::rename(among_us_path, new_installed_path.clone()).unwrap();
|
||||||
let mut download_path = data_path.clone();
|
let mut download_path: PathBuf = [data.data_path.as_str()].iter().collect();
|
||||||
let downloaded_filename = ver_url.1.rsplit('/').next().unwrap();
|
let downloaded_filename: &str = ver_url.1.rsplit('/').next().unwrap();
|
||||||
download_path.push(downloaded_filename.clone());
|
download_path.push(downloaded_filename);
|
||||||
|
|
||||||
if !Path::exists(&download_path) {
|
if !download_path.exists() {
|
||||||
// println!("{:?}", download_path);
|
// println!("{:?}", download_path);
|
||||||
println!("Downloading Town of Us... [{}]", ver_url.1.clone());
|
println!(
|
||||||
let zip = reqwest::get(ver_url.1.clone())
|
"Downloading Town of Us... Please be patient! [{}]",
|
||||||
.await
|
ver_url.1.clone()
|
||||||
.unwrap()
|
);
|
||||||
.bytes()
|
let client = reqwest::blocking::Client::builder()
|
||||||
.await
|
.timeout(None)
|
||||||
|
.build()
|
||||||
.unwrap();
|
.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();
|
fs::write(download_path.clone(), zip).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
let opened_zip = fs::File::open(download_path).unwrap();
|
let opened_zip = fs::File::open(download_path.clone()).unwrap();
|
||||||
println!("Extracting mod zip file...");
|
println!("Extracting mod zip file...");
|
||||||
let mut archive = zip::ZipArchive::new(opened_zip).unwrap();
|
let mut archive = zip::ZipArchive::new(opened_zip).unwrap();
|
||||||
archive.extract(data_path.clone()).unwrap();
|
archive.extract(data.data_path.clone()).unwrap();
|
||||||
|
|
||||||
|
fs::remove_file(download_path).unwrap();
|
||||||
|
|
||||||
let mut root_folder_path = String::new();
|
let mut root_folder_path = String::new();
|
||||||
for i in archive.file_names() {
|
for i in archive.file_names() {
|
||||||
@@ -273,7 +249,7 @@ async fn main() {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
let extracted_path: PathBuf =
|
let extracted_path: PathBuf =
|
||||||
[data_path.to_str().unwrap(), root_folder_path.as_str(), "."]
|
[data.data_path.as_str(), root_folder_path.as_str(), "."]
|
||||||
.iter()
|
.iter()
|
||||||
.collect();
|
.collect();
|
||||||
println!("{}", extracted_path.to_str().unwrap());
|
println!("{}", extracted_path.to_str().unwrap());
|
||||||
@@ -281,84 +257,83 @@ async fn main() {
|
|||||||
extracted_path.to_str().unwrap(),
|
extracted_path.to_str().unwrap(),
|
||||||
new_installed_path.to_str().unwrap(),
|
new_installed_path.to_str().unwrap(),
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
data.initialized = !data.initialized;
|
||||||
|
data.app_state = GlobalAppState::Initialized;
|
||||||
|
|
||||||
|
return Handled::Yes;
|
||||||
|
}
|
||||||
|
|
||||||
|
Handled::No
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let version = env!("CARGO_PKG_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();
|
||||||
|
|
||||||
|
let blessed_version: String = match response.status() {
|
||||||
|
StatusCode::OK => response.text().unwrap(),
|
||||||
|
_ => String::from("0.0.0-v0.0.0"),
|
||||||
|
};
|
||||||
|
|
||||||
|
println!("Blessed Version: {}", blessed_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");
|
||||||
|
fs::create_dir(data_path.clone()).unwrap_or(());
|
||||||
|
|
||||||
|
let mut installs_path = data_path.clone();
|
||||||
|
installs_path.push("installs");
|
||||||
|
fs::create_dir(installs_path.clone()).unwrap_or(());
|
||||||
|
|
||||||
|
let version = env!("CARGO_PKG_VERSION");
|
||||||
|
|
||||||
|
let mut among_us_folder = PathBuf::new();
|
||||||
|
|
||||||
|
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());
|
||||||
|
|
||||||
|
if let Ok(existing_folder) = existing_found_folder {
|
||||||
|
among_us_folder.push(existing_folder);
|
||||||
} else {
|
} else {
|
||||||
println!("Modded install already found");
|
let folder_opt: Option<String> = detect_among_us_folder();
|
||||||
|
if folder_opt.is_some() {
|
||||||
|
among_us_folder.push(folder_opt.unwrap());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Find existing installs, make buttons for them
|
if among_us_folder.exists() {
|
||||||
let install_iter = fs::read_dir(installs_path.clone());
|
fs::write(existing_file_path, among_us_folder.to_str().unwrap()).unwrap();
|
||||||
|
|
||||||
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:");
|
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()),
|
||||||
|
app_state: GlobalAppState::Initializing(InitializingState::StartingGUI),
|
||||||
|
blessed_version,
|
||||||
|
};
|
||||||
|
|
||||||
for i in collection {
|
let mut root_column: druid::widget::Flex<AppData> = druid::widget::Flex::column();
|
||||||
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() {
|
// DETERMINE AMONG US VERSION
|
||||||
if j == auv {
|
|
||||||
let mut clone = installs_path.clone();
|
|
||||||
clone.push(existing_ver_smash.clone());
|
|
||||||
|
|
||||||
let mut button_row: Flex<AppData> = Flex::row();
|
if let Some(among_us_folder_str) = among_us_folder.to_str() {
|
||||||
|
if among_us_folder_str.len() > 0 {
|
||||||
let fybutton = druid::widget::Button::new(button_string.as_str())
|
println!("Among Us Folder: {}", among_us_folder_str);
|
||||||
.fix_height(45.0)
|
} else {
|
||||||
.center()
|
println!("Among Us Folder not automatically determined");
|
||||||
.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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -370,38 +345,55 @@ async fn main() {
|
|||||||
|
|
||||||
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(());
|
||||||
|
|
||||||
let main_window = WindowDesc::new(|| root_column)
|
let main_window = WindowDesc::new(|| root_column)
|
||||||
.title(title_string)
|
.title(title_string)
|
||||||
|
// .menu(main_menu)
|
||||||
.window_size((400.0, 400.0));
|
.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();
|
let _external_handler = app_launcher.get_external_handle();
|
||||||
app_launcher.launch(app_data).unwrap();
|
app_launcher.launch(app_data).unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
// let mut install_folder_path = installs_path.clone();
|
fn launch_better_crewlink() -> std::result::Result<(), String> {
|
||||||
// install_folder_path.push(version_smash);
|
let mut dir = dirs::data_local_dir().unwrap();
|
||||||
// fs::create_dir(install_folder_path.clone()).unwrap_or(());
|
dir.push("Programs");
|
||||||
|
dir.push("bettercrewlink");
|
||||||
// Copy Among Us Out
|
dir.push("Better-CrewLink.exe");
|
||||||
// Create destination path
|
println!("Attempting to launch Better Crew Link");
|
||||||
|
if dir.exists() {
|
||||||
// let executable_path: path::PathBuf = [new_installed_path.to_str().unwrap(), "Among Us.exe"]
|
process::Command::new(dir.as_path().to_str().unwrap())
|
||||||
// .iter()
|
.stdout(process::Stdio::null())
|
||||||
// .collect();
|
.stderr(process::Stdio::null())
|
||||||
|
.spawn()
|
||||||
// process::Command::new(executable_path.to_str().unwrap())
|
.unwrap();
|
||||||
// .spawn()
|
Ok(())
|
||||||
// .unwrap();
|
} else {
|
||||||
|
Err("Better Crew Link not found".to_string())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns (Version, URL)
|
// Returns (Version, URL)
|
||||||
async fn determine_town_of_us_url(among_us_version: String) -> Option<(String, String, bool)> {
|
fn determine_town_of_us_url(among_us_version: String) -> Option<(String, String, bool)> {
|
||||||
let markdown =
|
let markdown = reqwest::blocking::get(
|
||||||
reqwest::get("https://raw.githubusercontent.com/eDonnes124/Town-Of-Us-R/master/README.md")
|
"https://raw.githubusercontent.com/eDonnes124/Town-Of-Us-R/master/README.md",
|
||||||
.await
|
)
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.text()
|
.text()
|
||||||
.await
|
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
let mut line = markdown.find(&among_us_version);
|
let mut line = markdown.find(&among_us_version);
|
||||||
let mut line_offset = 0;
|
let mut line_offset = 0;
|
||||||
let mut official_compatibility = false;
|
let mut official_compatibility = false;
|
||||||
@@ -433,7 +425,7 @@ async fn determine_town_of_us_url(among_us_version: String) -> Option<(String, S
|
|||||||
}
|
}
|
||||||
|
|
||||||
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;
|
||||||
|
|
||||||
@@ -489,12 +481,35 @@ fn copy_folder_contents_to_target<T: AsRef<Path>>(source: T, dest: T) {
|
|||||||
fs_extra::dir::copy(source, dest, ©_opts).unwrap();
|
fs_extra::dir::copy(source, dest, ©_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> {
|
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 =
|
let library_folder =
|
||||||
fs::read_to_string("C:\\Program Files (x86)\\Steam\\steamapps\\libraryfolders.vdf");
|
fs::read_to_string(library_folder_path.to_str().expect("Path invalid"));
|
||||||
|
|
||||||
if library_folder.is_ok() {
|
if library_folder.is_ok() {
|
||||||
println!("Steam is on C:\\ drive!");
|
|
||||||
let mut library_folder_string: String = library_folder.unwrap();
|
let mut library_folder_string: String = library_folder.unwrap();
|
||||||
let appid_index = library_folder_string.find(AMONG_US_APPID);
|
let appid_index = library_folder_string.find(AMONG_US_APPID);
|
||||||
if appid_index.is_none() {
|
if appid_index.is_none() {
|
||||||
@@ -503,27 +518,20 @@ fn detect_among_us_folder() -> Option<String> {
|
|||||||
} else {
|
} else {
|
||||||
library_folder_string.truncate(appid_index.unwrap());
|
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 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 caps: regex::CaptureMatches = path_regex.captures_iter(&library_folder_string);
|
||||||
let last_path = caps.last().unwrap();
|
let last_path = caps.last().unwrap();
|
||||||
let start = last_path.get(last_path.len() - 1).unwrap();
|
let start = last_path.get(last_path.len() - 1).unwrap();
|
||||||
/*
|
|
||||||
println!(
|
|
||||||
"{}",
|
|
||||||
library_folder_string
|
|
||||||
.get(start.start()..start.end())
|
|
||||||
.unwrap()
|
|
||||||
);
|
|
||||||
*/
|
|
||||||
|
|
||||||
return Some(format!(
|
return Some(format!(
|
||||||
"{}\\\\steamapps\\\\common\\\\Among Us\\\\",
|
r"{}\\steamapps\\common\\Among Us\\",
|
||||||
library_folder_string
|
library_folder_string
|
||||||
.get(start.start()..start.end())
|
.get(start.start()..start.end())
|
||||||
.unwrap()
|
.unwrap()
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
}
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
|
|||||||
31
src/semver.rs
Normal file
31
src/semver.rs
Normal file
@@ -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(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user