Merge pull request #1282 from matthiasbeyer/libimagtimetrack/refactor

libimagtimetrack: refactor

bin/domain/imag-timetrack/src/cont.rs

@@ -33,18 +33,14 @@ use libimagtimetrack::iter::filter::*;
 use libimagrt::runtime::Runtime;
 
 pub fn cont(rt: &Runtime) -> i32 {
-    rt.store()
+    let groups = rt.store()
         .get_timetrackings()
-        .and_then(|iter| {
+        .map_err_trace_exit_unwrap(1)
-            let groups = iter
-                // unwrap everything, trace errors
         .trace_unwrap()
-
+        .filter(Option::is_some)
-                // I want all entries with an end time
+        .map(Option::unwrap)
         .filter(|e| has_end_time.filter(&e))
-
+        .group_by(|elem| match elem.get_end_datetime() { // Now group them by the end time
-                // Now group them by the end time
-                .group_by(|elem| match elem.get_end_datetime() {
             Ok(Some(dt)) => dt,
             Ok(None) => {
                 // error. We expect all of them having an end-time.
@@ -100,10 +96,6 @@ pub fn cont(rt: &Runtime) -> i32 {
             info!("No trackings to continue");
             Ok(1)
         },
-            }
+    }.map_err_trace_exit_unwrap(1)
-        })
-        .map(|_| 0)
-        .map_err_trace()
-        .unwrap_or(1)
 }
 

bin/domain/imag-timetrack/src/day.rs

@@ -81,10 +81,12 @@ pub fn day(rt: &Runtime) -> i32 {
 
     rt.store()
         .get_timetrackings()
-        .and_then(|iter| {
+        .map_err_trace_exit_unwrap(1)
-            iter.trace_unwrap()
+        .trace_unwrap()
+        .filter(Option::is_some)
+        .map(Option::unwrap)
         .filter(|e| filter.filter(e))
-                .fold(Ok(()), |acc, e| {
+        .fold(Ok(()), |acc: Result<(), ::libimagtimetrack::error::TimeTrackError>, e| {
             acc.and_then(|_| {
                 debug!("Processing {:?}", e.get_location());
 
@@ -106,7 +108,6 @@ pub fn day(rt: &Runtime) -> i32 {
                 Ok(())
             })
         })
-        })
         .map(|_| 0)
         .map_err_trace()
         .unwrap_or(1)

bin/domain/imag-timetrack/src/list.rs

@@ -30,6 +30,7 @@ use libimagerror::trace::trace_error;
 use libimagerror::trace::MapErrTrace;
 use libimagerror::iter::TraceIterator;
 use libimagstore::store::FileLockEntry;
+use libimagtimetrack::error::TimeTrackError;
 use libimagtimetrack::timetrackingstore::TimeTrackStore;
 use libimagtimetrack::timetracking::TimeTracking;
 use libimagtimetrack::error::Result;
@@ -120,8 +121,10 @@ pub fn list_impl(rt: &Runtime,
 
     rt.store()
         .get_timetrackings()
-        .and_then(|iter| {
+        .map_err_trace_exit_unwrap(1)
-            iter.trace_unwrap()
+        .trace_unwrap()
+        .filter(Option::is_some)
+        .map(Option::unwrap)
         .filter(|e| filter.filter(e))
         .fold(Ok(table), |acc: Result<_>, e| {
             acc.and_then(|mut tab: Table| {
@@ -162,10 +165,10 @@ pub fn list_impl(rt: &Runtime,
 
                 Ok(tab)
             })
-                })?
-                .print(&mut stdout)
-                .map_err(|_| String::from("Failed printing table").into())
         })
+        .map_err_trace_exit_unwrap(1)
+        .print(&mut stdout)
+        .map_err(|_| TimeTrackError::from(String::from("Failed printing table")))
         .map(|_| 0)
         .map_err_trace()
         .unwrap_or(1)

bin/domain/imag-timetrack/src/month.rs

@@ -96,10 +96,12 @@ pub fn month(rt: &Runtime) -> i32 {
 
     rt.store()
         .get_timetrackings()
-        .and_then(|iter| {
+        .map_err_trace_exit_unwrap(1)
-            iter.trace_unwrap()
+        .trace_unwrap()
+        .filter(Option::is_some)
+        .map(Option::unwrap)
         .filter(|e| filter.filter(e))
-                .fold(Ok(()), |acc, e| {
+        .fold(Ok(()), |acc: Result<(), ::libimagtimetrack::error::TimeTrackError>, e| {
             acc.and_then(|_| {
                 debug!("Processing {:?}", e.get_location());
 
@@ -121,7 +123,6 @@ pub fn month(rt: &Runtime) -> i32 {
                 Ok(())
             })
         })
-        })
         .map(|_| 0)
         .map_err_trace()
         .unwrap_or(1)

bin/domain/imag-timetrack/src/stop.rs

@@ -57,8 +57,10 @@ pub fn stop(rt: &Runtime) -> i32 {
             rt.store()
                 .get_timetrackings()
                 .map_err_trace_exit_unwrap(1)
+                .trace_unwrap()
+                .filter(Option::is_some)
+                .map(Option::unwrap)
                 .filter_map(|tracking| {
-                    let tracking = tracking.map_err_trace_exit_unwrap(1);
                     let is_none = tracking
                         .get_end_datetime()
                         .map_err_trace_exit_unwrap(1)
@@ -83,6 +85,8 @@ pub fn stop(rt: &Runtime) -> i32 {
         .map_warn_err_str("Getting timetrackings failed")
         .map_err_trace_exit_unwrap(1)
         .trace_unwrap()
+        .filter(Option::is_some)
+        .map(Option::unwrap)
 
         // Filter all timetrackings for the ones that are not yet ended.
         .filter(|e| filter.filter(e))

bin/domain/imag-timetrack/src/week.rs

@@ -88,10 +88,12 @@ pub fn week(rt: &Runtime) -> i32 {
 
     rt.store()
         .get_timetrackings()
-        .and_then(|iter| {
+        .map_err_trace_exit_unwrap(1)
-            iter.trace_unwrap()
+        .trace_unwrap()
+        .filter(Option::is_some)
+        .map(Option::unwrap)
         .filter(|e| filter.filter(e))
-                .fold(Ok(()), |acc, e| {
+        .fold(Ok(()), |acc: Result<(), ::libimagtimetrack::error::TimeTrackError>, e| {
             acc.and_then(|_| {
                 debug!("Processing {:?}", e.get_location());
 
@@ -113,7 +115,6 @@ pub fn week(rt: &Runtime) -> i32 {
                 Ok(())
             })
         })
-        })
         .map(|_| 0)
         .map_err_trace()
         .unwrap_or(1)

bin/domain/imag-timetrack/src/year.rs

@@ -87,10 +87,12 @@ pub fn year(rt: &Runtime) -> i32 {
 
     rt.store()
         .get_timetrackings()
-        .and_then(|iter| {
+        .map_err_trace_exit_unwrap(1)
-            iter.trace_unwrap()
+        .trace_unwrap()
+        .filter(Option::is_some)
+        .map(Option::unwrap)
         .filter(|e| filter.filter(e))
-                .fold(Ok(()), |acc, e| {
+        .fold(Ok(()), |acc: Result<(), ::libimagtimetrack::error::TimeTrackError>, e| {
             acc.and_then(|_| {
                 debug!("Processing {:?}", e.get_location());
 
@@ -112,7 +114,6 @@ pub fn year(rt: &Runtime) -> i32 {
                 Ok(())
             })
         })
-        })
         .map(|_| 0)
         .map_err_trace()
         .unwrap_or(1)

lib/domain/libimagtimetrack/src/error.rs

@@ -22,20 +22,21 @@ error_chain! {
         TimeTrackError, TimeTrackErrorKind, ResultExt, Result;
     }
 
+    links {
+        StoreError(::libimagstore::error::StoreError, ::libimagstore::error::StoreErrorKind);
+        DateTimeError(::libimagentrydatetime::error::DateError, ::libimagentrydatetime::error::DateErrorKind);
+        DatePathError(::libimagentrydatetime::datepath::error::DatePathCompilerError, ::libimagentrydatetime::datepath::error::DatePathCompilerErrorKind);
+        TomlError(::toml_query::error::Error, ::toml_query::error::ErrorKind);
+    }
+
+    foreign_links {
+        ChronoParseError(::chrono::format::ParseError);
+    }
+
     errors {
-        StoreReadError {
+        HeaderReadError {
-            description("Error while writing Store")
+            description("Error reading header")
-            display("Error while writing Store")
+            display("Error reading header")
-        }
-
-        StoreWriteError {
-            description("Error while reading Store")
-            display("Error while reading Store")
-        }
-
-        StoreIdError {
-            description("Error while handling StoreId")
-            display("Error while handling StoreId")
         }
 
         TagFormat {
@@ -43,22 +44,10 @@ error_chain! {
             display("Tag has invalid format")
         }
 
-        HeaderReadError {
-            description("Error writing header")
-            display("Error writing header")
-        }
-        HeaderWriteError {
-            description("Error writing header")
-            display("Error writing header")
-        }
         HeaderFieldTypeError {
             description("Type error in header")
             display("Type error in header")
         }
-        DateTimeParserError {
-            description("Error while parsing DateTime")
-            display("Error while parsing DateTime")
-        }
     }
 }
 

lib/domain/libimagtimetrack/src/iter/create.rs

@@ -23,8 +23,6 @@ use chrono::naive::NaiveDateTime as NDT;
 
 use constants::*;
 use error::TimeTrackError as TTE;
-use error::TimeTrackErrorKind as TTEK;
-use error::ResultExt;
 use iter::storeid::TagStoreIdIter;
 use iter::setendtime::SetEndTimeIter;
 
@@ -61,13 +59,11 @@ impl<'a> Iterator for CreateTimeTrackIter<'a>
                 res.and_then(|(id, starttime)| {
                     self.store
                         .create(id)
-                        .chain_err(|| TTEK::StoreWriteError)
+                        .map_err(From::from)
                         .and_then(|mut entry| {
                             let v = Value::String(starttime.format(DATE_TIME_FORMAT).to_string());
-                            entry.get_header_mut()
+                            let _ = entry.get_header_mut().insert(DATE_TIME_START_HEADER_PATH, v)?;
-                                .insert(DATE_TIME_START_HEADER_PATH, v)
+                            Ok(entry)
-                                .chain_err(|| TTEK::HeaderWriteError)
-                                .map(|_| entry)
                         })
                 })
             })

lib/domain/libimagtimetrack/src/iter/get.rs

@@ -1,63 +0,0 @@
-//
-// imag - the personal information management suite for the commandline
-// Copyright (C) 2015-2018 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 error::TimeTrackError as TTE;
-use error::TimeTrackErrorKind as TTEK;
-use error::ResultExt;
-
-use libimagstore::store::FileLockEntry;
-use libimagstore::store::Store;
-use libimagstore::storeid::StoreIdIterator;
-
-pub struct GetTimeTrackIter<'a>{
-    inner: StoreIdIterator,
-    store: &'a Store,
-}
-
-impl<'a> GetTimeTrackIter<'a> {
-
-    pub fn new(sidit: StoreIdIterator, store: &'a Store) -> GetTimeTrackIter<'a> {
-        GetTimeTrackIter {
-            inner: sidit,
-            store: store
-        }
-    }
-}
-
-impl<'a> Iterator for GetTimeTrackIter<'a> {
-    type Item = Result<FileLockEntry<'a>, TTE>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.inner.next().map(|sid| {
-            self.store
-                .get(sid)
-                .chain_err(|| TTEK::StoreReadError)?
-                .ok_or(TTE::from_kind(TTEK::StoreReadError))
-        })
-    }
-}
-
-// impl<'a, I> From<I> for GetTimeTrackIter<'a, I>
-//     where I: Iterator<Item = Result<FileLockEntry<'a>, TTE>>
-// {
-//     fn from(i: I) -> GetTimeTrackIter<'a, I> {
-//         GetTimeTrackIter(i)
-//     }
-// }
-//

lib/domain/libimagtimetrack/src/iter/mod.rs

@@ -19,7 +19,6 @@
 
 pub mod create;
 pub mod filter;
-pub mod get;
 pub mod setendtime;
 pub mod storeid;
 pub mod tag;

lib/domain/libimagtimetrack/src/iter/setendtime.rs

@@ -23,8 +23,6 @@ use chrono::naive::NaiveDateTime as NDT;
 
 use constants::*;
 use error::TimeTrackError as TTE;
-use error::TimeTrackErrorKind as TTEK;
-use error::ResultExt;
 use iter::create::CreateTimeTrackIter;
 
 use libimagstore::store::FileLockEntry;
@@ -53,10 +51,8 @@ impl<'a> Iterator for SetEndTimeIter<'a> {
             .map(|res| {
                 res.and_then(|mut fle| {
                     let v = Value::String(self.datetime.format(DATE_TIME_FORMAT).to_string());
-                    fle.get_header_mut()
+                    let _ = fle.get_header_mut().insert(DATE_TIME_END_HEADER_PATH, v)?;
-                        .insert(DATE_TIME_END_HEADER_PATH, v)
+                    Ok(fle)
-                        .chain_err(|| TTEK::HeaderWriteError)
-                        .map(|_| fle)
                 })
             })
     }

lib/domain/libimagtimetrack/src/iter/storeid.rs

@@ -21,8 +21,6 @@ use chrono::naive::NaiveDateTime as NDT;
 
 use constants::*;
 use error::TimeTrackError;
-use error::TimeTrackErrorKind as TTEK;
-use error::ResultExt;
 use iter::tag::TagIter;
 use iter::create::CreateTimeTrackIter;
 
@@ -64,7 +62,7 @@ impl Iterator for TagStoreIdIter {
                     let id_str = format!("{}-{}", dt, tag.as_str());
                     ModuleEntryPath::new(id_str)
                         .into_storeid()
-                        .chain_err(|| TTEK::StoreIdError)
+                        .map_err(From::from)
                         .map(|id| (id, self.datetime.clone()))
                 })
             })

lib/domain/libimagtimetrack/src/timetracking.rs

@@ -31,7 +31,6 @@ use libimagstore::store::Entry;
 use tag::TimeTrackingTag as TTT;
 use error::TimeTrackErrorKind as TTEK;
 use error::TimeTrackError as TTE;
-use error::ResultExt;
 use error::Result;
 use constants::*;
 
@@ -65,7 +64,7 @@ impl TimeTracking for Entry {
     fn get_timetrack_tag(&self) -> Result<TTT> {
         self.get_header()
             .read_string(DATE_TIME_TAG_HEADER_PATH)
-            .chain_err(|| TTEK::HeaderReadError)?
+            .map_err(TTE::from)?
             .ok_or(TTE::from_kind(TTEK::HeaderReadError))
             .map(Into::into)
     }
@@ -75,21 +74,21 @@ impl TimeTracking for Entry {
 
         self.get_header_mut()
             .insert(DATE_TIME_START_HEADER_PATH, Value::String(s))
-            .chain_err(|| TTEK::HeaderWriteError)
+            .map_err(From::from)
             .map(|_| ())
     }
 
     fn get_start_datetime(&self) -> Result<Option<NaiveDateTime>> {
         self.get_header()
             .read_string(DATE_TIME_START_HEADER_PATH)
-            .chain_err(|| TTEK::HeaderReadError)
+            .map_err(From::from)
             .and_then(header_value_to_dt)
     }
 
     fn delete_start_datetime(&mut self) -> Result<()> {
         self.get_header_mut()
             .delete(DATE_TIME_START_HEADER_PATH)
-            .chain_err(|| TTEK::HeaderWriteError)
+            .map_err(From::from)
             .map(|_| ())
     }
 
@@ -98,21 +97,21 @@ impl TimeTracking for Entry {
 
         self.get_header_mut()
             .insert(DATE_TIME_END_HEADER_PATH, Value::String(s))
-            .chain_err(|| TTEK::HeaderWriteError)
+            .map_err(From::from)
             .map(|_| ())
     }
 
     fn get_end_datetime(&self) -> Result<Option<NaiveDateTime>> {
         self.get_header()
             .read_string(DATE_TIME_END_HEADER_PATH)
-            .chain_err(|| TTEK::HeaderReadError)
+            .map_err(From::from)
             .and_then(header_value_to_dt)
     }
 
     fn delete_end_datetime(&mut self) -> Result<()> {
         self.get_header_mut()
             .delete(DATE_TIME_END_HEADER_PATH)
-            .chain_err(|| TTEK::HeaderWriteError)
+            .map_err(From::from)
             .map(|_| ())
     }
 
@@ -136,11 +135,7 @@ impl TimeTracking for Entry {
 
 fn header_value_to_dt(val: Option<String>) -> Result<Option<NaiveDateTime>> {
     match val {
-        Some(ref s) => {
+        Some(ref s) => NaiveDateTime::parse_from_str(s, DATE_TIME_FORMAT).map_err(TTE::from).map(Some),
-            NaiveDateTime::parse_from_str(s, DATE_TIME_FORMAT)
-                .chain_err(|| TTEK::DateTimeParserError)
-                .map(Some)
-        },
         None => Ok(None),
     }
 }

lib/domain/libimagtimetrack/src/timetrackingstore.rs

@@ -28,13 +28,12 @@ use toml_query::insert::TomlValueInsertExt;
 
 use libimagstore::store::Store;
 use libimagstore::store::FileLockEntry;
+use libimagstore::iter::get::StoreGetIterator;
+use libimagstore::iter::get::StoreIdGetIteratorExtension;
 use libimagentrydatetime::datepath::compiler::DatePathCompiler;
 
 use error::Result;
 use constants::*;
-use error::TimeTrackErrorKind as TTEK;
-use error::ResultExt;
-use iter::get::GetTimeTrackIter;
 
 use tag::TimeTrackingTag as TTT;
 
@@ -44,7 +43,7 @@ pub trait TimeTrackStore<'a> {
     fn create_timetracking_at(&'a self, start: &NDT, ts: &TTT)         -> Result<FileLockEntry<'a>>;
     fn create_timetracking(&'a self, start: &NDT, end: &NDT, ts: &TTT) -> Result<FileLockEntry<'a>>;
 
-    fn get_timetrackings(&'a self) -> Result<GetTimeTrackIter<'a>>;
+    fn get_timetrackings(&'a self) -> Result<StoreGetIterator<'a>>;
 }
 
 fn now() -> NDT {
@@ -71,24 +70,24 @@ impl<'a> TimeTrackStore<'a> for Store {
         use std::path::PathBuf;
 
         COMPILER.compile(CRATE_NAME, start)
-            .chain_err(|| TTEK::StoreIdError)
+            .map_err(From::from)
             .map(|mut id| {
                 id.local_push(PathBuf::from(ts.as_str()));
                 id
             })
-            .and_then(|id| self.create(id).chain_err(|| TTEK::StoreWriteError))
+            .and_then(|id| self.create(id).map_err(From::from))
             .and_then(|mut fle| {
                 let v = Value::String(ts.as_str().to_owned());
                 fle.get_header_mut()
                     .insert(DATE_TIME_TAG_HEADER_PATH, v)
-                    .chain_err(|| TTEK::HeaderWriteError)
+                    .map_err(From::from)
                     .map(|_| fle)
             })
             .and_then(|mut fle| {
                 let v = Value::String(start.format(DATE_TIME_FORMAT).to_string());
                 fle.get_header_mut()
                     .insert(DATE_TIME_START_HEADER_PATH, v)
-                    .chain_err(|| TTEK::HeaderWriteError)
+                    .map_err(From::from)
                     .map(|_| fle)
             })
     }
@@ -99,15 +98,15 @@ impl<'a> TimeTrackStore<'a> for Store {
                 let v = Value::String(end.format(DATE_TIME_FORMAT).to_string());
                 fle.get_header_mut()
                     .insert(DATE_TIME_END_HEADER_PATH, v)
-                    .chain_err(|| TTEK::HeaderWriteError)
+                    .map_err(From::from)
                     .map(|_| fle)
             })
     }
 
-    fn get_timetrackings(&'a self) -> Result<GetTimeTrackIter<'a>> {
+    fn get_timetrackings(&'a self) -> Result<StoreGetIterator<'a>> {
         self.retrieve_for_module(CRATE_NAME)
-            .chain_err(|| TTEK::StoreReadError)
+            .map_err(From::from)
-            .map(|iter| GetTimeTrackIter::new(iter, self))
+            .map(|iter| iter.into_get_iter(self))
     }
 
 }