valerie/config
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity

flags now collect properly, and list no longer fails without names

Browse source
This commit is contained in:
Valerie Wolfe 2023-07-25 10:22:46 -04:00
parent d94daca664
commit 9aa168cadf
2 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "config" name = "config"
version = "0.4.1" version = "0.4.2"
edition = "2021" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

40
src/main.rs
View file

@ -21,8 +21,14 @@ fn main() -> Result<(), Box<dyn Error>>{
// get args // get args
let mut args = Arguments::from_env(); let mut args = Arguments::from_env();
// collect args
let flag_help = args.contains(["-h", "--help"]);
let flag_list = args.contains(["-l", "--list"]);
let flag_dir = args.contains(["-d", "--dir"]);
let flag_path = args.contains(["-p", "--path"]);
// handle help flag // handle help flag
if args.contains(["-h", "--help"]) { if flag_help {
help_text(); help_text();
return Ok(()); return Ok(());
} }
@ -50,32 +56,34 @@ fn main() -> Result<(), Box<dyn Error>>{
let mut section: &Map<String, Value> = config; let mut section: &Map<String, Value> = config;
let mut target = args.subcommand().unwrap(); let mut target = args.subcommand().unwrap();
let mut fullname = String::new(); let mut fullname = String::new();
loop { if target.is_some() {
let entry = target.as_ref().unwrap(); loop {
if !fullname.is_empty() { fullname += "."; } let entry = target.as_ref().unwrap();
fullname += entry; if !fullname.is_empty() { fullname += "."; }
let i_section = section.get(entry); fullname += entry;
if i_section.is_none() { error::no_section(&entry); } let i_section = section.get(entry);
section = i_section.unwrap().as_table().unwrap(); if i_section.is_none() { error::no_section(&entry); }
section = i_section.unwrap().as_table().unwrap();
let i_target = args.subcommand().unwrap(); let i_target = args.subcommand().unwrap();
if i_target.is_none() { break; } if i_target.is_none() { break; }
target = i_target; target = i_target;
}
} }
if target.is_none() { error::no_args(); }
// handle list flag // handle list flag
if args.contains(["-l", "--list"]) { if flag_list {
for (key, _) in section.iter() { for (key, _) in section.iter() {
println!("{key}"); println!("{key}");
} }
return Ok(()); return Ok(());
} }
if target.is_none() { error::no_args(); }
let prop_path = section.get("path"); let prop_path = section.get("path");
// handle dir flag // handle dir flag
if args.contains(["-d", "--dir"]) { if flag_dir {
if prop_path.is_none() { if prop_path.is_none() {
error::no_property(&fullname, "path"); error::no_property(&fullname, "path");
} }
@ -92,7 +100,7 @@ fn main() -> Result<(), Box<dyn Error>>{
return Ok(()); return Ok(());
} }
// handle path flag // handle path flag
if args.contains(["-p", "--path"]) { if flag_path {
if prop_path.is_none() { error::no_property(&fullname, "path"); } if prop_path.is_none() { error::no_property(&fullname, "path"); }
let i_file_path = prop_path.unwrap().as_str().unwrap(); let i_file_path = prop_path.unwrap().as_str().unwrap();
let file_path = if i_file_path.starts_with("~") { i_file_path.replace("~", &home_dir) } else { i_file_path.to_string() }; let file_path = if i_file_path.starts_with("~") { i_file_path.replace("~", &home_dir) } else { i_file_path.to_string() };