Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(readability): Users can now see errors and prompts, correctly #15

Merged
merged 1 commit into from
Oct 6, 2023
Merged

feat(readability): Users can now see errors and prompts, correctly #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use crate::{
copy_mod_folder, create_weidu_log_if_not_exists, mod_folder_present_in_game_directory,
search_mod_folders,
},
weidu::{generate_args, install},
weidu::install,
};

mod args;
Expand Down Expand Up @@ -48,8 +48,12 @@ fn main() {
);
copy_mod_folder(&args.game_directory, mod_folder)
}
let weidu_args = generate_args(&weidu_mod, &args.language);
install(&args.weidu_binary, &args.game_directory, weidu_args);
install(
&args.weidu_binary,
&args.game_directory,
&weidu_mod,
&args.language,
);
log::info!("Installed mod {:?}", &weidu_mod);
}
}
19 changes: 14 additions & 5 deletions src/weidu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,17 @@ pub fn get_user_input() -> String {
input.to_string()
}

pub fn generate_args(weidu_mod: &ModComponent, language: &str) -> Vec<String> {
fn generate_args(weidu_mod: &ModComponent, language: &str) -> Vec<String> {
format!("{mod_name}/{mod_tp_file} --quick-log --yes --ask-only {component} --use-lang {game_lang} --language {mod_lang}", mod_name = weidu_mod.name, mod_tp_file = weidu_mod.tp_file, component = weidu_mod.component, mod_lang = weidu_mod.lang, game_lang = language).split(' ').map(|x|x.to_string()).collect()
}

pub fn install(weidu_binary: &PathBuf, game_directory: &PathBuf, weidu_args: Vec<String>) {
log::trace!("{:#?}", weidu_args);
pub fn install(
weidu_binary: &PathBuf,
game_directory: &PathBuf,
weidu_mod: &ModComponent,
language: &str,
) {
let weidu_args = generate_args(weidu_mod, language);
let mut command = Command::new(weidu_binary);
let weidu_process = command.current_dir(game_directory).args(weidu_args.clone());

Expand All @@ -38,8 +43,10 @@ pub fn install(weidu_binary: &PathBuf, game_directory: &PathBuf, weidu_args: Vec
while child.stderr.is_none() {
let mut text = String::new();
if reader.read_line(&mut text).is_ok() {
if !text.is_empty() && !failure_flag {
if !text.is_empty() && !failure_flag && !choice_flag {
log::trace!("{}", text);
} else if choice_flag {
log::info!("{}", text);
} else {
log::error!("{}", text);
}
Expand All @@ -53,7 +60,7 @@ pub fn install(weidu_binary: &PathBuf, game_directory: &PathBuf, weidu_args: Vec
panic!();
}

match text {
match text.clone() {
// Choice
_ if choice_flag => {
if !text.chars().nth(1).unwrap_or_default().is_numeric() {
Expand All @@ -74,6 +81,7 @@ pub fn install(weidu_binary: &PathBuf, game_directory: &PathBuf, weidu_args: Vec
|| x.trim_end().starts_with("Enter "))
&& !x.to_ascii_lowercase().starts_with("[r]e-install") =>
{
log::info!("{}", text);
log::trace!("Choice found");
choice_flag = true;
}
Expand All @@ -87,6 +95,7 @@ pub fn install(weidu_binary: &PathBuf, game_directory: &PathBuf, weidu_args: Vec

// Install
x if x.starts_with("Install") => {
log::info!("{}", text);
stdin
.write_all("\n".as_bytes())
.expect("Failed to write to stdin");
Expand Down