Matthias Beyer
c115215fa4
This merge solved a _LOT_ of conflicts and was a rather complicated one, as parts of the conflict-resolution involved rewriting of half the stuff. This merge commit fixes all the things so a `cargo check --all` succeeds, but I did not yet check whether tests run without failure.
134 lines
4.6 KiB
Rust
134 lines
4.6 KiB
Rust
//
|
|
// imag - the personal information management suite for the commandline
|
|
// Copyright (C) 2015, 2016 Matthias Beyer <mail@beyermatthias.de> and contributors
|
|
//
|
|
// This library is free software; you can redistribute it and/or
|
|
// modify it under the terms of the GNU Lesser General Public
|
|
// License as published by the Free Software Foundation; version
|
|
// 2.1 of the License.
|
|
//
|
|
// This library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
// Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public
|
|
// License along with this library; if not, write to the Free Software
|
|
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
//
|
|
|
|
use std::cmp::Ordering;
|
|
|
|
use libimagstore::store::FileLockEntry;
|
|
use libimagstore::store::Store;
|
|
use libimagerror::trace::trace_error;
|
|
|
|
use chrono::offset::Local;
|
|
use chrono::Datelike;
|
|
use itertools::Itertools;
|
|
use chrono::naive::NaiveDateTime;
|
|
use chrono::Timelike;
|
|
|
|
use entry::DiaryEntry;
|
|
use diaryid::DiaryId;
|
|
use error::DiaryErrorKind as DEK;
|
|
use error::ResultExt;
|
|
use error::Result;
|
|
use iter::DiaryEntryIterator;
|
|
use iter::DiaryNameIterator;
|
|
|
|
pub trait Diary {
|
|
|
|
// create or get a new entry for today
|
|
fn new_entry_today(&self, diary_name: &str) -> Result<FileLockEntry>;
|
|
|
|
// create or get a new entry for now
|
|
fn new_entry_now(&self, diary_name: &str) -> Result<FileLockEntry>;
|
|
|
|
// Get an iterator for iterating over all entries of a Diary
|
|
fn entries(&self, diary_name: &str) -> Result<DiaryEntryIterator>;
|
|
|
|
fn get_youngest_entry_id(&self, diary_name: &str) -> Option<Result<DiaryId>>;
|
|
|
|
/// Get all diary names
|
|
fn diary_names(&self) -> Result<DiaryNameIterator>;
|
|
|
|
}
|
|
|
|
impl Diary for Store {
|
|
|
|
// create or get a new entry for today
|
|
fn new_entry_today(&self, diary_name: &str) -> Result<FileLockEntry> {
|
|
let dt = Local::now();
|
|
let ndt = dt.naive_local();
|
|
let id = DiaryId::new(String::from(diary_name), ndt.year(), ndt.month(), ndt.day(), 0, 0);
|
|
|
|
self.retrieve(id).chain_err(|| DEK::StoreReadError)
|
|
}
|
|
|
|
fn new_entry_now(&self, diary_name: &str) -> Result<FileLockEntry> {
|
|
let dt = Local::now();
|
|
let ndt = dt.naive_local();
|
|
let id = DiaryId::new(String::from(diary_name),
|
|
ndt.year(),
|
|
ndt.month(),
|
|
ndt.day(),
|
|
ndt.hour(),
|
|
ndt.minute());
|
|
|
|
self.retrieve(id).chain_err(|| DEK::StoreReadError)
|
|
}
|
|
|
|
// Get an iterator for iterating over all entries
|
|
fn entries(&self, diary_name: &str) -> Result<DiaryEntryIterator> {
|
|
self.retrieve_for_module("diary")
|
|
.map(|iter| DiaryEntryIterator::new(self, String::from(diary_name), iter))
|
|
.chain_err(|| DEK::StoreReadError)
|
|
}
|
|
|
|
fn get_youngest_entry_id(&self, diary_name: &str) -> Option<Result<DiaryId>> {
|
|
match Diary::entries(self, diary_name) {
|
|
Err(e) => Some(Err(e)),
|
|
Ok(entries) => {
|
|
entries
|
|
.map(|e| e.and_then(|e| e.diary_id()))
|
|
.sorted_by(|a, b| {
|
|
match (a, b) {
|
|
(&Ok(ref a), &Ok(ref b)) => {
|
|
let a : NaiveDateTime = a.clone().into();
|
|
let b : NaiveDateTime = b.clone().into();
|
|
|
|
a.cmp(&b)
|
|
},
|
|
|
|
(&Ok(_), &Err(ref e)) => {
|
|
trace_error(e);
|
|
Ordering::Less
|
|
},
|
|
(&Err(ref e), &Ok(_)) => {
|
|
trace_error(e);
|
|
Ordering::Greater
|
|
},
|
|
(&Err(ref e1), &Err(ref e2)) => {
|
|
trace_error(e1);
|
|
trace_error(e2);
|
|
Ordering::Equal
|
|
},
|
|
}
|
|
})
|
|
.into_iter()
|
|
//.map(|sidres| sidres.map(|sid| DiaryId::from_storeid(&sid)))
|
|
.next()
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Get all diary names
|
|
fn diary_names(&self) -> Result<DiaryNameIterator> {
|
|
self.retrieve_for_module("diary")
|
|
.chain_err(|| DEK::StoreReadError)
|
|
.map(DiaryNameIterator::new)
|
|
}
|
|
|
|
}
|
|
|