This commit is contained in:
Junko 2024-01-19 12:22:39 +01:00
parent 02772e50b0
commit af893515c8
2 changed files with 30 additions and 1 deletions

View File

@ -18,6 +18,7 @@ tokio = { version = "1", features = ["full"] }
avatar = []
discord = ["avatar"]
fedi = ["avatar"]
jlog = []
[profile.release]
opt-level = 'z'

View File

@ -320,6 +320,19 @@ fn set_member(config_path: String, tf_members: Vec<String>) -> Result<(), &'stat
println!("--------------------------\nIf a member is missing from the system try running \"pluralsync sync\" to refresh the local database");
return Err("Missing member");
}
#[cfg(feature = "jlog")] {
let mut names = Vec::new();
for m in &to_front {
names.push(String::from(&m.name));
}
let log_fronters = names.join(" || ");
#[cfg(target_os = "windows")]
std::process::Command::new("jlog").args(["info", format!("Switch registered: {}", log_fronters)]).output().expect("Logging error");
#[cfg(not(target_os = "windows"))]
std::process::Command::new("jlog").arg("info").arg(format!("Switch registered: {}", log_fronters)).output().expect("Logging error");
}
Ok(())
}
@ -352,12 +365,26 @@ fn add_member(config_path: String, tf_members: Vec<String>) -> Result<(), &'stat
sp_set_fronters(&config.sp_key, &to_front, &fronters);
let _ = get(config_path, ForceFrom::None);
} else {
println!("One or more members were not found. Known members:\n--------------------------");
let _ = memberlist(config_path);
println!("--------------------------\nIf a member is missing from the system try running \"pluralsync sync\" to refresh the local database");
return Err("Missing member");
}
#[cfg(feature = "jlog")] {
let mut names = Vec::new();
for m in &to_front {
names.push(String::from(&m.name));
}
let log_fronters = names.join(" || ");
#[cfg(target_os = "windows")]
std::process::Command::new("jlog").args(["info", format!("Switch registered: {}", log_fronters)]).output().expect("Logging error");
#[cfg(not(target_os = "windows"))]
std::process::Command::new("jlog").arg("info").arg(format!("Switch registered: {}", log_fronters)).output().expect("Logging error");
}
Ok(())
}
@ -436,6 +463,7 @@ fn avatar_module(config: &Config, names: &Vec<String>) {
} else {
Command::new("sh").arg("-c").arg(format!("cp {}/{} {}", &config.avatar_module.avatar_folder, avatarnames, &config.avatar_module.avatar_output_path)).output().expect("Avatar module error");
}
println!("Avatar module finished");
}
}
@ -465,11 +493,11 @@ fn fedi_module(config: &Config) {
.header(USER_AGENT, "Pluralsync")
.header(AUTHORIZATION, format!("Bearer {}", &config.fedi_module.token).as_str());
println!("Fedi module finished");
match http_request(rb) {
Ok(_) => (),
Err(e) => println!("{}", e.to_string()),
}
}
}