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

Compare commits

base: valerie:main
Branches Tags
valerie:main
valerie:cleanup
valerie:v0.4.2
valerie:v0.4.1
valerie:v0.4.0
valerie:v0.3.0
valerie:v0.2.0
..
compare: valerie:v0.4.1
Branches Tags
valerie:main
valerie:cleanup
valerie:v0.4.2
valerie:v0.4.1
valerie:v0.4.0
valerie:v0.3.0
valerie:v0.2.0

No commits in common. "main" and "v0.4.1" have entirely different histories.
main ... v0.4.1

2 changed files with 17 additions and 28 deletions
Show stats Expand all files Collapse all files

2
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "config" name = "config"
version = "0.4.2" version = "0.4.1"
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

43
src/main.rs
View file

@ -2,7 +2,6 @@ use std::{
env::{ current_dir, var }, env::{ current_dir, var },
error::Error, error::Error,
fs::read_to_string, fs::read_to_string,
io::{ stdout, IsTerminal },
path::PathBuf, path::PathBuf,
process::{ process::{
Command, Command,
@ -22,14 +21,8 @@ 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 flag_help { if args.contains(["-h", "--help"]) {
help_text(); help_text();
return Ok(()); return Ok(());
} }
@ -57,36 +50,32 @@ 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();
if target.is_some() { loop {
loop { let entry = target.as_ref().unwrap();
let entry = target.as_ref().unwrap(); if !fullname.is_empty() { fullname += "."; }
if !fullname.is_empty() { fullname += "."; } fullname += entry;
fullname += entry; let i_section = section.get(entry);
let i_section = section.get(entry); if i_section.is_none() { error::no_section(&entry); }
if i_section.is_none() { error::no_section(&entry); } section = i_section.unwrap().as_table().unwrap();
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 flag_list { if args.contains(["-l", "--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 is_terminal = stdout().is_terminal();
let prop_path = section.get("path"); let prop_path = section.get("path");
// handle dir flag // handle dir flag
if flag_dir { if args.contains(["-d", "--dir"]) {
if prop_path.is_none() { if prop_path.is_none() {
error::no_property(&fullname, "path"); error::no_property(&fullname, "path");
} }
@ -103,7 +92,7 @@ fn main() -> Result<(), Box<dyn Error>>{
return Ok(()); return Ok(());
} }
// handle path flag // handle path flag
if flag_path || !is_terminal { if args.contains(["-p", "--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() };