From e2aa7c1a29b080b8d517d3131b31e0da6488e1fb Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Mon, 13 Dec 2021 11:43:12 +0000
Subject: [PATCH] Specify range on command line

Also use the current date as base for the range if no date is specified.
Previously, it was all hardcoded.
---
 src/cli.rs | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/cli.rs b/src/cli.rs
index a4bd5b3..a01fe77 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 use std::process;
 
-use chrono::NaiveDate;
+use chrono::{Duration, NaiveDate};
 use directories::ProjectDirs;
 use structopt::StructOpt;
 
@@ -19,6 +19,15 @@ pub struct Opt {
     /// File to load
     #[structopt(short, long, parse(from_os_str))]
     file: Option<PathBuf>,
+    /// Overwrite the current date
+    #[structopt(short, long)]
+    date: Option<NaiveDate>,
+    /// How many days to include before the current date
+    #[structopt(short, long, default_value = "3")]
+    before: u32,
+    /// How many days to include after the current date
+    #[structopt(short, long, default_value = "13")]
+    after: u32,
     /// Number of the entry to view or edit
     entry: Option<usize>,
     #[structopt(subcommand)]
@@ -28,7 +37,7 @@ pub struct Opt {
 #[derive(Debug, StructOpt)]
 pub enum Command {
     /// Shows entries in a range, or a single entry if one is specified
-    /// (default)
+    /// [default]
     Show,
     /// Marks an entry as done (requires entry)
     Done,
@@ -50,11 +59,12 @@ pub fn run() -> anyhow::Result<()> {
     let mut files = Files::load(&file)?;
     let now = files.now().naive_local();
 
+    let range_date = opt.date.unwrap_or_else(|| now.date());
     let range = DateRange::new(
-        NaiveDate::from_ymd(2021, 12, 12 - 3),
-        NaiveDate::from_ymd(2021, 12, 12 + 13),
+        range_date - Duration::days(opt.before.into()),
+        range_date + Duration::days(opt.after.into()),
     )
-    .unwrap();
+    .expect("determine range");
 
     let entries = files.eval(EntryMode::Relevant, range)?;