diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2017-08-27 14:56:37 +0200 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2017-08-27 18:23:47 +0200 |
commit | ef93cf024346c08fc7cc7a937cf6db23d58ebdb4 (patch) | |
tree | a1cfa57e00c4e1d3393215c6e8b8773f642351c0 | |
parent | 2fcead5f5340004a04d81917fc3011a14c29901b (diff) |
libimagentrytimetrack -> libimagtimetrack
This is actually a domain library and thus should be put into the
lib/domain/ folder.
-rw-r--r-- | .imag-documentation/Cargo.toml | 2 | ||||
-rw-r--r-- | Cargo.toml | 2 | ||||
-rw-r--r-- | bin/domain/imag-timetrack/Cargo.toml | 10 | ||||
-rw-r--r-- | bin/domain/imag-timetrack/src/cont.rs | 6 | ||||
-rw-r--r-- | bin/domain/imag-timetrack/src/day.rs | 8 | ||||
-rw-r--r-- | bin/domain/imag-timetrack/src/list.rs | 6 | ||||
-rw-r--r-- | bin/domain/imag-timetrack/src/main.rs | 2 | ||||
-rw-r--r-- | bin/domain/imag-timetrack/src/month.rs | 8 | ||||
-rw-r--r-- | bin/domain/imag-timetrack/src/start.rs | 4 | ||||
-rw-r--r-- | bin/domain/imag-timetrack/src/stop.rs | 12 | ||||
-rw-r--r-- | bin/domain/imag-timetrack/src/track.rs | 4 | ||||
-rw-r--r-- | bin/domain/imag-timetrack/src/week.rs | 8 | ||||
-rw-r--r-- | bin/domain/imag-timetrack/src/year.rs | 8 | ||||
-rw-r--r-- | lib/domain/libimagtimetrack/Cargo.toml (renamed from lib/entry/libimagentrytimetrack/Cargo.toml) | 2 | ||||
l--------- | lib/domain/libimagtimetrack/README.md (renamed from lib/entry/libimagentrytimetrack/README.md) | 0 | ||||
-rw-r--r-- | lib/domain/libimagtimetrack/src/constants.rs (renamed from lib/entry/libimagentrytimetrack/src/constants.rs) | 0 | ||||
-rw-r--r-- | lib/domain/libimagtimetrack/src/error.rs (renamed from lib/entry/libimagentrytimetrack/src/error.rs) | 0 | ||||
-rw-r--r-- | lib/domain/libimagtimetrack/src/iter/create.rs (renamed from lib/entry/libimagentrytimetrack/src/iter/create.rs) | 0 | ||||
-rw-r--r-- | lib/domain/libimagtimetrack/src/iter/filter.rs (renamed from lib/entry/libimagentrytimetrack/src/iter/filter.rs) | 0 | ||||
-rw-r--r-- | lib/domain/libimagtimetrack/src/iter/get.rs (renamed from lib/entry/libimagentrytimetrack/src/iter/get.rs) | 0 | ||||
-rw-r--r-- | lib/domain/libimagtimetrack/src/iter/mod.rs (renamed from lib/entry/libimagentrytimetrack/src/iter/mod.rs) | 0 | ||||
-rw-r--r-- | lib/domain/libimagtimetrack/src/iter/setendtime.rs (renamed from lib/entry/libimagentrytimetrack/src/iter/setendtime.rs) | 0 | ||||
-rw-r--r-- | lib/domain/libimagtimetrack/src/iter/storeid.rs (renamed from lib/entry/libimagentrytimetrack/src/iter/storeid.rs) | 0 | ||||
-rw-r--r-- | lib/domain/libimagtimetrack/src/iter/tag.rs (renamed from lib/entry/libimagentrytimetrack/src/iter/tag.rs) | 0 | ||||
-rw-r--r-- | lib/domain/libimagtimetrack/src/lib.rs (renamed from lib/entry/libimagentrytimetrack/src/lib.rs) | 0 | ||||
-rw-r--r-- | lib/domain/libimagtimetrack/src/result.rs (renamed from lib/entry/libimagentrytimetrack/src/result.rs) | 0 | ||||
-rw-r--r-- | lib/domain/libimagtimetrack/src/tag.rs (renamed from lib/entry/libimagentrytimetrack/src/tag.rs) | 0 | ||||
-rw-r--r-- | lib/domain/libimagtimetrack/src/timetracking.rs (renamed from lib/entry/libimagentrytimetrack/src/timetracking.rs) | 0 | ||||
-rw-r--r-- | lib/domain/libimagtimetrack/src/timetrackingstore.rs (renamed from lib/entry/libimagentrytimetrack/src/timetrackingstore.rs) | 0 |
29 files changed, 41 insertions, 41 deletions
diff --git a/.imag-documentation/Cargo.toml b/.imag-documentation/Cargo.toml index 7c1cb67f..276fc561 100644 --- a/.imag-documentation/Cargo.toml +++ b/.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" } @@ -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", diff --git a/bin/domain/imag-timetrack/Cargo.toml b/bin/domain/imag-timetrack/Cargo.toml index 8c19478b..21b394bc 100644 --- a/bin/domain/imag-timetrack/Cargo.toml +++ b/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" } -libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } -libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } -libimagentrytimetrack = { version = "0.4.0", path = "../../../lib/entry/libimagentrytimetrack" } -libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } +libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagtimetrack = { version = "0.4.0", path = "../../../lib/domain/libimagtimetrack" } +libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } diff --git a/bin/domain/imag-timetrack/src/cont.rs b/bin/domain/imag-timetrack/src/cont.rs index 86563672..58075ad4 100644 --- a/bin/domain/imag-timetrack/src/cont.rs +++ b/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 libimagentrytimetrack::timetracking::TimeTracking; -use libimagentrytimetrack::iter::filter::*; +use libimagtimetrack::timetrackingstore::TimeTrackStore; +use libimagtimetrack::timetracking::TimeTracking; +use libimagtimetrack::iter::filter::*; use libimagrt::runtime::Runtime; diff --git a/bin/domain/imag-timetrack/src/day.rs b/bin/domain/imag-timetrack/src/day.rs index 04d36044..1557a05a 100644 --- a/bin/domain/imag-timetrack/src/day.rs +++ b/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 libimagentrytimetrack::timetracking::TimeTracking; -use libimagentrytimetrack::tag::TimeTrackingTag; -use libimagentrytimetrack::iter::filter::*; +use libimagtimetrack::timetrackingstore::TimeTrackStore; +use libimagtimetrack::timetracking::TimeTracking; +use libimagtimetrack::tag::TimeTrackingTag; +use libimagtimetrack::iter::filter::*; use libimagrt::runtime::Runtime; diff --git a/bin/domain/imag-timetrack/src/list.rs b/bin/domain/imag-timetrack/src/list.rs index b7d8dcd3..6de2f5b8 100644 --- a/bin/domain/imag-timetrack/src/list.rs +++ b/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 libimagentrytimetrack::timetracking::TimeTracking; -use libimagentrytimetrack::iter::filter::*; +use libimagtimetrack::timetrackingstore::TimeTrackStore; +use libimagtimetrack::timetracking::TimeTracking; +use libimagtimetrack::iter::filter::*; use libimagrt::runtime::Runtime; diff --git a/bin/domain/imag-timetrack/src/main.rs b/bin/domain/imag-timetrack/src/main.rs index 7546e6b9..7fc53bfa 100644 --- a/bin/domain/imag-timetrack/src/main.rs +++ b/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; diff --git a/bin/domain/imag-timetrack/src/month.rs b/bin/domain/imag-timetrack/src/month.rs index 0f9872c3..b29ba27e 100644 --- a/bin/domain/imag-timetrack/src/month.rs +++ b/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 libimagentrytimetrack::timetracking::TimeTracking; -use libimagentrytimetrack::tag::TimeTrackingTag; -use libimagentrytimetrack::iter::filter::*; +use libimagtimetrack::timetrackingstore::TimeTrackStore; +use libimagtimetrack::timetracking::TimeTracking; +use libimagtimetrack::tag::TimeTrackingTag; +use libimagtimetrack::iter::filter::*; use libimagrt::runtime::Runtime; diff --git a/bin/domain/imag-timetrack/src/start.rs b/bin/domain/imag-timetrack/src/start.rs index 8518f566..a838dacd 100644 --- a/bin/domain/imag-timetrack/src/start.rs +++ b/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 libimagentrytimetrack::timetrackingstore::TimeTrackStore; +use libimagtimetrack::tag::TimeTrackingTag; +use libimagtimetrack::timetrackingstore::TimeTrackStore; use libimagerror::trace::MapErrTrace; pub fn start(rt: &Runtime) -> i32 { diff --git a/bin/domain/imag-timetrack/src/stop.rs b/bin/domain/imag-timetrack/src/stop.rs index 29b03a02..86e68004 100644 --- a/bin/domain/imag-timetrack/src/stop.rs +++ b/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 libimagentrytimetrack::tag::TimeTrackingTag; -use libimagentrytimetrack::timetrackingstore::*; -use libimagentrytimetrack::iter::get::GetTimeTrackIter; -use libimagentrytimetrack::iter::filter::has_end_time; -use libimagentrytimetrack::iter::filter::has_one_of_tags; +use libimagtimetrack::timetracking::TimeTracking; +use libimagtimetrack::tag::TimeTrackingTag; +use libimagtimetrack::timetrackingstore::*; +use libimagtimetrack::iter::get::GetTimeTrackIter; +use libimagtimetrack::iter::filter::has_end_time; +use libimagtimetrack::iter::filter::has_one_of_tags; pub fn stop(rt: &Runtime) -> i32 { let (_, cmd) = rt.cli().subcommand(); diff --git a/bin/domain/imag-timetrack/src/track.rs b/bin/domain/imag-timetrack/src/track.rs index a723b909..028508e3 100644 --- a/bin/domain/imag-timetrack/src/track.rs +++ b/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 libimagentrytimetrack::timetrackingstore::TimeTrackStore; +use libimagtimetrack::tag::TimeTrackingTag; +use libimagtimetrack::timetrackingstore::TimeTrackStore; use libimagerror::trace::MapErrTrace; pub fn track(rt: &Runtime) -> i32 { diff --git a/bin/domain/imag-timetrack/src/week.rs b/bin/domain/imag-timetrack/src/week.rs index 4793c4e2..51a788ec 100644 --- a/bin/domain/imag-timetrack/src/week.rs +++ b/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 libimagentrytimetrack::timetracking::TimeTracking; -use libimagentrytimetrack::tag::TimeTrackingTag; -use libimagentrytimetrack::iter::filter::*; +use libimagtimetrack::timetrackingstore::TimeTrackStore; +use libimagtimetrack::timetracking::TimeTracking; +use libimagtimetrack::tag::TimeTrackingTag; +use libimagtimetrack::iter::filter::*; use libimagrt::runtime::Runtime; diff --git a/bin/domain/imag-timetrack/src/year.rs b/bin/domain/imag-timetrack/src/year.rs index 8534de1a..b0e003b8 100644 --- a/bin/domain/imag-timetrack/src/year.rs +++ b/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 libimagentrytimetrack::timetracking::TimeTracking; -use libimagentrytimetrack::tag::TimeTrackingTag; -use libimagentrytimetrack::iter::filter::*; +use libimagtimetrack::timetrackingstore::TimeTrackStore; +use libimagtimetrack::timetracking::TimeTracking; +use libimagtimetrack::tag::TimeTrackingTag; +use libimagtimetrack::iter::filter::*; use libimagrt::runtime::Runtime; diff --git a/lib/entry/libimagentrytimetrack/Cargo.toml b/lib/domain/libimagtimetrack/Cargo.toml index 21e3aecc..6fed7f71 100644 --- a/lib/entry/libimagentrytimetrack/Cargo.toml +++ b/lib/domain/libimagtimetrack/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "libimagentrytimetrack" +name = "libimagtimetrack" version = "0.4.0" authors = ["Matthias Beyer <mail@beyermatthias.de>"] diff --git a/lib/entry/libimagentrytimetrack/README.md b/lib/domain/libimagtimetrack/README.md index 6a426926..6a426926 120000 --- a/lib/entry/libimagentrytimetrack/README.md +++ b/lib/domain/libimagtimetrack/README.md diff --git a/lib/entry/libimagentrytimetrack/src/constants.rs b/lib/domain/libimagtimetrack/src/constants.rs index 63eeaf64..63eeaf64 100644 --- a/lib/entry/libimagentrytimetrack/src/constants.rs +++ b/lib/domain/libimagtimetrack/src/constants.rs diff --git a/lib/entry/libimagentrytimetrack/src/error.rs b/lib/domain/libimagtimetrack/src/error.rs index 3ac4a11a..3ac4a11a 100644 --- a/lib/entry/libimagentrytimetrack/src/error.rs +++ b/lib/domain/libimagtimetrack/src/error.rs diff --git a/lib/entry/libimagentrytimetrack/src/iter/create.rs b/lib/domain/libimagtimetrack/src/iter/create.rs index 0c471aa8..0c471aa8 100644 --- a/lib/entry/libimagentrytimetrack/src/iter/create.rs +++ b/lib/domain/libimagtimetrack/src/iter/create.rs diff --git a/lib/entry/libimagentrytimetrack/src/iter/filter.rs b/lib/domain/libimagtimetrack/src/iter/filter.rs index 0a3ae538..0a3ae538 100644 --- a/lib/entry/libimagentrytimetrack/src/iter/filter.rs +++ b/lib/domain/libimagtimetrack/src/iter/filter.rs diff --git a/lib/entry/libimagentrytimetrack/src/iter/get.rs b/lib/domain/libimagtimetrack/src/iter/get.rs index 62e0a85d..62e0a85d 100644 --- a/lib/entry/libimagentrytimetrack/src/iter/get.rs +++ b/lib/domain/libimagtimetrack/src/iter/get.rs diff --git a/lib/entry/libimagentrytimetrack/src/iter/mod.rs b/lib/domain/libimagtimetrack/src/iter/mod.rs index 467199d8..467199d8 100644 --- a/lib/entry/libimagentrytimetrack/src/iter/mod.rs +++ b/lib/domain/libimagtimetrack/src/iter/mod.rs diff --git a/lib/entry/libimagentrytimetrack/src/iter/setendtime.rs b/lib/domain/libimagtimetrack/src/iter/setendtime.rs index 89eb382b..89eb382b 100644 --- a/lib/entry/libimagentrytimetrack/src/iter/setendtime.rs +++ b/lib/domain/libimagtimetrack/src/iter/setendtime.rs diff --git a/lib/entry/libimagentrytimetrack/src/iter/storeid.rs b/lib/domain/libimagtimetrack/src/iter/storeid.rs index a3071908..a3071908 100644 --- a/lib/entry/libimagentrytimetrack/src/iter/storeid.rs +++ b/lib/domain/libimagtimetrack/src/iter/storeid.rs diff --git a/lib/entry/libimagentrytimetrack/src/iter/tag.rs b/lib/domain/libimagtimetrack/src/iter/tag.rs index da006d8b..da006d8b 100644 --- a/lib/entry/libimagentrytimetrack/src/iter/tag.rs +++ b/lib/domain/libimagtimetrack/src/iter/tag.rs diff --git a/lib/entry/libimagentrytimetrack/src/lib.rs b/lib/domain/libimagtimetrack/src/lib.rs index e3f9d2aa..e3f9d2aa 100644 --- a/lib/entry/libimagentrytimetrack/src/lib.rs +++ b/lib/domain/libimagtimetrack/src/lib.rs diff --git a/lib/entry/libimagentrytimetrack/src/result.rs b/lib/domain/libimagtimetrack/src/result.rs index 8ea8173f..8ea8173f 100644 --- a/lib/entry/libimagentrytimetrack/src/result.rs +++ b/lib/domain/libimagtimetrack/src/result.rs diff --git a/lib/entry/libimagentrytimetrack/src/tag.rs b/lib/domain/libimagtimetrack/src/tag.rs index df2f9795..df2f9795 100644 --- a/lib/entry/libimagentrytimetrack/src/tag.rs +++ b/lib/domain/libimagtimetrack/src/tag.rs diff --git a/lib/entry/libimagentrytimetrack/src/timetracking.rs b/lib/domain/libimagtimetrack/src/timetracking.rs index ba40ac65..ba40ac65 100644 --- a/lib/entry/libimagentrytimetrack/src/timetracking.rs +++ b/lib/domain/libimagtimetrack/src/timetracking.rs diff --git a/lib/entry/libimagentrytimetrack/src/timetrackingstore.rs b/lib/domain/libimagtimetrack/src/timetrackingstore.rs index 94e993ac..94e993ac 100644 --- a/lib/entry/libimagentrytimetrack/src/timetrackingstore.rs +++ b/lib/domain/libimagtimetrack/src/timetrackingstore.rs |