CSEC_PUBLIC/hayabusa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cargo fmt

Browse Source
This commit is contained in:
DastInDark
2022-09-25 19:03:10 +09:00
parent 58ec9001f8
commit 608f6a18df
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main.rs
View File

@@ -119,17 +119,25 @@ impl App {
if configs::CONFIG.read().unwrap().args.update_rules {
// エラーが出た場合はインターネット接続がそもそもできないなどの問題点もあるためエラー等の出力は行わない
let latest_version_data = if let Ok(data) = Update::get_latest_hayabusa_version(){
let latest_version_data = if let Ok(data) = Update::get_latest_hayabusa_version() {
data
} else {
None
};
let now_version = configs::CONFIG.read().unwrap().app.get_version().unwrap();
if latest_version_data.is_some() && now_version != latest_version_data.as_ref().unwrap_or(&now_version.to_string()) {
if latest_version_data.is_some()
&& now_version
!= latest_version_data
.as_ref()
.unwrap_or(&now_version.to_string())
{
write_color_buffer(
&BufferWriter::stdout(ColorChoice::Always),
None,
&format!("There is a new version of Hayabusa: {}", latest_version_data.unwrap()),
&format!(
"There is a new version of Hayabusa: {}",
latest_version_data.unwrap()
),
true,
)
.ok();
@@ -141,10 +149,9 @@ impl App {
)
.ok();
}
match Update::update_rules(
configs::CONFIG.read().unwrap().args.rules.to_str().unwrap(),
) {
match Update::update_rules(configs::CONFIG.read().unwrap().args.rules.to_str().unwrap())
{
Ok(output) => {
if output != "You currently have the latest rules." {
write_color_buffer(

15
src/options/update.rs
View File

@@ -19,10 +19,12 @@ use termcolor::{BufferWriter, ColorChoice};
pub struct Update {}
impl Update {
/// get latest hayabusa version number.
pub fn get_latest_hayabusa_version() -> Result<Option<String>, Box<dyn std::error::Error>> {
let res = reqwest::blocking::get("https://api.github.com/repos/Yamato-Security/hayabusa/releases/latest")?.json::<std::collections::HashMap<String, String>>()?;
let res = reqwest::blocking::get(
"https://api.github.com/repos/Yamato-Security/hayabusa/releases/latest",
)?
.json::<std::collections::HashMap<String, String>>()?;
if let Some(o) = res.get("tag_name") {
Ok(Some(o.to_owned()))
} else {
@@ -95,12 +97,9 @@ impl Update {
}
}
if result.is_ok() {
let updated_modified_rules =
Update::get_updated_rules(rule_path, &prev_modified_time);
result = Update::print_diff_modified_rule_dates(
prev_modified_rules,
updated_modified_rules,
);
let updated_modified_rules = Update::get_updated_rules(rule_path, &prev_modified_time);
result =
Update::print_diff_modified_rule_dates(prev_modified_rules, updated_modified_rules);
}
result
}