libimagentrytimetrack -> libimagtimetrack

This is actually a domain library and thus should be put into the
lib/domain/ folder.

.imag-documentation/Cargo.toml

@@ -28,7 +28,6 @@ libimagentrylist       = { version = "0.4.0", path = "../lib/entry/libimagentryl
 libimagentrymarkdown   = { version = "0.4.0", path = "../lib/entry/libimagentrymarkdown" }
 libimagentryref        = { version = "0.4.0", path = "../lib/entry/libimagentryref" }
 libimagentrytag        = { version = "0.4.0", path = "../lib/entry/libimagentrytag" }
-libimagentrytimetrack  = { version = "0.4.0", path = "../lib/entry/libimagentrytimetrack" }
 libimagentryview       = { version = "0.4.0", path = "../lib/entry/libimagentryview" }
 libimagerror           = { version = "0.4.0", path = "../lib/core/libimagerror" }
 libimaginteraction     = { version = "0.4.0", path = "../lib/etc/libimaginteraction" }
@@ -36,6 +35,7 @@ libimagmail            = { version = "0.4.0", path = "../lib/domain/libimagmail"
 libimagnotes           = { version = "0.4.0", path = "../lib/domain/libimagnotes" }
 libimagrt              = { version = "0.4.0", path = "../lib/core/libimagrt" }
 libimagstore           = { version = "0.4.0", path = "../lib/core/libimagstore" }
+libimagtimetrack       = { version = "0.4.0", path = "../lib/domain/libimagtimetrack" }
 libimagtimeui          = { version = "0.4.0", path = "../lib/etc/libimagtimeui" }
 libimagtodo            = { version = "0.4.0", path = "../lib/domain/libimagtodo" }
 libimagutil            = { version = "0.4.0", path = "../lib/etc/libimagutil" }

Cargo.toml

@@ -22,6 +22,7 @@ members = [
     "lib/domain/libimagdiary",
     "lib/domain/libimagmail",
     "lib/domain/libimagnotes",
+    "lib/domain/libimagtimetrack",
     "lib/domain/libimagtodo",
     "lib/entry/libimagentryannotation",
     "lib/entry/libimagentrycategory",
@@ -33,7 +34,6 @@ members = [
     "lib/entry/libimagentrymarkdown",
     "lib/entry/libimagentryref",
     "lib/entry/libimagentrytag",
-    "lib/entry/libimagentrytimetrack",
     "lib/entry/libimagentryview",
     "lib/etc/libimaginteraction",
     "lib/etc/libimagtimeui",

bin/domain/imag-timetrack/Cargo.toml

@@ -23,8 +23,8 @@ chrono = "^0.4"
 filters = "0.1.1"
 itertools = "0.6"
 
-libimagstore          = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
+libimagstore     = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
-libimagrt             = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
+libimagrt        = { version = "0.4.0", path = "../../../lib/core/libimagrt" }
-libimagerror          = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
+libimagerror     = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
-libimagentrytimetrack = { version = "0.4.0", path = "../../../lib/entry/libimagentrytimetrack" }
+libimagtimetrack = { version = "0.4.0", path = "../../../lib/domain/libimagtimetrack" }
-libimagutil           = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
+libimagutil      = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }

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

@@ -29,9 +29,9 @@ use chrono::NaiveDateTime;
 use libimagerror::trace::trace_error;
 use libimagerror::trace::MapErrTrace;
 use libimagerror::iter::TraceIterator;
-use libimagentrytimetrack::timetrackingstore::TimeTrackStore;
+use libimagtimetrack::timetrackingstore::TimeTrackStore;
-use libimagentrytimetrack::timetracking::TimeTracking;
+use libimagtimetrack::timetracking::TimeTracking;
-use libimagentrytimetrack::iter::filter::*;
+use libimagtimetrack::iter::filter::*;
 
 use libimagrt::runtime::Runtime;
 

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

@@ -31,10 +31,10 @@ use libimagerror::trace::trace_error;
 use libimagerror::trace::MapErrTrace;
 use libimagerror::iter::TraceIterator;
 use libimagstore::store::FileLockEntry;
-use libimagentrytimetrack::timetrackingstore::TimeTrackStore;
+use libimagtimetrack::timetrackingstore::TimeTrackStore;
-use libimagentrytimetrack::timetracking::TimeTracking;
+use libimagtimetrack::timetracking::TimeTracking;
-use libimagentrytimetrack::tag::TimeTrackingTag;
+use libimagtimetrack::tag::TimeTrackingTag;
-use libimagentrytimetrack::iter::filter::*;
+use libimagtimetrack::iter::filter::*;
 
 use libimagrt::runtime::Runtime;
 

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

@@ -31,9 +31,9 @@ use libimagerror::trace::trace_error;
 use libimagerror::trace::MapErrTrace;
 use libimagerror::iter::TraceIterator;
 use libimagstore::store::FileLockEntry;
-use libimagentrytimetrack::timetrackingstore::TimeTrackStore;
+use libimagtimetrack::timetrackingstore::TimeTrackStore;
-use libimagentrytimetrack::timetracking::TimeTracking;
+use libimagtimetrack::timetracking::TimeTracking;
-use libimagentrytimetrack::iter::filter::*;
+use libimagtimetrack::iter::filter::*;
 
 use libimagrt::runtime::Runtime;
 

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

@@ -33,7 +33,7 @@ extern crate itertools;
 extern crate libimagerror;
 extern crate libimagstore;
 extern crate libimagrt;
-extern crate libimagentrytimetrack;
+extern crate libimagtimetrack;
 extern crate libimagutil;
 
 mod cont;

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

@@ -31,10 +31,10 @@ use libimagerror::trace::trace_error;
 use libimagerror::trace::MapErrTrace;
 use libimagerror::iter::TraceIterator;
 use libimagstore::store::FileLockEntry;
-use libimagentrytimetrack::timetrackingstore::TimeTrackStore;
+use libimagtimetrack::timetrackingstore::TimeTrackStore;
-use libimagentrytimetrack::timetracking::TimeTracking;
+use libimagtimetrack::timetracking::TimeTracking;
-use libimagentrytimetrack::tag::TimeTrackingTag;
+use libimagtimetrack::tag::TimeTrackingTag;
-use libimagentrytimetrack::iter::filter::*;
+use libimagtimetrack::iter::filter::*;
 
 use libimagrt::runtime::Runtime;
 

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

@@ -21,8 +21,8 @@ use std::str::FromStr;
 
 use libimagrt::runtime::Runtime;
 use libimagerror::trace::trace_error;
-use libimagentrytimetrack::tag::TimeTrackingTag;
+use libimagtimetrack::tag::TimeTrackingTag;
-use libimagentrytimetrack::timetrackingstore::TimeTrackStore;
+use libimagtimetrack::timetrackingstore::TimeTrackStore;
 use libimagerror::trace::MapErrTrace;
 
 pub fn start(rt: &Runtime) -> i32 {

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

@@ -26,12 +26,12 @@ use libimagerror::iter::TraceIterator;
 use libimagrt::runtime::Runtime;
 use libimagrt::setup::generate_runtime_setup;
 
-use libimagentrytimetrack::timetracking::TimeTracking;
+use libimagtimetrack::timetracking::TimeTracking;
-use libimagentrytimetrack::tag::TimeTrackingTag;
+use libimagtimetrack::tag::TimeTrackingTag;
-use libimagentrytimetrack::timetrackingstore::*;
+use libimagtimetrack::timetrackingstore::*;
-use libimagentrytimetrack::iter::get::GetTimeTrackIter;
+use libimagtimetrack::iter::get::GetTimeTrackIter;
-use libimagentrytimetrack::iter::filter::has_end_time;
+use libimagtimetrack::iter::filter::has_end_time;
-use libimagentrytimetrack::iter::filter::has_one_of_tags;
+use libimagtimetrack::iter::filter::has_one_of_tags;
 
 pub fn stop(rt: &Runtime) -> i32 {
     let (_, cmd) = rt.cli().subcommand();

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

@@ -24,8 +24,8 @@ use chrono::naive::NaiveDateTime;
 
 use libimagrt::runtime::Runtime;
 use libimagerror::trace::trace_error;
-use libimagentrytimetrack::tag::TimeTrackingTag;
+use libimagtimetrack::tag::TimeTrackingTag;
-use libimagentrytimetrack::timetrackingstore::TimeTrackStore;
+use libimagtimetrack::timetrackingstore::TimeTrackStore;
 use libimagerror::trace::MapErrTrace;
 
 pub fn track(rt: &Runtime) -> i32 {

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

@@ -31,10 +31,10 @@ use libimagerror::trace::trace_error;
 use libimagerror::trace::MapErrTrace;
 use libimagerror::iter::TraceIterator;
 use libimagstore::store::FileLockEntry;
-use libimagentrytimetrack::timetrackingstore::TimeTrackStore;
+use libimagtimetrack::timetrackingstore::TimeTrackStore;
-use libimagentrytimetrack::timetracking::TimeTracking;
+use libimagtimetrack::timetracking::TimeTracking;
-use libimagentrytimetrack::tag::TimeTrackingTag;
+use libimagtimetrack::tag::TimeTrackingTag;
-use libimagentrytimetrack::iter::filter::*;
+use libimagtimetrack::iter::filter::*;
 
 use libimagrt::runtime::Runtime;
 

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

@@ -31,10 +31,10 @@ use libimagerror::trace::trace_error;
 use libimagerror::trace::MapErrTrace;
 use libimagerror::iter::TraceIterator;
 use libimagstore::store::FileLockEntry;
-use libimagentrytimetrack::timetrackingstore::TimeTrackStore;
+use libimagtimetrack::timetrackingstore::TimeTrackStore;
-use libimagentrytimetrack::timetracking::TimeTracking;
+use libimagtimetrack::timetracking::TimeTracking;
-use libimagentrytimetrack::tag::TimeTrackingTag;
+use libimagtimetrack::tag::TimeTrackingTag;
-use libimagentrytimetrack::iter::filter::*;
+use libimagtimetrack::iter::filter::*;
 
 use libimagrt::runtime::Runtime;
 

lib/domain/libimagtimetrack/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "libimagentrytimetrack"
+name = "libimagtimetrack"
 version = "0.4.0"
 authors = ["Matthias Beyer <mail@beyermatthias.de>"]