summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin/domain/imag-diary/src/create.rs63
-rw-r--r--lib/domain/libimagdiary/src/diary.rs6
2 files changed, 40 insertions, 29 deletions
diff --git a/bin/domain/imag-diary/src/create.rs b/bin/domain/imag-diary/src/create.rs
index 148c4b5..4f861ce 100644
--- a/bin/domain/imag-diary/src/create.rs
+++ b/bin/domain/imag-diary/src/create.rs
@@ -18,9 +18,11 @@
//
use clap::ArgMatches;
+use chrono::NaiveDateTime;
+use chrono::Local;
+use chrono::Timelike;
use libimagdiary::diary::Diary;
-use libimagdiary::diaryid::DiaryId;
use libimagdiary::error::DiaryErrorKind as DEK;
use libimagdiary::error::ResultExt;
use libimagentryedit::edit::Edit;
@@ -72,8 +74,8 @@ fn create_entry<'a>(diary: &'a Store, diaryname: &str, rt: &Runtime) -> FileLock
}
})
.map(|timed| {
- let id = create_id_from_clispec(&create, &diaryname, timed);
- diary.retrieve(id).chain_err(|| DEK::StoreReadError)
+ let time = create_id_from_clispec(&create, &diaryname, timed);
+ diary.new_entry_at(&diaryname, &time).chain_err(|| DEK::StoreWriteError)
})
.unwrap_or_else(|| {
debug!("Creating non-timed entry");
@@ -87,41 +89,31 @@ fn create_entry<'a>(diary: &'a Store, diaryname: &str, rt: &Runtime) -> FileLock
}
-fn create_id_from_clispec(create: &ArgMatches, diaryname: &str, timed_type: Timed) -> DiaryId {
+fn create_id_from_clispec(create: &ArgMatches, diaryname: &str, timed_type: Timed) -> NaiveDateTime {
use std::str::FromStr;
- let get_hourly_id = |create: &ArgMatches| -> DiaryId {
- let time = DiaryId::now(String::from(diaryname));
- let hr = create
- .value_of("hour")
- .map(|v| { debug!("Creating hourly entry with hour = {:?}", v); v })
- .and_then(|s| {
- FromStr::from_str(s)
- .map_err(|_| warn!("Could not parse hour: '{}'", s))
- .ok()
- })
- .unwrap_or(time.hour());
-
- time.with_hour(hr)
- };
+ let dt = Local::now();
+ let ndt = dt.naive_local();
match timed_type {
Timed::Daily => {
debug!("Creating daily-timed entry");
- get_hourly_id(create)
- .with_hour(0)
+ ndt.with_hour(0)
+ .unwrap() // safe because hour = 0 is safe
.with_minute(0)
+ .unwrap() // safe because minute = 0 is safe
.with_second(0)
+ .unwrap() // safe because second = 0 is safe
},
Timed::Hourly => {
debug!("Creating hourly-timed entry");
- get_hourly_id(create)
- .with_minute(0)
+ ndt.with_minute(0)
+ .unwrap() // safe because minute = 0 is safe
.with_second(0)
+ .unwrap() // safe because second = 0 is safe
},
Timed::Minutely => {
- let time = get_hourly_id(create);
let min = create
.value_of("minute")
.map(|m| { debug!("minute = {:?}", m); m })
@@ -130,14 +122,18 @@ fn create_id_from_clispec(create: &ArgMatches, diaryname: &str, timed_type: Time
.map_err(|_| warn!("Could not parse minute: '{}'", s))
.ok()
})
- .unwrap_or(time.minute());
+ .unwrap_or(ndt.minute());
- time.with_minute(min)
+ ndt.with_minute(min)
+ .unwrap_or_else(|| {
+ error!("Cannot set {} as minute, would yield invalid time!", min);
+ ::std::process::exit(1)
+ })
.with_second(0)
+ .unwrap() // safe because second = 0 is safe
},
Timed::Secondly => {
- let time = get_hourly_id(create);
let min = create
.value_of("minute")
.map(|m| { debug!("minute = {:?}", m); m })
@@ -146,7 +142,7 @@ fn create_id_from_clispec(create: &ArgMatches, diaryname: &str, timed_type: Time
.map_err(|_| warn!("Could not parse minute: '{}'", s))
.ok()
})
- .unwrap_or(time.minute());
+ .unwrap_or(ndt.minute());
let sec = create
.value_of("second")
@@ -156,9 +152,18 @@ fn create_id_from_clispec(create: &ArgMatches, diaryname: &str, timed_type: Time
.map_err(|_| warn!("Could not parse second: '{}'", s))
.ok()
})
- .unwrap_or(time.second());
+ .unwrap_or(ndt.second());
- time.with_minute(min).with_second(sec)
+ ndt.with_minute(min)
+ .unwrap_or_else(|| {
+ error!("Cannot set {} as minute, would yield invalid time!", min);
+ ::std::process::exit(1)
+ })
+ .with_second(sec)
+ .unwrap_or_else(|| {
+ error!("Cannot set {} as second, would yield invalid time!", sec);
+ ::std::process::exit(1)
+ })
},
}
}
diff --git a/lib/domain/libimagdiary/src/diary.rs b/lib/domain/libimagdiary/src/diary.rs
index ea4b249..779c7d5 100644
--- a/lib/domain/libimagdiary/src/diary.rs
+++ b/lib/domain/libimagdiary/src/diary.rs
@@ -47,6 +47,8 @@ pub trait Diary {
// create or get a new entry for now
fn new_entry_now(&self, diary_name: &str) -> Result<FileLockEntry>;
+ fn new_entry_at(&self, diary_name: &str, ndt: &NaiveDateTime) -> Result<FileLockEntry>;
+
// Get an iterator for iterating over all entries of a Diary
fn entries(&self, diary_name: &str) -> Result<DiaryEntryIterator>;
@@ -73,6 +75,10 @@ impl Diary for Store {
fn new_entry_now(&self, diary_name: &str) -> Result<FileLockEntry> {
let dt = Local::now();
let ndt = dt.naive_local();
+ self.new_entry_at(diary_name, &ndt)
+ }
+
+ fn new_entry_at(&self, diary_name: &str, ndt: &NaiveDateTime) -> Result<FileLockEntry> {
let id = DiaryId::new(String::from(diary_name),
ndt.year(),
ndt.month(),