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

fixed JSON Format MiterTactics , MiterTags, and OtherTags

Browse Source
This commit is contained in:
DastInDark
2022-08-24 01:31:28 +09:00
parent 6aeda740d9
commit cba61b19e9
1 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/afterfact.rs
View File

@@ -854,38 +854,28 @@ fn output_json_str(
{ {
println!("k dbg | {} | v dbg | {:?}", k, v); println!("k dbg | {} | v dbg | {:?}", k, v);
let tmp_val: Vec<&str> = v.split(": ").collect(); let tmp_val: Vec<&str> = v.split(": ").collect();
println!(
"tmp_val dbg | {:?} | len dbg | {:?}",
tmp_val,
tmp_val.len()
);
let key = _convert_valid_json_str(&[k.as_str()]); let key = _convert_valid_json_str(&[k.as_str()]);
let values = &tmp_val; let values: Vec<&&str> = tmp_val.iter().filter(|x| x.trim() != "").collect();
let mut value: Vec<String> = vec![]; let mut value: Vec<String> = vec![];
let mut valid_data_cnt = 0;
if values.is_empty() {
if tmp_val.is_empty() { value.push("[".to_string());
value.push("[]".to_string());
} }
for (idx, tag_val) in values.iter().enumerate() { for (idx, tag_val) in values.iter().enumerate() {
if idx == 0 { if idx == 0 {
value.push("[".to_string()); value.push("[\n".to_string());
}
if tag_val == &"" {
continue;
} }
let insert_val = format!(" \"{}\"", tag_val.trim()); let insert_val = format!(" \"{}\"", tag_val.trim());
value.push(insert_val); value.push(insert_val);
if idx != values.len() - 1 { if idx != values.len() - 1 {
value.push(",\n".to_string()); value.push(",\n".to_string());
} }
valid_data_cnt += 1;
} }
if valid_data_cnt > 0 { if values.is_empty() {
value.push(" ]".to_string());
} else {
value.push("]".to_string()); value.push("]".to_string());
} else {
value.push("\n ]".to_string());
} }
let fmted_val = value.join(""); let fmted_val = value.join("");