cargo fmt
Signed-off-by: Jia Chao <jiac13@chinaunicom.cn>
This commit is contained in:
parent
e894f2f6cd
commit
187e5c0ef0
|
@ -50,7 +50,7 @@ impl RepairConfig {
|
|||
RepairConfig {
|
||||
upstream,
|
||||
autobuild,
|
||||
fixed_version
|
||||
fixed_version,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
65
src/lib.rs
65
src/lib.rs
|
@ -3,8 +3,8 @@ use std::fs;
|
|||
use std::io::Write;
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
use tracing::{debug, error, info, trace};
|
||||
use tracing_subscriber::{fmt, EnvFilter};
|
||||
use tracing::{trace, debug, info, error};
|
||||
|
||||
use config::RepairConfig;
|
||||
use cvrf_xmlparser::{
|
||||
|
@ -87,13 +87,17 @@ pub fn covert(cli: &cli::ConvertCli) -> Result<()> {
|
|||
}
|
||||
|
||||
// 写入文件
|
||||
let mut json_file = fs::OpenOptions::new().read(true).write(true).create(true).open(output)?;
|
||||
let mut json_file = fs::OpenOptions::new()
|
||||
.read(true)
|
||||
.write(true)
|
||||
.create(true)
|
||||
.open(output)?;
|
||||
json_file.write(data.as_bytes())?;
|
||||
json_file.flush()?;
|
||||
|
||||
// 在输出到文件模式下,默认不再标准输出打印 CUSA
|
||||
if !cli.print {
|
||||
return Ok(())
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -147,13 +151,21 @@ pub fn sadb(cli: &cli::SaDbCli) -> Result<()> {
|
|||
|
||||
// 写入 sadb 文件
|
||||
let data = serde_json::to_string_pretty(&sadb)?;
|
||||
let mut sadb_file = fs::OpenOptions::new().read(true).write(true).create(true).open(&cli.sa)?;
|
||||
let mut sadb_file = fs::OpenOptions::new()
|
||||
.read(true)
|
||||
.write(true)
|
||||
.create(true)
|
||||
.open(&cli.sa)?;
|
||||
sadb_file.write(data.as_bytes())?;
|
||||
sadb_file.flush()?;
|
||||
|
||||
// 写入 cvedb 文件
|
||||
let data = serde_json::to_string_pretty(&cvedb)?;
|
||||
let mut cvedb_file = fs::OpenOptions::new().read(true).write(true).create(true).open(&cli.cve)?;
|
||||
let mut cvedb_file = fs::OpenOptions::new()
|
||||
.read(true)
|
||||
.write(true)
|
||||
.create(true)
|
||||
.open(&cli.cve)?;
|
||||
cvedb_file.write(data.as_bytes())?;
|
||||
cvedb_file.flush()?;
|
||||
|
||||
|
@ -162,8 +174,7 @@ pub fn sadb(cli: &cli::SaDbCli) -> Result<()> {
|
|||
|
||||
// 递归去读一个路径,返回一个文件列表
|
||||
#[allow(dead_code)]
|
||||
fn walk_dir<P: AsRef<Path>>(path: P, nodir: bool) -> Vec<PathBuf>
|
||||
{
|
||||
fn walk_dir<P: AsRef<Path>>(path: P, nodir: bool) -> Vec<PathBuf> {
|
||||
let mut res = vec![];
|
||||
for entry in std::fs::read_dir(path).expect("read_dir call failed!") {
|
||||
let entry = entry.unwrap().path();
|
||||
|
@ -217,8 +228,8 @@ pub fn auto() -> Result<()> {
|
|||
let _ = cvrf.load_xml(file);
|
||||
|
||||
_save_2_cusa_db(auto.target(), &cvrf)?;
|
||||
},
|
||||
_ => {},
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
|
@ -234,8 +245,11 @@ fn _save_2_cusa_db(dbpath: &str, cvrf: &CVRF) -> Result<()> {
|
|||
|
||||
// TODO: may empty
|
||||
if _src == "" {
|
||||
error!("{}: ProductTree->packages[\"src\"] have empty productid, ignore it!", cvrf.id());
|
||||
return Ok(())
|
||||
error!(
|
||||
"{}: ProductTree->packages[\"src\"] have empty productid, ignore it!",
|
||||
cvrf.id()
|
||||
);
|
||||
return Ok(());
|
||||
}
|
||||
db.push(_src.chars().next().unwrap().to_string());
|
||||
// TODO!()
|
||||
|
@ -253,20 +267,20 @@ fn _save_2_cusa_db(dbpath: &str, cvrf: &CVRF) -> Result<()> {
|
|||
// TO BE DELETE
|
||||
let parent = repairconf.parent().unwrap();
|
||||
match fs::create_dir_all(parent) {
|
||||
Ok(_) => {},
|
||||
Ok(_) => {}
|
||||
Err(e) => {
|
||||
error!("sa_id: {}, {}", cvrf.id(), e.to_string());
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
let repairconfig = RepairConfig::new(
|
||||
"22.03-LTS".to_string(),
|
||||
true,
|
||||
"".to_string(),
|
||||
);
|
||||
let repairconfig = RepairConfig::new("22.03-LTS".to_string(), true, "".to_string());
|
||||
// 写入默认配置
|
||||
let data = serde_json::to_string_pretty(&repairconfig)?;
|
||||
let mut repair = fs::OpenOptions::new().read(true).write(true).create(true).open(repairconf)?;
|
||||
let mut repair = fs::OpenOptions::new()
|
||||
.read(true)
|
||||
.write(true)
|
||||
.create(true)
|
||||
.open(repairconf)?;
|
||||
repair.write(data.as_bytes())?;
|
||||
repair.flush()?;
|
||||
|
||||
|
@ -282,8 +296,13 @@ fn _save_2_cusa_db(dbpath: &str, cvrf: &CVRF) -> Result<()> {
|
|||
}
|
||||
}
|
||||
if not_affected {
|
||||
debug!("{} not effected {}'s {}, skip...", cvrf.id(), repairconfig.upstream(), component);
|
||||
return Ok(())
|
||||
debug!(
|
||||
"{} not effected {}'s {}, skip...",
|
||||
cvrf.id(),
|
||||
repairconfig.upstream(),
|
||||
component
|
||||
);
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
// 增加 sa 信息
|
||||
|
@ -303,7 +322,11 @@ fn _save_2_cusa_db(dbpath: &str, cvrf: &CVRF) -> Result<()> {
|
|||
}
|
||||
|
||||
let data = serde_json::to_string_pretty(&cvrf.sainfo())?;
|
||||
let mut sa_file = fs::OpenOptions::new().read(true).write(true).create(true).open(db)?;
|
||||
let mut sa_file = fs::OpenOptions::new()
|
||||
.read(true)
|
||||
.write(true)
|
||||
.create(true)
|
||||
.open(db)?;
|
||||
sa_file.write(data.as_bytes())?;
|
||||
sa_file.flush()?;
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user