Garmelon/today
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor CLI argument parsing

Browse source
This commit is contained in:
Joscha 2022-01-07 20:04:31 +01:00
parent 4a46e70a73
commit 2f6911eeca
5 changed files with 112 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/cli.rs
View file

@ -8,7 +8,7 @@ use directories::ProjectDirs;
use structopt::StructOpt;
use crate::eval::{DateRange, Entry, EntryMode};
use crate::files::arguments::Range;
use crate::files::arguments::CliRange;
use crate::files::{self, FileSource, Files};
use self::error::Error;
@ -29,8 +29,8 @@ pub struct Opt {
/// Overwrite the current date
#[structopt(short, long)]
date: Option<NaiveDate>,
/// The range days to focus on
#[structopt(short, long, default_value = "today-2d--today+13d")]
/// Range of days to focus on
#[structopt(short, long, default_value = "t-2d--t+13d")]
range: String,
#[structopt(subcommand)]
command: Option<Command>,
@ -57,7 +57,7 @@ pub enum Command {
#[structopt(required = true)]
entries: Vec<usize>,
},
/// Reformat all loaded files
/// Reformats all loaded files
Fmt,
}
@ -145,7 +145,7 @@ pub fn run() {
let now = find_now(&opt, &files);
// Kinda ugly, but it can stay for now (until it grows at least).
let range = match Range::from_str(&opt.range) {
let range = match CliRange::from_str(&opt.range) {
Ok(range) => match range.eval((), now.date()) {
Ok(range) => range,
Err(e) => {