tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/config: style fixup

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-08-21 14:11:07 +02:00
parent 928650c4eb
commit 91640ab567
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/config/datastore.rs
View File

@ -9,16 +9,15 @@ use proxmox::tools::{fs::file_set_contents, try_block};
use crate::api_schema::{ObjectSchema, StringSchema}; use crate::api_schema::{ObjectSchema, StringSchema};
use crate::section_config::{SectionConfig, SectionConfigData, SectionConfigPlugin}; use crate::section_config::{SectionConfig, SectionConfigData, SectionConfigPlugin};
lazy_static!{ lazy_static! {
static ref CONFIG: SectionConfig = init(); static ref CONFIG: SectionConfig = init();
} }
fn init() -> SectionConfig { fn init() -> SectionConfig {
let plugin = SectionConfigPlugin::new( let plugin = SectionConfigPlugin::new(
"datastore".to_string(), "datastore".to_string(),
ObjectSchema::new("DataStore properties") ObjectSchema::new("DataStore properties")
.required("path", StringSchema::new("Directory name")) .required("path", StringSchema::new("Directory name")),
); );
let id_schema = StringSchema::new("DataStore ID schema.") let id_schema = StringSchema::new("DataStore ID schema.")
@ -34,7 +33,6 @@ fn init() -> SectionConfig {
const DATASTORE_CFG_FILENAME: &str = "/etc/proxmox-backup/datastore.cfg"; const DATASTORE_CFG_FILENAME: &str = "/etc/proxmox-backup/datastore.cfg";
pub fn config() -> Result<SectionConfigData, Error> { pub fn config() -> Result<SectionConfigData, Error> {
let mut contents = String::new(); let mut contents = String::new();
try_block!({ try_block!({
@ -49,13 +47,13 @@ pub fn config() -> Result<SectionConfigData, Error> {
} }
} }
} }
}).map_err(|e| format_err!("unable to read '{}' - {}", DATASTORE_CFG_FILENAME, e))?; })
.map_err(|e| format_err!("unable to read '{}' - {}", DATASTORE_CFG_FILENAME, e))?;
CONFIG.parse(DATASTORE_CFG_FILENAME, &contents) CONFIG.parse(DATASTORE_CFG_FILENAME, &contents)
} }
pub fn save_config(config: &SectionConfigData) -> Result<(), Error> { pub fn save_config(config: &SectionConfigData) -> Result<(), Error> {
let raw = CONFIG.write(DATASTORE_CFG_FILENAME, &config)?; let raw = CONFIG.write(DATASTORE_CFG_FILENAME, &config)?;
file_set_contents(DATASTORE_CFG_FILENAME, raw.as_bytes(), None)?; file_set_contents(DATASTORE_CFG_FILENAME, raw.as_bytes(), None)?;
@ -66,7 +64,7 @@ pub fn save_config(config: &SectionConfigData) -> Result<(), Error> {
// shell completion helper // shell completion helper
pub fn complete_datastore_name(_arg: &str, _param: &HashMap<String, String>) -> Vec<String> { pub fn complete_datastore_name(_arg: &str, _param: &HashMap<String, String>) -> Vec<String> {
match config() { match config() {
Ok(data) => data.sections.iter().map(|(id,_)| id.to_string()).collect(), Ok(data) => data.sections.iter().map(|(id, _)| id.to_string()).collect(),
Err(_) => return vec![], Err(_) => return vec![],
} }
} }