diff --git a/.imag-documentation/Cargo.toml b/.imag-documentation/Cargo.toml index 16466409..276fc561 100644 --- a/.imag-documentation/Cargo.toml +++ b/.imag-documentation/Cargo.toml @@ -15,27 +15,28 @@ homepage = "http://imag-pim.org" [dependencies] -libimagannotation = { version = "0.4.0", path = "../libimagannotation" } -libimagbookmark = { version = "0.4.0", path = "../libimagbookmark" } -libimagcounter = { version = "0.4.0", path = "../libimagcounter" } -libimagdiary = { version = "0.4.0", path = "../libimagdiary" } -libimagentrycategory = { version = "0.4.0", path = "../libimagentrycategory" } -libimagentrydatetime = { version = "0.4.0", path = "../libimagentrydatetime" } -libimagentryedit = { version = "0.4.0", path = "../libimagentryedit" } -libimagentryfilter = { version = "0.4.0", path = "../libimagentryfilter" } -libimagentrylink = { version = "0.4.0", path = "../libimagentrylink" } -libimagentrylist = { version = "0.4.0", path = "../libimagentrylist" } -libimagentrymarkdown = { version = "0.4.0", path = "../libimagentrymarkdown" } -libimagentrytag = { version = "0.4.0", path = "../libimagentrytag" } -libimagentrytimetrack = { version = "0.4.0", path = "../libimagentrytimetrack" } -libimagentryview = { version = "0.4.0", path = "../libimagentryview" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimaginteraction = { version = "0.4.0", path = "../libimaginteraction" } -libimagmail = { version = "0.4.0", path = "../libimagmail" } -libimagnotes = { version = "0.4.0", path = "../libimagnotes" } -libimagref = { version = "0.4.0", path = "../libimagref" } -libimagrt = { version = "0.4.0", path = "../libimagrt" } -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagtimeui = { version = "0.4.0", path = "../libimagtimeui" } -libimagtodo = { version = "0.4.0", path = "../libimagtodo" } -libimagutil = { version = "0.4.0", path = "../libimagutil" } +libimagbookmark = { version = "0.4.0", path = "../lib/domain/libimagbookmark" } +libimagcounter = { version = "0.4.0", path = "../lib/domain/libimagcounter" } +libimagdiary = { version = "0.4.0", path = "../lib/domain/libimagdiary" } +libimagentryannotation = { version = "0.4.0", path = "../lib/entry/libimagentryannotation" } +libimagentrycategory = { version = "0.4.0", path = "../lib/entry/libimagentrycategory" } +libimagentrydatetime = { version = "0.4.0", path = "../lib/entry/libimagentrydatetime" } +libimagentryedit = { version = "0.4.0", path = "../lib/entry/libimagentryedit" } +libimagentryfilter = { version = "0.4.0", path = "../lib/entry/libimagentryfilter" } +libimagentrylink = { version = "0.4.0", path = "../lib/entry/libimagentrylink" } +libimagentrylist = { version = "0.4.0", path = "../lib/entry/libimagentrylist" } +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" } +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" } +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" } + diff --git a/Cargo.toml b/Cargo.toml index e6121515..1e2c254e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,41 +1,41 @@ [workspace] members = [ ".imag-documentation", - "bin", - "imag-bookmark", - "imag-counter", - "imag-diary", - "imag-link", - "imag-mail", - "imag-notes", - "imag-ref", - "imag-store", - "imag-tag", - "imag-timetrack", - "imag-todo", - "imag-view", - "libimagannotation", - "libimagbookmark", - "libimagcounter", - "libimagdiary", - "libimagentrycategory", - "libimagentrydatetime", - "libimagentryedit", - "libimagentryfilter", - "libimagentrylink", - "libimagentrylist", - "libimagentrymarkdown", - "libimagentrytag", - "libimagentrytimetrack", - "libimagentryview", - "libimagerror", - "libimaginteraction", - "libimagmail", - "libimagnotes", - "libimagref", - "libimagrt", - "libimagstore", - "libimagtimeui", - "libimagtodo", - "libimagutil", + "bin/core/imag", + "bin/core/imag-link", + "bin/core/imag-ref", + "bin/core/imag-store", + "bin/core/imag-tag", + "bin/core/imag-view", + "bin/domain/imag-bookmark", + "bin/domain/imag-counter", + "bin/domain/imag-diary", + "bin/domain/imag-mail", + "bin/domain/imag-notes", + "bin/domain/imag-timetrack", + "bin/domain/imag-todo", + "lib/core/libimagerror", + "lib/core/libimagrt", + "lib/core/libimagstore", + "lib/domain/libimagbookmark", + "lib/domain/libimagcounter", + "lib/domain/libimagdiary", + "lib/domain/libimagmail", + "lib/domain/libimagnotes", + "lib/domain/libimagtimetrack", + "lib/domain/libimagtodo", + "lib/entry/libimagentryannotation", + "lib/entry/libimagentrycategory", + "lib/entry/libimagentrydatetime", + "lib/entry/libimagentryedit", + "lib/entry/libimagentryfilter", + "lib/entry/libimagentrylink", + "lib/entry/libimagentrylist", + "lib/entry/libimagentrymarkdown", + "lib/entry/libimagentryref", + "lib/entry/libimagentrytag", + "lib/entry/libimagentryview", + "lib/etc/libimaginteraction", + "lib/etc/libimagtimeui", + "lib/etc/libimagutil", ] diff --git a/imag-link/Cargo.toml b/bin/core/imag-link/Cargo.toml similarity index 61% rename from imag-link/Cargo.toml rename to bin/core/imag-link/Cargo.toml index a0abd315..7b2c1884 100644 --- a/imag-link/Cargo.toml +++ b/bin/core/imag-link/Cargo.toml @@ -22,15 +22,15 @@ toml = "^0.4" toml-query = "0.1" url = "1.2" -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagrt = { version = "0.4.0", path = "../libimagrt" } -libimagentrylink = { version = "0.4.0", path = "../libimagentrylink" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagutil = { version = "0.4.0", path = "../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" } +libimagentrylink = { version = "0.4.0", path = "../../../lib/entry/libimagentrylink" } +libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } [dev-dependencies.libimagutil] version = "0.4.0" -path = "../libimagutil" +path = "../../../lib/etc/libimagutil" default-features = false features = ["testing"] diff --git a/bin/core/imag-link/README.md b/bin/core/imag-link/README.md new file mode 120000 index 00000000..0d63b6f3 --- /dev/null +++ b/bin/core/imag-link/README.md @@ -0,0 +1 @@ +../../../doc/src/04020-module-link.md \ No newline at end of file diff --git a/imag-link/src/main.rs b/bin/core/imag-link/src/main.rs similarity index 100% rename from imag-link/src/main.rs rename to bin/core/imag-link/src/main.rs diff --git a/imag-link/src/ui.rs b/bin/core/imag-link/src/ui.rs similarity index 100% rename from imag-link/src/ui.rs rename to bin/core/imag-link/src/ui.rs diff --git a/bin/core/imag-ref/Cargo.toml b/bin/core/imag-ref/Cargo.toml new file mode 100644 index 00000000..d2e92b19 --- /dev/null +++ b/bin/core/imag-ref/Cargo.toml @@ -0,0 +1,28 @@ +[package] +name = "imag-ref" +version = "0.4.0" +authors = ["Matthias Beyer "] + +description = "Part of the imag core distribution: imag-ref command" + +keywords = ["imag", "PIM", "personal", "information", "management"] +readme = "../README.md" +license = "LGPL-2.1" + +documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +repository = "https://github.com/matthiasbeyer/imag" +homepage = "http://imag-pim.org" + +[dependencies] +semver = "0.5.1" +clap = ">=2.17" +log = "0.3" +version = "2.0.1" + +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" } +libimagentryref = { version = "0.4.0", path = "../../../lib/entry/libimagentryref" } +libimagentrylist = { version = "0.4.0", path = "../../../lib/entry/libimagentrylist" } +libimaginteraction = { version = "0.4.0", path = "../../../lib/etc/libimaginteraction" } +libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } diff --git a/bin/core/imag-ref/README.md b/bin/core/imag-ref/README.md new file mode 120000 index 00000000..658dbc7a --- /dev/null +++ b/bin/core/imag-ref/README.md @@ -0,0 +1 @@ +../../../doc/src/04020-module-ref.md \ No newline at end of file diff --git a/imag-ref/src/main.rs b/bin/core/imag-ref/src/main.rs similarity index 96% rename from imag-ref/src/main.rs rename to bin/core/imag-ref/src/main.rs index 3c925873..aa2f7d08 100644 --- a/imag-ref/src/main.rs +++ b/bin/core/imag-ref/src/main.rs @@ -39,7 +39,7 @@ extern crate clap; extern crate libimagstore; extern crate libimagrt; -extern crate libimagref; +extern crate libimagentryref; extern crate libimagerror; extern crate libimagentrylist; extern crate libimaginteraction; @@ -50,8 +50,8 @@ use ui::build_ui; use std::path::PathBuf; -use libimagref::reference::Ref; -use libimagref::flags::RefFlags; +use libimagentryref::reference::Ref; +use libimagentryref::flags::RefFlags; use libimagerror::trace::trace_error; use libimagrt::setup::generate_runtime_setup; use libimagrt::runtime::Runtime; @@ -118,7 +118,7 @@ fn list(rt: &Runtime) { use std::process::exit; use libimagentrylist::lister::Lister; - use libimagref::lister::RefLister; + use libimagentryref::lister::RefLister; let cmd = rt.cli().subcommand_matches("list").unwrap(); let do_check_dead = cmd.is_present("check-dead"); diff --git a/imag-ref/src/ui.rs b/bin/core/imag-ref/src/ui.rs similarity index 100% rename from imag-ref/src/ui.rs rename to bin/core/imag-ref/src/ui.rs diff --git a/imag-store/Cargo.toml b/bin/core/imag-store/Cargo.toml similarity index 65% rename from imag-store/Cargo.toml rename to bin/core/imag-store/Cargo.toml index 59b5ad46..d2e47410 100644 --- a/imag-store/Cargo.toml +++ b/bin/core/imag-store/Cargo.toml @@ -20,10 +20,10 @@ version = "2.0.1" semver = "0.5" toml = "^0.4" -libimagstore = { version = "0.4.0", path = "../libimagstore", default-features = false, features = ["verify"] } -libimagrt = { version = "0.4.0", path = "../libimagrt" } -libimagutil = { version = "0.4.0", path = "../libimagutil" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore", features = ["verify"] } +libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } [features] early-panic = [ "libimagstore/early-panic" ] diff --git a/bin/core/imag-store/README.md b/bin/core/imag-store/README.md new file mode 120000 index 00000000..c97937d2 --- /dev/null +++ b/bin/core/imag-store/README.md @@ -0,0 +1 @@ +../../../doc/src/04020-module-store.md \ No newline at end of file diff --git a/imag-store/src/create.rs b/bin/core/imag-store/src/create.rs similarity index 100% rename from imag-store/src/create.rs rename to bin/core/imag-store/src/create.rs diff --git a/imag-store/src/delete.rs b/bin/core/imag-store/src/delete.rs similarity index 100% rename from imag-store/src/delete.rs rename to bin/core/imag-store/src/delete.rs diff --git a/imag-store/src/dump.rs b/bin/core/imag-store/src/dump.rs similarity index 100% rename from imag-store/src/dump.rs rename to bin/core/imag-store/src/dump.rs diff --git a/imag-store/src/error.rs b/bin/core/imag-store/src/error.rs similarity index 100% rename from imag-store/src/error.rs rename to bin/core/imag-store/src/error.rs diff --git a/imag-store/src/get.rs b/bin/core/imag-store/src/get.rs similarity index 100% rename from imag-store/src/get.rs rename to bin/core/imag-store/src/get.rs diff --git a/imag-store/src/main.rs b/bin/core/imag-store/src/main.rs similarity index 100% rename from imag-store/src/main.rs rename to bin/core/imag-store/src/main.rs diff --git a/imag-store/src/retrieve.rs b/bin/core/imag-store/src/retrieve.rs similarity index 100% rename from imag-store/src/retrieve.rs rename to bin/core/imag-store/src/retrieve.rs diff --git a/imag-store/src/ui.rs b/bin/core/imag-store/src/ui.rs similarity index 100% rename from imag-store/src/ui.rs rename to bin/core/imag-store/src/ui.rs diff --git a/imag-store/src/update.rs b/bin/core/imag-store/src/update.rs similarity index 100% rename from imag-store/src/update.rs rename to bin/core/imag-store/src/update.rs diff --git a/imag-store/src/util.rs b/bin/core/imag-store/src/util.rs similarity index 100% rename from imag-store/src/util.rs rename to bin/core/imag-store/src/util.rs diff --git a/imag-store/src/verify.rs b/bin/core/imag-store/src/verify.rs similarity index 100% rename from imag-store/src/verify.rs rename to bin/core/imag-store/src/verify.rs diff --git a/imag-store/tests/001-create_test.sh b/bin/core/imag-store/tests/001-create_test.sh similarity index 100% rename from imag-store/tests/001-create_test.sh rename to bin/core/imag-store/tests/001-create_test.sh diff --git a/imag-store/tests/002-retrieve_test.sh b/bin/core/imag-store/tests/002-retrieve_test.sh similarity index 100% rename from imag-store/tests/002-retrieve_test.sh rename to bin/core/imag-store/tests/002-retrieve_test.sh diff --git a/imag-store/tests/003-delete_test.sh b/bin/core/imag-store/tests/003-delete_test.sh similarity index 100% rename from imag-store/tests/003-delete_test.sh rename to bin/core/imag-store/tests/003-delete_test.sh diff --git a/imag-store/tests/Makefile b/bin/core/imag-store/tests/Makefile similarity index 100% rename from imag-store/tests/Makefile rename to bin/core/imag-store/tests/Makefile diff --git a/imag-store/tests/utils.sh b/bin/core/imag-store/tests/utils.sh similarity index 100% rename from imag-store/tests/utils.sh rename to bin/core/imag-store/tests/utils.sh diff --git a/imag-tag/Cargo.toml b/bin/core/imag-tag/Cargo.toml similarity index 61% rename from imag-tag/Cargo.toml rename to bin/core/imag-tag/Cargo.toml index 3c9581d8..afd41e61 100644 --- a/imag-tag/Cargo.toml +++ b/bin/core/imag-tag/Cargo.toml @@ -20,11 +20,11 @@ version = "2.0.1" semver = "0.2" toml = "^0.4" -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagrt = { version = "0.4.0", path = "../libimagrt" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagentrytag = { version = "0.4.0", path = "../libimagentrytag" } -libimagutil = { version = "0.4.0", path = "../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" } +libimagentrytag = { version = "0.4.0", path = "../../../lib/entry/libimagentrytag" } +libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } [dev-dependencies] toml-query = "0.3.0" @@ -32,7 +32,7 @@ env_logger = "0.3" [dev-dependencies.libimagutil] version = "0.4.0" -path = "../libimagutil" +path = "../../../lib/etc/libimagutil" default-features = false features = ["testing"] diff --git a/bin/core/imag-tag/README.md b/bin/core/imag-tag/README.md new file mode 120000 index 00000000..18243de7 --- /dev/null +++ b/bin/core/imag-tag/README.md @@ -0,0 +1 @@ +../../../doc/src/04020-module-tag.md \ No newline at end of file diff --git a/imag-tag/src/main.rs b/bin/core/imag-tag/src/main.rs similarity index 100% rename from imag-tag/src/main.rs rename to bin/core/imag-tag/src/main.rs diff --git a/imag-tag/src/ui.rs b/bin/core/imag-tag/src/ui.rs similarity index 100% rename from imag-tag/src/ui.rs rename to bin/core/imag-tag/src/ui.rs diff --git a/imag-view/Cargo.toml b/bin/core/imag-view/Cargo.toml similarity index 63% rename from imag-view/Cargo.toml rename to bin/core/imag-view/Cargo.toml index ed6ca69c..ad4456a9 100644 --- a/imag-view/Cargo.toml +++ b/bin/core/imag-view/Cargo.toml @@ -20,7 +20,8 @@ semver = "0.5" toml = "^0.4" version = "2.0.1" -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagrt = { version = "0.4.0", path = "../libimagrt" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagentryview = { version = "0.4.0", path = "../libimagentryview" } +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" } +libimagentryview = { version = "0.4.0", path = "../../../lib/entry/libimagentryview" } + diff --git a/bin/core/imag-view/README.md b/bin/core/imag-view/README.md new file mode 120000 index 00000000..c8a11c15 --- /dev/null +++ b/bin/core/imag-view/README.md @@ -0,0 +1 @@ +../../../doc/src/04020-module-view.md \ No newline at end of file diff --git a/imag-view/src/editor.rs b/bin/core/imag-view/src/editor.rs similarity index 100% rename from imag-view/src/editor.rs rename to bin/core/imag-view/src/editor.rs diff --git a/imag-view/src/main.rs b/bin/core/imag-view/src/main.rs similarity index 100% rename from imag-view/src/main.rs rename to bin/core/imag-view/src/main.rs diff --git a/imag-view/src/ui.rs b/bin/core/imag-view/src/ui.rs similarity index 100% rename from imag-view/src/ui.rs rename to bin/core/imag-view/src/ui.rs diff --git a/bin/Cargo.toml b/bin/core/imag/Cargo.toml similarity index 64% rename from bin/Cargo.toml rename to bin/core/imag/Cargo.toml index ffaba517..2333f7bb 100644 --- a/bin/Cargo.toml +++ b/bin/core/imag/Cargo.toml @@ -16,9 +16,9 @@ homepage = "http://imag-pim.org" [build-dependencies] clap = ">=2.16.1" version = "2.0" -libimagrt = { path = "../libimagrt" } -libimagentrytag = { path = "../libimagentrytag" } -libimagutil = { path = "../libimagutil" } +libimagrt = { path = "../../../lib/core/libimagrt" } +libimagentrytag = { path = "../../../lib/entry/libimagentrytag" } +libimagutil = { path = "../../../lib/etc/libimagutil" } [dependencies] version = "2.0" @@ -26,6 +26,7 @@ walkdir = "0.1" clap = "2.*" log = "0.3" -libimagrt = { version = "0.4.0", path = "../libimagrt" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } +libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } + diff --git a/bin/src/main.rs b/bin/core/imag/src/main.rs similarity index 100% rename from bin/src/main.rs rename to bin/core/imag/src/main.rs diff --git a/imag-bookmark/Cargo.toml b/bin/domain/imag-bookmark/Cargo.toml similarity index 52% rename from imag-bookmark/Cargo.toml rename to bin/domain/imag-bookmark/Cargo.toml index 6ea269c8..658566d3 100644 --- a/imag-bookmark/Cargo.toml +++ b/bin/domain/imag-bookmark/Cargo.toml @@ -18,9 +18,9 @@ clap = ">=2.17" log = "0.3" version = "2.0.1" -libimagrt = { version = "0.4.0", path = "../libimagrt" } -libimagutil = { version = "0.4.0", path = "../libimagutil" } -libimagbookmark = { version = "0.4.0", path = "../libimagbookmark" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagentrylink = { version = "0.4.0", path = "../libimagentrylink" } -libimagentrytag = { version = "0.4.0", path = "../libimagentrytag" } +libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagbookmark = { version = "0.4.0", path = "../../../lib/domain/libimagbookmark" } +libimagentrylink = { version = "0.4.0", path = "../../../lib/entry/libimagentrylink" } +libimagentrytag = { version = "0.4.0", path = "../../../lib/entry/libimagentrytag" } +libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } diff --git a/bin/domain/imag-bookmark/README.md b/bin/domain/imag-bookmark/README.md new file mode 120000 index 00000000..fa363896 --- /dev/null +++ b/bin/domain/imag-bookmark/README.md @@ -0,0 +1 @@ +../../../doc/src/04020-module-bookmarks.md \ No newline at end of file diff --git a/imag-bookmark/src/main.rs b/bin/domain/imag-bookmark/src/main.rs similarity index 100% rename from imag-bookmark/src/main.rs rename to bin/domain/imag-bookmark/src/main.rs diff --git a/imag-bookmark/src/ui.rs b/bin/domain/imag-bookmark/src/ui.rs similarity index 100% rename from imag-bookmark/src/ui.rs rename to bin/domain/imag-bookmark/src/ui.rs diff --git a/imag-counter/Cargo.toml b/bin/domain/imag-counter/Cargo.toml similarity index 63% rename from imag-counter/Cargo.toml rename to bin/domain/imag-counter/Cargo.toml index 11f303f2..cc905034 100644 --- a/imag-counter/Cargo.toml +++ b/bin/domain/imag-counter/Cargo.toml @@ -18,7 +18,8 @@ clap = ">=2.17" log = "0.3" version = "2.0.1" -libimagrt = { version = "0.4.0", path = "../libimagrt" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagutil = { version = "0.4.0", path = "../libimagutil" } -libimagcounter = { version = "0.4.0", path = "../libimagcounter" } +libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } +libimagcounter = { version = "0.4.0", path = "../../../lib/domain/libimagcounter" } + diff --git a/bin/domain/imag-counter/README.md b/bin/domain/imag-counter/README.md new file mode 120000 index 00000000..aa445f82 --- /dev/null +++ b/bin/domain/imag-counter/README.md @@ -0,0 +1 @@ +../../../doc/src/04020-module-counter.md \ No newline at end of file diff --git a/imag-counter/src/create.rs b/bin/domain/imag-counter/src/create.rs similarity index 100% rename from imag-counter/src/create.rs rename to bin/domain/imag-counter/src/create.rs diff --git a/imag-counter/src/delete.rs b/bin/domain/imag-counter/src/delete.rs similarity index 100% rename from imag-counter/src/delete.rs rename to bin/domain/imag-counter/src/delete.rs diff --git a/imag-counter/src/interactive.rs b/bin/domain/imag-counter/src/interactive.rs similarity index 100% rename from imag-counter/src/interactive.rs rename to bin/domain/imag-counter/src/interactive.rs diff --git a/imag-counter/src/list.rs b/bin/domain/imag-counter/src/list.rs similarity index 100% rename from imag-counter/src/list.rs rename to bin/domain/imag-counter/src/list.rs diff --git a/imag-counter/src/main.rs b/bin/domain/imag-counter/src/main.rs similarity index 100% rename from imag-counter/src/main.rs rename to bin/domain/imag-counter/src/main.rs diff --git a/imag-counter/src/ui.rs b/bin/domain/imag-counter/src/ui.rs similarity index 100% rename from imag-counter/src/ui.rs rename to bin/domain/imag-counter/src/ui.rs diff --git a/bin/domain/imag-diary/Cargo.toml b/bin/domain/imag-diary/Cargo.toml new file mode 100644 index 00000000..e7e75b4a --- /dev/null +++ b/bin/domain/imag-diary/Cargo.toml @@ -0,0 +1,31 @@ +[package] +name = "imag-diary" +version = "0.4.0" +authors = ["Matthias Beyer "] + +description = "Part of the imag core distribution: imag-diary command" + +keywords = ["imag", "PIM", "personal", "information", "management"] +readme = "../README.md" +license = "LGPL-2.1" + +documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +repository = "https://github.com/matthiasbeyer/imag" +homepage = "http://imag-pim.org" + +[dependencies] +chrono = "0.4" +version = "2.0" +clap = "2.*" +log = "0.3" + +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } +libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } +libimagdiary = { version = "0.4.0", path = "../../../lib/domain/libimagdiary" } +libimagentryedit = { version = "0.4.0", path = "../../../lib/entry/libimagentryedit" } +libimagentrylist = { version = "0.4.0", path = "../../../lib/entry/libimagentrylist" } +libimaginteraction = { version = "0.4.0", path = "../../../lib/etc/libimaginteraction" } +libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } +libimagtimeui = { version = "0.4.0", path = "../../../lib/etc/libimagtimeui" } + diff --git a/bin/domain/imag-diary/README.md b/bin/domain/imag-diary/README.md new file mode 120000 index 00000000..232e8779 --- /dev/null +++ b/bin/domain/imag-diary/README.md @@ -0,0 +1 @@ +../../../doc/src/04020-module-diary.md \ No newline at end of file diff --git a/imag-diary/src/create.rs b/bin/domain/imag-diary/src/create.rs similarity index 100% rename from imag-diary/src/create.rs rename to bin/domain/imag-diary/src/create.rs diff --git a/imag-diary/src/delete.rs b/bin/domain/imag-diary/src/delete.rs similarity index 100% rename from imag-diary/src/delete.rs rename to bin/domain/imag-diary/src/delete.rs diff --git a/imag-diary/src/edit.rs b/bin/domain/imag-diary/src/edit.rs similarity index 100% rename from imag-diary/src/edit.rs rename to bin/domain/imag-diary/src/edit.rs diff --git a/imag-diary/src/list.rs b/bin/domain/imag-diary/src/list.rs similarity index 100% rename from imag-diary/src/list.rs rename to bin/domain/imag-diary/src/list.rs diff --git a/imag-diary/src/main.rs b/bin/domain/imag-diary/src/main.rs similarity index 100% rename from imag-diary/src/main.rs rename to bin/domain/imag-diary/src/main.rs diff --git a/imag-diary/src/ui.rs b/bin/domain/imag-diary/src/ui.rs similarity index 100% rename from imag-diary/src/ui.rs rename to bin/domain/imag-diary/src/ui.rs diff --git a/imag-diary/src/util.rs b/bin/domain/imag-diary/src/util.rs similarity index 100% rename from imag-diary/src/util.rs rename to bin/domain/imag-diary/src/util.rs diff --git a/imag-diary/src/view.rs b/bin/domain/imag-diary/src/view.rs similarity index 100% rename from imag-diary/src/view.rs rename to bin/domain/imag-diary/src/view.rs diff --git a/bin/domain/imag-mail/Cargo.toml b/bin/domain/imag-mail/Cargo.toml new file mode 100644 index 00000000..8c9dfbc5 --- /dev/null +++ b/bin/domain/imag-mail/Cargo.toml @@ -0,0 +1,24 @@ +[package] +name = "imag-mail" +version = "0.4.0" +authors = ["Matthias Beyer "] + +description = "Part of the imag core distribution: imag-notes command" + +keywords = ["imag", "PIM", "personal", "information", "management"] +readme = "../README.md" +license = "LGPL-2.1" + +[dependencies] +semver = "0.5" +clap = "2.*" +log = "0.3" +version = "2.0.1" +toml = "0.4.*" +url = "1.2" + +libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagmail = { version = "0.4.0", path = "../../../lib/domain/libimagmail" } +libimagentryref = { version = "0.4.0", path = "../../../lib/entry/libimagentryref" } +libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } diff --git a/bin/domain/imag-mail/README.md b/bin/domain/imag-mail/README.md new file mode 120000 index 00000000..764e9f33 --- /dev/null +++ b/bin/domain/imag-mail/README.md @@ -0,0 +1 @@ +../../../doc/src/04020-module-mails.md \ No newline at end of file diff --git a/imag-mail/src/main.rs b/bin/domain/imag-mail/src/main.rs similarity index 98% rename from imag-mail/src/main.rs rename to bin/domain/imag-mail/src/main.rs index bdd51bdb..1eeb52bf 100644 --- a/imag-mail/src/main.rs +++ b/bin/domain/imag-mail/src/main.rs @@ -28,11 +28,11 @@ extern crate libimagrt; extern crate libimagmail; extern crate libimagerror; extern crate libimagutil; -extern crate libimagref; +extern crate libimagentryref; use libimagerror::trace::{MapErrTrace, trace_error, trace_error_exit}; use libimagmail::mail::Mail; -use libimagref::reference::Ref; +use libimagentryref::reference::Ref; use libimagrt::runtime::Runtime; use libimagrt::setup::generate_runtime_setup; use libimagutil::debug_result::*; diff --git a/imag-mail/src/ui.rs b/bin/domain/imag-mail/src/ui.rs similarity index 99% rename from imag-mail/src/ui.rs rename to bin/domain/imag-mail/src/ui.rs index 3e999949..c997d969 100644 --- a/imag-mail/src/ui.rs +++ b/bin/domain/imag-mail/src/ui.rs @@ -38,7 +38,7 @@ pub fn build_ui<'a>(app: App<'a, 'a>) -> App<'a, 'a> { .version("0.1") // TODO: Thee following four arguments are the same as in imag-ref. - // We should make these importable from libimagref. + // We should make these importable from libimagentryref. .arg(Arg::with_name("check-dead") .long("check-dead") diff --git a/imag-notes/Cargo.toml b/bin/domain/imag-notes/Cargo.toml similarity index 53% rename from imag-notes/Cargo.toml rename to bin/domain/imag-notes/Cargo.toml index e3a056bd..e274e3d8 100644 --- a/imag-notes/Cargo.toml +++ b/bin/domain/imag-notes/Cargo.toml @@ -20,9 +20,9 @@ log = "0.3" version = "2.0.1" itertools = "0.5" -libimagrt = { version = "0.4.0", path = "../libimagrt" } -libimagnotes = { version = "0.4.0", path = "../libimagnotes" } -libimagentryedit = { version = "0.4.0", path = "../libimagentryedit" } -libimagentrytag = { version = "0.4.0", path = "../libimagentrytag" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagutil = { version = "0.4.0", path = "../libimagutil" } +libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagnotes = { version = "0.4.0", path = "../../../lib/domain/libimagnotes" } +libimagentryedit = { version = "0.4.0", path = "../../../lib/entry/libimagentryedit" } +libimagentrytag = { version = "0.4.0", path = "../../../lib/entry/libimagentrytag" } +libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } diff --git a/bin/domain/imag-notes/README.md b/bin/domain/imag-notes/README.md new file mode 120000 index 00000000..cb80b30f --- /dev/null +++ b/bin/domain/imag-notes/README.md @@ -0,0 +1 @@ +../../../doc/src/04020-module-notes.md \ No newline at end of file diff --git a/imag-notes/src/main.rs b/bin/domain/imag-notes/src/main.rs similarity index 100% rename from imag-notes/src/main.rs rename to bin/domain/imag-notes/src/main.rs diff --git a/imag-notes/src/ui.rs b/bin/domain/imag-notes/src/ui.rs similarity index 100% rename from imag-notes/src/ui.rs rename to bin/domain/imag-notes/src/ui.rs diff --git a/imag-timetrack/Cargo.toml b/bin/domain/imag-timetrack/Cargo.toml similarity index 60% rename from imag-timetrack/Cargo.toml rename to bin/domain/imag-timetrack/Cargo.toml index 9c38e5bc..21b394bc 100644 --- a/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 = "../libimagstore" } -libimagrt = { version = "0.4.0", path = "../libimagrt" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagentrytimetrack = { version = "0.4.0", path = "../libimagentrytimetrack" } -libimagutil = { version = "0.4.0", path = "../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/README.md b/bin/domain/imag-timetrack/README.md new file mode 120000 index 00000000..99cca6d0 --- /dev/null +++ b/bin/domain/imag-timetrack/README.md @@ -0,0 +1 @@ +../../../doc/src/04020-module-timetrack.md \ No newline at end of file diff --git a/imag-timetrack/src/cont.rs b/bin/domain/imag-timetrack/src/cont.rs similarity index 95% rename from imag-timetrack/src/cont.rs rename to bin/domain/imag-timetrack/src/cont.rs index 86563672..58075ad4 100644 --- a/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/imag-timetrack/src/day.rs b/bin/domain/imag-timetrack/src/day.rs similarity index 94% rename from imag-timetrack/src/day.rs rename to bin/domain/imag-timetrack/src/day.rs index 04d36044..1557a05a 100644 --- a/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/imag-timetrack/src/list.rs b/bin/domain/imag-timetrack/src/list.rs similarity index 96% rename from imag-timetrack/src/list.rs rename to bin/domain/imag-timetrack/src/list.rs index b7d8dcd3..6de2f5b8 100644 --- a/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/imag-timetrack/src/main.rs b/bin/domain/imag-timetrack/src/main.rs similarity index 98% rename from imag-timetrack/src/main.rs rename to bin/domain/imag-timetrack/src/main.rs index 7546e6b9..7fc53bfa 100644 --- a/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/imag-timetrack/src/month.rs b/bin/domain/imag-timetrack/src/month.rs similarity index 95% rename from imag-timetrack/src/month.rs rename to bin/domain/imag-timetrack/src/month.rs index 0f9872c3..b29ba27e 100644 --- a/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/imag-timetrack/src/start.rs b/bin/domain/imag-timetrack/src/start.rs similarity index 94% rename from imag-timetrack/src/start.rs rename to bin/domain/imag-timetrack/src/start.rs index 8518f566..a838dacd 100644 --- a/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/imag-timetrack/src/stop.rs b/bin/domain/imag-timetrack/src/stop.rs similarity index 90% rename from imag-timetrack/src/stop.rs rename to bin/domain/imag-timetrack/src/stop.rs index 29b03a02..86e68004 100644 --- a/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/imag-timetrack/src/track.rs b/bin/domain/imag-timetrack/src/track.rs similarity index 95% rename from imag-timetrack/src/track.rs rename to bin/domain/imag-timetrack/src/track.rs index a723b909..028508e3 100644 --- a/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/imag-timetrack/src/ui.rs b/bin/domain/imag-timetrack/src/ui.rs similarity index 100% rename from imag-timetrack/src/ui.rs rename to bin/domain/imag-timetrack/src/ui.rs diff --git a/imag-timetrack/src/week.rs b/bin/domain/imag-timetrack/src/week.rs similarity index 95% rename from imag-timetrack/src/week.rs rename to bin/domain/imag-timetrack/src/week.rs index 4793c4e2..51a788ec 100644 --- a/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/imag-timetrack/src/year.rs b/bin/domain/imag-timetrack/src/year.rs similarity index 95% rename from imag-timetrack/src/year.rs rename to bin/domain/imag-timetrack/src/year.rs index 8534de1a..b0e003b8 100644 --- a/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/imag-todo/Cargo.toml b/bin/domain/imag-todo/Cargo.toml similarity index 68% rename from imag-todo/Cargo.toml rename to bin/domain/imag-todo/Cargo.toml index 19ba431a..047cdd50 100644 --- a/imag-todo/Cargo.toml +++ b/bin/domain/imag-todo/Cargo.toml @@ -25,7 +25,7 @@ toml-query = "0.3.*" is-match = "0.1.*" version = "2.0.1" -libimagrt = { version = "0.4.0", path = "../libimagrt" } -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagtodo = { version = "0.4.0", path = "../libimagtodo" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } +libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagtodo = { version = "0.4.0", path = "../../../lib/domain/libimagtodo" } diff --git a/bin/domain/imag-todo/README.md b/bin/domain/imag-todo/README.md new file mode 120000 index 00000000..66d0fe8c --- /dev/null +++ b/bin/domain/imag-todo/README.md @@ -0,0 +1 @@ +../../../doc/src/04020-module-todo.md \ No newline at end of file diff --git a/imag-todo/etc/on-add.sh b/bin/domain/imag-todo/etc/on-add.sh similarity index 100% rename from imag-todo/etc/on-add.sh rename to bin/domain/imag-todo/etc/on-add.sh diff --git a/imag-todo/etc/on-modify.sh b/bin/domain/imag-todo/etc/on-modify.sh similarity index 100% rename from imag-todo/etc/on-modify.sh rename to bin/domain/imag-todo/etc/on-modify.sh diff --git a/imag-todo/src/main.rs b/bin/domain/imag-todo/src/main.rs similarity index 100% rename from imag-todo/src/main.rs rename to bin/domain/imag-todo/src/main.rs diff --git a/imag-todo/src/ui.rs b/bin/domain/imag-todo/src/ui.rs similarity index 100% rename from imag-todo/src/ui.rs rename to bin/domain/imag-todo/src/ui.rs diff --git a/doc/src/05100-lib-annotation.md b/doc/src/05100-lib-entryannotation.md similarity index 94% rename from doc/src/05100-lib-annotation.md rename to doc/src/05100-lib-entryannotation.md index a40842cc..8b61f686 100644 --- a/doc/src/05100-lib-annotation.md +++ b/doc/src/05100-lib-entryannotation.md @@ -1,4 +1,4 @@ -## libimagannotation +## libimagentryannotation This library provides annotation functionality for entries. diff --git a/doc/src/05100-lib-entrycategory.md b/doc/src/05100-lib-entrycategory.md new file mode 100644 index 00000000..2750bb25 --- /dev/null +++ b/doc/src/05100-lib-entrycategory.md @@ -0,0 +1,4 @@ +## libimagentrycategory + +This library provides category functionality for entries. + diff --git a/doc/src/05100-lib-entrydatetime.md b/doc/src/05100-lib-entrydatetime.md new file mode 100644 index 00000000..46312884 --- /dev/null +++ b/doc/src/05100-lib-entrydatetime.md @@ -0,0 +1,4 @@ +## libimagentrydatetime + +Provides date/time functionality for entries. + diff --git a/doc/src/05100-lib-entryedit.md b/doc/src/05100-lib-entryedit.md new file mode 100644 index 00000000..42374e48 --- /dev/null +++ b/doc/src/05100-lib-entryedit.md @@ -0,0 +1,4 @@ +## libimagentryedit + +Provides edit (as in spawning an `$EDITOR`) functionality for entries. + diff --git a/doc/src/05100-lib-ref.md b/doc/src/05100-lib-entryref.md similarity index 99% rename from doc/src/05100-lib-ref.md rename to doc/src/05100-lib-entryref.md index ce18c297..459735f0 100644 --- a/doc/src/05100-lib-ref.md +++ b/doc/src/05100-lib-entryref.md @@ -1,4 +1,4 @@ -## libimagref +## libimagentryref This library crate contains functionality to generate _references_ within the imag store. diff --git a/doc/src/05100-lib-entryview.md b/doc/src/05100-lib-entryview.md new file mode 100644 index 00000000..d982d832 --- /dev/null +++ b/doc/src/05100-lib-entryview.md @@ -0,0 +1,5 @@ +## libimagentryview + +Provides viewing (as in piping to stdout, opening in `$EDITOR` or in `$BROWSER`) +functionality for entries. + diff --git a/imag-bookmark/README.md b/imag-bookmark/README.md deleted file mode 120000 index 43e7a524..00000000 --- a/imag-bookmark/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/04020-module-bookmarks.md \ No newline at end of file diff --git a/imag-counter/README.md b/imag-counter/README.md deleted file mode 120000 index b52d8802..00000000 --- a/imag-counter/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/04020-module-counter.md \ No newline at end of file diff --git a/imag-diary/Cargo.toml b/imag-diary/Cargo.toml deleted file mode 100644 index cb20c794..00000000 --- a/imag-diary/Cargo.toml +++ /dev/null @@ -1,30 +0,0 @@ -[package] -name = "imag-diary" -version = "0.4.0" -authors = ["Matthias Beyer "] - -description = "Part of the imag core distribution: imag-diary command" - -keywords = ["imag", "PIM", "personal", "information", "management"] -readme = "../README.md" -license = "LGPL-2.1" - -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" -repository = "https://github.com/matthiasbeyer/imag" -homepage = "http://imag-pim.org" - -[dependencies] -chrono = "0.4" -version = "2.0" -clap = "2.*" -log = "0.3" - -libimagrt = { version = "0.4.0", path = "../libimagrt" } -libimagdiary = { version = "0.4.0", path = "../libimagdiary" } -libimagentryedit = { version = "0.4.0", path = "../libimagentryedit" } -libimagentrylist = { version = "0.4.0", path = "../libimagentrylist" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimaginteraction = { version = "0.4.0", path = "../libimaginteraction" } -libimagutil = { version = "0.4.0", path = "../libimagutil" } -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagtimeui = { version = "0.4.0", path = "../libimagtimeui" } diff --git a/imag-diary/README.md b/imag-diary/README.md deleted file mode 120000 index 1aab1ab7..00000000 --- a/imag-diary/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/04020-module-diary.md \ No newline at end of file diff --git a/imag-link/README.md b/imag-link/README.md deleted file mode 120000 index 5cec1238..00000000 --- a/imag-link/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/04020-module-link.md \ No newline at end of file diff --git a/imag-mail/Cargo.toml b/imag-mail/Cargo.toml deleted file mode 100644 index 5d4123a4..00000000 --- a/imag-mail/Cargo.toml +++ /dev/null @@ -1,24 +0,0 @@ -[package] -name = "imag-mail" -version = "0.4.0" -authors = ["Matthias Beyer "] - -description = "Part of the imag core distribution: imag-notes command" - -keywords = ["imag", "PIM", "personal", "information", "management"] -readme = "../README.md" -license = "LGPL-2.1" - -[dependencies] -semver = "0.5" -clap = "2.*" -log = "0.3" -version = "2.0.1" -toml = "0.4.*" -url = "1.2" - -libimagrt = { version = "0.4.0", path = "../libimagrt" } -libimagmail = { version = "0.4.0", path = "../libimagmail" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagutil = { version = "0.4.0", path = "../libimagutil" } -libimagref = { version = "0.4.0", path = "../libimagref" } diff --git a/imag-mail/README.md b/imag-mail/README.md deleted file mode 120000 index d5d8fb01..00000000 --- a/imag-mail/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/04020-module-mails.md \ No newline at end of file diff --git a/imag-ref/Cargo.toml b/imag-ref/Cargo.toml deleted file mode 100644 index 27ef6701..00000000 --- a/imag-ref/Cargo.toml +++ /dev/null @@ -1,28 +0,0 @@ -[package] -name = "imag-ref" -version = "0.4.0" -authors = ["Matthias Beyer "] - -description = "Part of the imag core distribution: imag-ref command" - -keywords = ["imag", "PIM", "personal", "information", "management"] -readme = "../README.md" -license = "LGPL-2.1" - -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" -repository = "https://github.com/matthiasbeyer/imag" -homepage = "http://imag-pim.org" - -[dependencies] -semver = "0.5.1" -clap = ">=2.17" -log = "0.3" -version = "2.0.1" - -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagrt = { version = "0.4.0", path = "../libimagrt" } -libimagref = { version = "0.4.0", path = "../libimagref" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimaginteraction = { version = "0.4.0", path = "../libimaginteraction" } -libimagentrylist = { version = "0.4.0", path = "../libimagentrylist" } -libimagutil = { version = "0.4.0", path = "../libimagutil" } diff --git a/imag-ref/README.md b/imag-ref/README.md deleted file mode 120000 index aea1eea8..00000000 --- a/imag-ref/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/04020-module-ref.md \ No newline at end of file diff --git a/imag-store/README.md b/imag-store/README.md deleted file mode 120000 index e3a42a13..00000000 --- a/imag-store/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/04020-module-store.md \ No newline at end of file diff --git a/imag-tag/README.md b/imag-tag/README.md deleted file mode 120000 index 40828c4c..00000000 --- a/imag-tag/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/04020-module-tag.md \ No newline at end of file diff --git a/imag-view/README.md b/imag-view/README.md deleted file mode 120000 index 2f44c383..00000000 --- a/imag-view/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/04020-module-view.md \ No newline at end of file diff --git a/libimagerror/Cargo.toml b/lib/core/libimagerror/Cargo.toml similarity index 100% rename from libimagerror/Cargo.toml rename to lib/core/libimagerror/Cargo.toml diff --git a/lib/core/libimagerror/README.md b/lib/core/libimagerror/README.md new file mode 120000 index 00000000..4773c111 --- /dev/null +++ b/lib/core/libimagerror/README.md @@ -0,0 +1 @@ +../../../doc/src/05100-lib-error.md \ No newline at end of file diff --git a/libimagerror/src/error_gen.rs b/lib/core/libimagerror/src/error_gen.rs similarity index 100% rename from libimagerror/src/error_gen.rs rename to lib/core/libimagerror/src/error_gen.rs diff --git a/libimagerror/src/into.rs b/lib/core/libimagerror/src/into.rs similarity index 100% rename from libimagerror/src/into.rs rename to lib/core/libimagerror/src/into.rs diff --git a/libimagerror/src/iter.rs b/lib/core/libimagerror/src/iter.rs similarity index 100% rename from libimagerror/src/iter.rs rename to lib/core/libimagerror/src/iter.rs diff --git a/libimagerror/src/lib.rs b/lib/core/libimagerror/src/lib.rs similarity index 100% rename from libimagerror/src/lib.rs rename to lib/core/libimagerror/src/lib.rs diff --git a/libimagerror/src/trace.rs b/lib/core/libimagerror/src/trace.rs similarity index 100% rename from libimagerror/src/trace.rs rename to lib/core/libimagerror/src/trace.rs diff --git a/libimagrt/.gitignore b/lib/core/libimagrt/.gitignore similarity index 100% rename from libimagrt/.gitignore rename to lib/core/libimagrt/.gitignore diff --git a/libimagrt/Cargo.toml b/lib/core/libimagrt/Cargo.toml similarity index 73% rename from libimagrt/Cargo.toml rename to lib/core/libimagrt/Cargo.toml index 052b3117..4f0f0863 100644 --- a/libimagrt/Cargo.toml +++ b/lib/core/libimagrt/Cargo.toml @@ -24,6 +24,6 @@ tempfile = "2.1" ansi_term = "0.9" is-match = "0.1" -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagutil = { version = "0.4.0", path = "../libimagutil" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } diff --git a/lib/core/libimagrt/README.md b/lib/core/libimagrt/README.md new file mode 120000 index 00000000..0b074c99 --- /dev/null +++ b/lib/core/libimagrt/README.md @@ -0,0 +1 @@ +../../../doc/src/05100-lib-rt.md \ No newline at end of file diff --git a/libimagrt/src/configuration.rs b/lib/core/libimagrt/src/configuration.rs similarity index 100% rename from libimagrt/src/configuration.rs rename to lib/core/libimagrt/src/configuration.rs diff --git a/libimagrt/src/error.rs b/lib/core/libimagrt/src/error.rs similarity index 100% rename from libimagrt/src/error.rs rename to lib/core/libimagrt/src/error.rs diff --git a/libimagrt/src/lib.rs b/lib/core/libimagrt/src/lib.rs similarity index 100% rename from libimagrt/src/lib.rs rename to lib/core/libimagrt/src/lib.rs diff --git a/libimagrt/src/logger.rs b/lib/core/libimagrt/src/logger.rs similarity index 100% rename from libimagrt/src/logger.rs rename to lib/core/libimagrt/src/logger.rs diff --git a/libimagrt/src/runtime.rs b/lib/core/libimagrt/src/runtime.rs similarity index 100% rename from libimagrt/src/runtime.rs rename to lib/core/libimagrt/src/runtime.rs diff --git a/libimagrt/src/setup.rs b/lib/core/libimagrt/src/setup.rs similarity index 100% rename from libimagrt/src/setup.rs rename to lib/core/libimagrt/src/setup.rs diff --git a/libimagrt/src/spec.rs b/lib/core/libimagrt/src/spec.rs similarity index 100% rename from libimagrt/src/spec.rs rename to lib/core/libimagrt/src/spec.rs diff --git a/libimagstore/.gitignore b/lib/core/libimagstore/.gitignore similarity index 100% rename from libimagstore/.gitignore rename to lib/core/libimagstore/.gitignore diff --git a/libimagstore/Cargo.toml b/lib/core/libimagstore/Cargo.toml similarity index 91% rename from libimagstore/Cargo.toml rename to lib/core/libimagstore/Cargo.toml index 0e8ed33b..c5fb527f 100644 --- a/libimagstore/Cargo.toml +++ b/lib/core/libimagstore/Cargo.toml @@ -30,8 +30,8 @@ serde = "1.0" serde_json = "1.0" serde_derive = "1.0" -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagutil = { version = "0.4.0", path = "../libimagutil" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } [dev-dependencies] tempdir = "0.3.4" diff --git a/lib/core/libimagstore/README.md b/lib/core/libimagstore/README.md new file mode 120000 index 00000000..38c50d7e --- /dev/null +++ b/lib/core/libimagstore/README.md @@ -0,0 +1 @@ +../../../doc/src/05100-lib-store.md \ No newline at end of file diff --git a/libimagstore/src/configuration.rs b/lib/core/libimagstore/src/configuration.rs similarity index 100% rename from libimagstore/src/configuration.rs rename to lib/core/libimagstore/src/configuration.rs diff --git a/libimagstore/src/error.rs b/lib/core/libimagstore/src/error.rs similarity index 100% rename from libimagstore/src/error.rs rename to lib/core/libimagstore/src/error.rs diff --git a/libimagstore/src/file_abstraction/fs.rs b/lib/core/libimagstore/src/file_abstraction/fs.rs similarity index 100% rename from libimagstore/src/file_abstraction/fs.rs rename to lib/core/libimagstore/src/file_abstraction/fs.rs diff --git a/libimagstore/src/file_abstraction/inmemory.rs b/lib/core/libimagstore/src/file_abstraction/inmemory.rs similarity index 100% rename from libimagstore/src/file_abstraction/inmemory.rs rename to lib/core/libimagstore/src/file_abstraction/inmemory.rs diff --git a/libimagstore/src/file_abstraction/mod.rs b/lib/core/libimagstore/src/file_abstraction/mod.rs similarity index 100% rename from libimagstore/src/file_abstraction/mod.rs rename to lib/core/libimagstore/src/file_abstraction/mod.rs diff --git a/libimagstore/src/file_abstraction/stdio/mapper/json.rs b/lib/core/libimagstore/src/file_abstraction/stdio/mapper/json.rs similarity index 100% rename from libimagstore/src/file_abstraction/stdio/mapper/json.rs rename to lib/core/libimagstore/src/file_abstraction/stdio/mapper/json.rs diff --git a/libimagstore/src/file_abstraction/stdio/mapper/mod.rs b/lib/core/libimagstore/src/file_abstraction/stdio/mapper/mod.rs similarity index 100% rename from libimagstore/src/file_abstraction/stdio/mapper/mod.rs rename to lib/core/libimagstore/src/file_abstraction/stdio/mapper/mod.rs diff --git a/libimagstore/src/file_abstraction/stdio/mod.rs b/lib/core/libimagstore/src/file_abstraction/stdio/mod.rs similarity index 100% rename from libimagstore/src/file_abstraction/stdio/mod.rs rename to lib/core/libimagstore/src/file_abstraction/stdio/mod.rs diff --git a/libimagstore/src/file_abstraction/stdio/out.rs b/lib/core/libimagstore/src/file_abstraction/stdio/out.rs similarity index 100% rename from libimagstore/src/file_abstraction/stdio/out.rs rename to lib/core/libimagstore/src/file_abstraction/stdio/out.rs diff --git a/libimagstore/src/lib.rs b/lib/core/libimagstore/src/lib.rs similarity index 100% rename from libimagstore/src/lib.rs rename to lib/core/libimagstore/src/lib.rs diff --git a/libimagstore/src/store.rs b/lib/core/libimagstore/src/store.rs similarity index 100% rename from libimagstore/src/store.rs rename to lib/core/libimagstore/src/store.rs diff --git a/libimagstore/src/storeid.rs b/lib/core/libimagstore/src/storeid.rs similarity index 100% rename from libimagstore/src/storeid.rs rename to lib/core/libimagstore/src/storeid.rs diff --git a/libimagstore/src/toml_ext.rs b/lib/core/libimagstore/src/toml_ext.rs similarity index 100% rename from libimagstore/src/toml_ext.rs rename to lib/core/libimagstore/src/toml_ext.rs diff --git a/libimagstore/src/util.rs b/lib/core/libimagstore/src/util.rs similarity index 100% rename from libimagstore/src/util.rs rename to lib/core/libimagstore/src/util.rs diff --git a/libimagbookmark/Cargo.toml b/lib/domain/libimagbookmark/Cargo.toml similarity index 67% rename from libimagbookmark/Cargo.toml rename to lib/domain/libimagbookmark/Cargo.toml index 1f271e4b..d81cb9d8 100644 --- a/libimagbookmark/Cargo.toml +++ b/lib/domain/libimagbookmark/Cargo.toml @@ -18,7 +18,7 @@ semver = "0.5" url = "1.2" regex = "0.1" -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagentrylink = { version = "0.4.0", path = "../libimagentrylink" } +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagentrylink = { version = "0.4.0", path = "../../../lib/entry/libimagentrylink" } diff --git a/lib/domain/libimagbookmark/README.md b/lib/domain/libimagbookmark/README.md new file mode 120000 index 00000000..6632863f --- /dev/null +++ b/lib/domain/libimagbookmark/README.md @@ -0,0 +1 @@ +../../../doc/src/05100-lib-bookmark.md \ No newline at end of file diff --git a/libimagbookmark/src/collection.rs b/lib/domain/libimagbookmark/src/collection.rs similarity index 100% rename from libimagbookmark/src/collection.rs rename to lib/domain/libimagbookmark/src/collection.rs diff --git a/libimagbookmark/src/error.rs b/lib/domain/libimagbookmark/src/error.rs similarity index 100% rename from libimagbookmark/src/error.rs rename to lib/domain/libimagbookmark/src/error.rs diff --git a/libimagbookmark/src/lib.rs b/lib/domain/libimagbookmark/src/lib.rs similarity index 100% rename from libimagbookmark/src/lib.rs rename to lib/domain/libimagbookmark/src/lib.rs diff --git a/libimagbookmark/src/link.rs b/lib/domain/libimagbookmark/src/link.rs similarity index 100% rename from libimagbookmark/src/link.rs rename to lib/domain/libimagbookmark/src/link.rs diff --git a/libimagbookmark/src/result.rs b/lib/domain/libimagbookmark/src/result.rs similarity index 100% rename from libimagbookmark/src/result.rs rename to lib/domain/libimagbookmark/src/result.rs diff --git a/libimagcounter/Cargo.toml b/lib/domain/libimagcounter/Cargo.toml similarity index 77% rename from libimagcounter/Cargo.toml rename to lib/domain/libimagcounter/Cargo.toml index ddc00880..01519e14 100644 --- a/libimagcounter/Cargo.toml +++ b/lib/domain/libimagcounter/Cargo.toml @@ -19,5 +19,5 @@ toml = "0.4.*" toml-query = "0.3.*" semver = "0.5" -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } diff --git a/lib/domain/libimagcounter/README.md b/lib/domain/libimagcounter/README.md new file mode 120000 index 00000000..cf8f1158 --- /dev/null +++ b/lib/domain/libimagcounter/README.md @@ -0,0 +1 @@ +../../../doc/src/05100-lib-counter.md \ No newline at end of file diff --git a/libimagcounter/src/counter.rs b/lib/domain/libimagcounter/src/counter.rs similarity index 100% rename from libimagcounter/src/counter.rs rename to lib/domain/libimagcounter/src/counter.rs diff --git a/libimagcounter/src/error.rs b/lib/domain/libimagcounter/src/error.rs similarity index 100% rename from libimagcounter/src/error.rs rename to lib/domain/libimagcounter/src/error.rs diff --git a/libimagcounter/src/lib.rs b/lib/domain/libimagcounter/src/lib.rs similarity index 100% rename from libimagcounter/src/lib.rs rename to lib/domain/libimagcounter/src/lib.rs diff --git a/libimagcounter/src/result.rs b/lib/domain/libimagcounter/src/result.rs similarity index 100% rename from libimagcounter/src/result.rs rename to lib/domain/libimagcounter/src/result.rs diff --git a/libimagdiary/Cargo.toml b/lib/domain/libimagdiary/Cargo.toml similarity index 54% rename from libimagdiary/Cargo.toml rename to lib/domain/libimagdiary/Cargo.toml index 2670b6b4..1da26c75 100644 --- a/libimagdiary/Cargo.toml +++ b/lib/domain/libimagdiary/Cargo.toml @@ -22,9 +22,9 @@ toml-query = "0.3.*" regex = "0.1" itertools = "0.5" -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagutil = { version = "0.4.0", path = "../libimagutil" } -libimagrt = { version = "0.4.0", path = "../libimagrt" } -libimagentryedit = { version = "0.4.0", path = "../libimagentryedit" } -libimagentryview = { version = "0.4.0", path = "../libimagentryview" } +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } +libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } +libimagentryedit = { version = "0.4.0", path = "../../../lib/entry/libimagentryedit" } +libimagentryview = { version = "0.4.0", path = "../../../lib/entry/libimagentryview" } diff --git a/lib/domain/libimagdiary/README.md b/lib/domain/libimagdiary/README.md new file mode 120000 index 00000000..beab8b80 --- /dev/null +++ b/lib/domain/libimagdiary/README.md @@ -0,0 +1 @@ +../../../doc/src/05100-lib-diary.md \ No newline at end of file diff --git a/libimagdiary/src/config.rs b/lib/domain/libimagdiary/src/config.rs similarity index 100% rename from libimagdiary/src/config.rs rename to lib/domain/libimagdiary/src/config.rs diff --git a/libimagdiary/src/diary.rs b/lib/domain/libimagdiary/src/diary.rs similarity index 100% rename from libimagdiary/src/diary.rs rename to lib/domain/libimagdiary/src/diary.rs diff --git a/libimagdiary/src/diaryid.rs b/lib/domain/libimagdiary/src/diaryid.rs similarity index 100% rename from libimagdiary/src/diaryid.rs rename to lib/domain/libimagdiary/src/diaryid.rs diff --git a/libimagdiary/src/entry.rs b/lib/domain/libimagdiary/src/entry.rs similarity index 100% rename from libimagdiary/src/entry.rs rename to lib/domain/libimagdiary/src/entry.rs diff --git a/libimagdiary/src/error.rs b/lib/domain/libimagdiary/src/error.rs similarity index 100% rename from libimagdiary/src/error.rs rename to lib/domain/libimagdiary/src/error.rs diff --git a/libimagdiary/src/is_in_diary.rs b/lib/domain/libimagdiary/src/is_in_diary.rs similarity index 100% rename from libimagdiary/src/is_in_diary.rs rename to lib/domain/libimagdiary/src/is_in_diary.rs diff --git a/libimagdiary/src/iter.rs b/lib/domain/libimagdiary/src/iter.rs similarity index 100% rename from libimagdiary/src/iter.rs rename to lib/domain/libimagdiary/src/iter.rs diff --git a/libimagdiary/src/lib.rs b/lib/domain/libimagdiary/src/lib.rs similarity index 100% rename from libimagdiary/src/lib.rs rename to lib/domain/libimagdiary/src/lib.rs diff --git a/libimagdiary/src/result.rs b/lib/domain/libimagdiary/src/result.rs similarity index 100% rename from libimagdiary/src/result.rs rename to lib/domain/libimagdiary/src/result.rs diff --git a/libimagdiary/src/viewer.rs b/lib/domain/libimagdiary/src/viewer.rs similarity index 100% rename from libimagdiary/src/viewer.rs rename to lib/domain/libimagdiary/src/viewer.rs diff --git a/libimagmail/Cargo.toml b/lib/domain/libimagmail/Cargo.toml similarity index 69% rename from libimagmail/Cargo.toml rename to lib/domain/libimagmail/Cargo.toml index da7d9c85..f3ab1e88 100644 --- a/libimagmail/Cargo.toml +++ b/lib/domain/libimagmail/Cargo.toml @@ -20,6 +20,6 @@ semver = "0.5" toml = "0.4.*" filters = "0.1.*" -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagref = { version = "0.4.0", path = "../libimagref" } +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagentryref = { version = "0.4.0", path = "../../../lib/entry/libimagentryref" } diff --git a/lib/domain/libimagmail/README.md b/lib/domain/libimagmail/README.md new file mode 120000 index 00000000..9aeb65d2 --- /dev/null +++ b/lib/domain/libimagmail/README.md @@ -0,0 +1 @@ +../../../doc/src/05100-lib-mails.md \ No newline at end of file diff --git a/libimagmail/src/error.rs b/lib/domain/libimagmail/src/error.rs similarity index 100% rename from libimagmail/src/error.rs rename to lib/domain/libimagmail/src/error.rs diff --git a/libimagmail/src/hasher.rs b/lib/domain/libimagmail/src/hasher.rs similarity index 92% rename from libimagmail/src/hasher.rs rename to lib/domain/libimagmail/src/hasher.rs index 8ea3f036..cc68d9a8 100644 --- a/libimagmail/src/hasher.rs +++ b/lib/domain/libimagmail/src/hasher.rs @@ -22,11 +22,11 @@ use std::path::PathBuf; use email::MimeMessage; -use libimagref::hasher::Hasher; -use libimagref::hasher::DefaultHasher; -use libimagref::error::RefErrorKind as REK; -use libimagref::error::MapErrInto; -use libimagref::result::Result as RResult; +use libimagentryref::hasher::Hasher; +use libimagentryref::hasher::DefaultHasher; +use libimagentryref::error::RefErrorKind as REK; +use libimagentryref::error::MapErrInto; +use libimagentryref::result::Result as RResult; use libimagerror::into::IntoError; use error::MailErrorKind as MEK; diff --git a/libimagmail/src/iter.rs b/lib/domain/libimagmail/src/iter.rs similarity index 97% rename from libimagmail/src/iter.rs rename to lib/domain/libimagmail/src/iter.rs index 771d45a5..fe1e72a4 100644 --- a/libimagmail/src/iter.rs +++ b/lib/domain/libimagmail/src/iter.rs @@ -27,7 +27,7 @@ use mail::Mail; use result::Result; -use libimagref::reference::Ref; +use libimagentryref::reference::Ref; use std::marker::PhantomData; diff --git a/libimagmail/src/lib.rs b/lib/domain/libimagmail/src/lib.rs similarity index 97% rename from libimagmail/src/lib.rs rename to lib/domain/libimagmail/src/lib.rs index cc25d1f1..23c9e60f 100644 --- a/libimagmail/src/lib.rs +++ b/lib/domain/libimagmail/src/lib.rs @@ -25,7 +25,7 @@ extern crate filters; #[macro_use] extern crate libimagerror; extern crate libimagstore; -extern crate libimagref; +extern crate libimagentryref; pub mod error; pub mod hasher; diff --git a/libimagmail/src/mail.rs b/lib/domain/libimagmail/src/mail.rs similarity index 98% rename from libimagmail/src/mail.rs rename to lib/domain/libimagmail/src/mail.rs index 6ee4d57a..11b57398 100644 --- a/libimagmail/src/mail.rs +++ b/lib/domain/libimagmail/src/mail.rs @@ -23,8 +23,8 @@ use std::fs::File; use std::io::Read; use libimagstore::store::Store; -use libimagref::reference::Ref; -use libimagref::flags::RefFlags; +use libimagentryref::reference::Ref; +use libimagentryref::flags::RefFlags; use email::MimeMessage; use email::results::ParsingResult as EmailParsingResult; diff --git a/libimagmail/src/result.rs b/lib/domain/libimagmail/src/result.rs similarity index 100% rename from libimagmail/src/result.rs rename to lib/domain/libimagmail/src/result.rs diff --git a/libimagnotes/Cargo.toml b/lib/domain/libimagnotes/Cargo.toml similarity index 55% rename from libimagnotes/Cargo.toml rename to lib/domain/libimagnotes/Cargo.toml index 83aea7c1..d3616cde 100644 --- a/libimagnotes/Cargo.toml +++ b/lib/domain/libimagnotes/Cargo.toml @@ -18,8 +18,8 @@ semver = "0.5" log = "0.3" toml = "^0.4" -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagrt = { version = "0.4.0", path = "../libimagrt" } -libimagentryedit = { version = "0.4.0", path = "../libimagentryedit" } -libimagentrytag = { version = "0.4.0", path = "../libimagentrytag" } +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } +libimagentryedit = { version = "0.4.0", path = "../../../lib/entry/libimagentryedit" } +libimagentrytag = { version = "0.4.0", path = "../../../lib/entry/libimagentrytag" } diff --git a/lib/domain/libimagnotes/README.md b/lib/domain/libimagnotes/README.md new file mode 120000 index 00000000..d1d21801 --- /dev/null +++ b/lib/domain/libimagnotes/README.md @@ -0,0 +1 @@ +../../../doc/src/05100-lib-notes.md \ No newline at end of file diff --git a/libimagnotes/src/error.rs b/lib/domain/libimagnotes/src/error.rs similarity index 100% rename from libimagnotes/src/error.rs rename to lib/domain/libimagnotes/src/error.rs diff --git a/libimagnotes/src/lib.rs b/lib/domain/libimagnotes/src/lib.rs similarity index 100% rename from libimagnotes/src/lib.rs rename to lib/domain/libimagnotes/src/lib.rs diff --git a/libimagnotes/src/note.rs b/lib/domain/libimagnotes/src/note.rs similarity index 100% rename from libimagnotes/src/note.rs rename to lib/domain/libimagnotes/src/note.rs diff --git a/libimagnotes/src/result.rs b/lib/domain/libimagnotes/src/result.rs similarity index 100% rename from libimagnotes/src/result.rs rename to lib/domain/libimagnotes/src/result.rs diff --git a/libimagentrytimetrack/Cargo.toml b/lib/domain/libimagtimetrack/Cargo.toml similarity index 59% rename from libimagentrytimetrack/Cargo.toml rename to lib/domain/libimagtimetrack/Cargo.toml index 578da442..6fed7f71 100644 --- a/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 "] @@ -21,7 +21,7 @@ toml-query = "0.3" lazy_static = "0.2" is-match = "0.1" -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagentrydatetime = { version = "0.4.0", path = "../libimagentrydatetime" } -libimagentrytag = { version = "0.4.0", path = "../libimagentrytag" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } +libimagentrydatetime = { version = "0.4.0", path = "../../../lib/entry/libimagentrydatetime" } +libimagentrytag = { version = "0.4.0", path = "../../../lib/entry/libimagentrytag" } diff --git a/lib/domain/libimagtimetrack/README.md b/lib/domain/libimagtimetrack/README.md new file mode 120000 index 00000000..6a426926 --- /dev/null +++ b/lib/domain/libimagtimetrack/README.md @@ -0,0 +1 @@ +../../../doc/src/05100-lib-timetrack.md \ No newline at end of file diff --git a/libimagentrytimetrack/src/constants.rs b/lib/domain/libimagtimetrack/src/constants.rs similarity index 100% rename from libimagentrytimetrack/src/constants.rs rename to lib/domain/libimagtimetrack/src/constants.rs diff --git a/libimagentrytimetrack/src/error.rs b/lib/domain/libimagtimetrack/src/error.rs similarity index 100% rename from libimagentrytimetrack/src/error.rs rename to lib/domain/libimagtimetrack/src/error.rs diff --git a/libimagentrytimetrack/src/iter/create.rs b/lib/domain/libimagtimetrack/src/iter/create.rs similarity index 100% rename from libimagentrytimetrack/src/iter/create.rs rename to lib/domain/libimagtimetrack/src/iter/create.rs diff --git a/libimagentrytimetrack/src/iter/filter.rs b/lib/domain/libimagtimetrack/src/iter/filter.rs similarity index 100% rename from libimagentrytimetrack/src/iter/filter.rs rename to lib/domain/libimagtimetrack/src/iter/filter.rs diff --git a/libimagentrytimetrack/src/iter/get.rs b/lib/domain/libimagtimetrack/src/iter/get.rs similarity index 100% rename from libimagentrytimetrack/src/iter/get.rs rename to lib/domain/libimagtimetrack/src/iter/get.rs diff --git a/libimagentrytimetrack/src/iter/mod.rs b/lib/domain/libimagtimetrack/src/iter/mod.rs similarity index 100% rename from libimagentrytimetrack/src/iter/mod.rs rename to lib/domain/libimagtimetrack/src/iter/mod.rs diff --git a/libimagentrytimetrack/src/iter/setendtime.rs b/lib/domain/libimagtimetrack/src/iter/setendtime.rs similarity index 100% rename from libimagentrytimetrack/src/iter/setendtime.rs rename to lib/domain/libimagtimetrack/src/iter/setendtime.rs diff --git a/libimagentrytimetrack/src/iter/storeid.rs b/lib/domain/libimagtimetrack/src/iter/storeid.rs similarity index 100% rename from libimagentrytimetrack/src/iter/storeid.rs rename to lib/domain/libimagtimetrack/src/iter/storeid.rs diff --git a/libimagentrytimetrack/src/iter/tag.rs b/lib/domain/libimagtimetrack/src/iter/tag.rs similarity index 100% rename from libimagentrytimetrack/src/iter/tag.rs rename to lib/domain/libimagtimetrack/src/iter/tag.rs diff --git a/libimagentrytimetrack/src/lib.rs b/lib/domain/libimagtimetrack/src/lib.rs similarity index 100% rename from libimagentrytimetrack/src/lib.rs rename to lib/domain/libimagtimetrack/src/lib.rs diff --git a/libimagentrytimetrack/src/result.rs b/lib/domain/libimagtimetrack/src/result.rs similarity index 100% rename from libimagentrytimetrack/src/result.rs rename to lib/domain/libimagtimetrack/src/result.rs diff --git a/libimagentrytimetrack/src/tag.rs b/lib/domain/libimagtimetrack/src/tag.rs similarity index 100% rename from libimagentrytimetrack/src/tag.rs rename to lib/domain/libimagtimetrack/src/tag.rs diff --git a/libimagentrytimetrack/src/timetracking.rs b/lib/domain/libimagtimetrack/src/timetracking.rs similarity index 100% rename from libimagentrytimetrack/src/timetracking.rs rename to lib/domain/libimagtimetrack/src/timetracking.rs diff --git a/libimagentrytimetrack/src/timetrackingstore.rs b/lib/domain/libimagtimetrack/src/timetrackingstore.rs similarity index 100% rename from libimagentrytimetrack/src/timetrackingstore.rs rename to lib/domain/libimagtimetrack/src/timetrackingstore.rs diff --git a/libimagtodo/Cargo.toml b/lib/domain/libimagtodo/Cargo.toml similarity index 72% rename from libimagtodo/Cargo.toml rename to lib/domain/libimagtodo/Cargo.toml index 706bc680..65b4ee26 100644 --- a/libimagtodo/Cargo.toml +++ b/lib/domain/libimagtodo/Cargo.toml @@ -23,6 +23,6 @@ is-match = "0.1.*" log = "0.3" serde_json = "0.8" -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagutil = { version = "0.4.0", path = "../libimagutil" } +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } diff --git a/lib/domain/libimagtodo/README.md b/lib/domain/libimagtodo/README.md new file mode 120000 index 00000000..1e34f6ea --- /dev/null +++ b/lib/domain/libimagtodo/README.md @@ -0,0 +1 @@ +../../../doc/src/05100-lib-todo.md \ No newline at end of file diff --git a/libimagtodo/src/error.rs b/lib/domain/libimagtodo/src/error.rs similarity index 100% rename from libimagtodo/src/error.rs rename to lib/domain/libimagtodo/src/error.rs diff --git a/libimagtodo/src/lib.rs b/lib/domain/libimagtodo/src/lib.rs similarity index 100% rename from libimagtodo/src/lib.rs rename to lib/domain/libimagtodo/src/lib.rs diff --git a/libimagtodo/src/result.rs b/lib/domain/libimagtodo/src/result.rs similarity index 100% rename from libimagtodo/src/result.rs rename to lib/domain/libimagtodo/src/result.rs diff --git a/libimagtodo/src/task.rs b/lib/domain/libimagtodo/src/task.rs similarity index 100% rename from libimagtodo/src/task.rs rename to lib/domain/libimagtodo/src/task.rs diff --git a/lib/entry/libimagentryannotation/Cargo.toml b/lib/entry/libimagentryannotation/Cargo.toml new file mode 100644 index 00000000..a0ceb99a --- /dev/null +++ b/lib/entry/libimagentryannotation/Cargo.toml @@ -0,0 +1,21 @@ +[package] +name = "libimagentryannotation" +version = "0.4.0" +authors = ["Matthias Beyer "] + +description = "Library for the imag core distribution" + +keywords = ["imag", "PIM", "personal", "information", "management"] +readme = "../README.md" +license = "LGPL-2.1" + +[dependencies] +uuid = { version = "0.3.1", features = ["v4"] } +lazy_static = "0.1.15" +toml = "^0.4" + +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagnotes = { version = "0.4.0", path = "../../../lib/domain/libimagnotes" } +libimagentrylink = { version = "0.4.0", path = "../../../lib/entry/libimagentrylink" } +libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } diff --git a/lib/entry/libimagentryannotation/README.md b/lib/entry/libimagentryannotation/README.md new file mode 120000 index 00000000..b08fcb68 --- /dev/null +++ b/lib/entry/libimagentryannotation/README.md @@ -0,0 +1 @@ +../../../doc/src/05100-lib-entryannotation.md \ No newline at end of file diff --git a/libimagannotation/src/annotateable.rs b/lib/entry/libimagentryannotation/src/annotateable.rs similarity index 100% rename from libimagannotation/src/annotateable.rs rename to lib/entry/libimagentryannotation/src/annotateable.rs diff --git a/libimagannotation/src/annotation_fetcher.rs b/lib/entry/libimagentryannotation/src/annotation_fetcher.rs similarity index 100% rename from libimagannotation/src/annotation_fetcher.rs rename to lib/entry/libimagentryannotation/src/annotation_fetcher.rs diff --git a/libimagannotation/src/error.rs b/lib/entry/libimagentryannotation/src/error.rs similarity index 100% rename from libimagannotation/src/error.rs rename to lib/entry/libimagentryannotation/src/error.rs diff --git a/libimagannotation/src/lib.rs b/lib/entry/libimagentryannotation/src/lib.rs similarity index 100% rename from libimagannotation/src/lib.rs rename to lib/entry/libimagentryannotation/src/lib.rs diff --git a/libimagannotation/src/result.rs b/lib/entry/libimagentryannotation/src/result.rs similarity index 100% rename from libimagannotation/src/result.rs rename to lib/entry/libimagentryannotation/src/result.rs diff --git a/libimagentrycategory/Cargo.toml b/lib/entry/libimagentrycategory/Cargo.toml similarity index 79% rename from libimagentrycategory/Cargo.toml rename to lib/entry/libimagentrycategory/Cargo.toml index 6c8b9dfb..d3f16185 100644 --- a/libimagentrycategory/Cargo.toml +++ b/lib/entry/libimagentrycategory/Cargo.toml @@ -19,8 +19,8 @@ toml = "0.4" toml-query = "0.3" is-match = "0.1" -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagstore = { version = "0.4.0", path = "../libimagstore" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } [dev-dependencies] env_logger = "0.4" diff --git a/lib/entry/libimagentrycategory/README.md b/lib/entry/libimagentrycategory/README.md new file mode 120000 index 00000000..8d5f1eb6 --- /dev/null +++ b/lib/entry/libimagentrycategory/README.md @@ -0,0 +1 @@ +../../../doc/src/05100-lib-entrycategory.md \ No newline at end of file diff --git a/libimagentrycategory/src/category.rs b/lib/entry/libimagentrycategory/src/category.rs similarity index 100% rename from libimagentrycategory/src/category.rs rename to lib/entry/libimagentrycategory/src/category.rs diff --git a/libimagentrycategory/src/error.rs b/lib/entry/libimagentrycategory/src/error.rs similarity index 100% rename from libimagentrycategory/src/error.rs rename to lib/entry/libimagentrycategory/src/error.rs diff --git a/libimagentrycategory/src/lib.rs b/lib/entry/libimagentrycategory/src/lib.rs similarity index 100% rename from libimagentrycategory/src/lib.rs rename to lib/entry/libimagentrycategory/src/lib.rs diff --git a/libimagentrycategory/src/register.rs b/lib/entry/libimagentrycategory/src/register.rs similarity index 100% rename from libimagentrycategory/src/register.rs rename to lib/entry/libimagentrycategory/src/register.rs diff --git a/libimagentrycategory/src/result.rs b/lib/entry/libimagentrycategory/src/result.rs similarity index 100% rename from libimagentrycategory/src/result.rs rename to lib/entry/libimagentrycategory/src/result.rs diff --git a/libimagentrydatetime/Cargo.toml b/lib/entry/libimagentrydatetime/Cargo.toml similarity index 71% rename from libimagentrydatetime/Cargo.toml rename to lib/entry/libimagentrydatetime/Cargo.toml index 4885af11..93e43b8c 100644 --- a/libimagentrydatetime/Cargo.toml +++ b/lib/entry/libimagentrydatetime/Cargo.toml @@ -19,9 +19,9 @@ toml-query = "0.3" lazy_static = "0.2" toml = "0.4" -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagutil = { version = "0.4.0", path = "../libimagutil" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } +libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } [dev-dependencies] is-match = "0.1" diff --git a/lib/entry/libimagentrydatetime/README.md b/lib/entry/libimagentrydatetime/README.md new file mode 120000 index 00000000..2e684f4f --- /dev/null +++ b/lib/entry/libimagentrydatetime/README.md @@ -0,0 +1 @@ +../../../doc/src/05100-lib-entrydatetime.md \ No newline at end of file diff --git a/libimagentrydatetime/src/datepath/accuracy.rs b/lib/entry/libimagentrydatetime/src/datepath/accuracy.rs similarity index 100% rename from libimagentrydatetime/src/datepath/accuracy.rs rename to lib/entry/libimagentrydatetime/src/datepath/accuracy.rs diff --git a/libimagentrydatetime/src/datepath/compiler.rs b/lib/entry/libimagentrydatetime/src/datepath/compiler.rs similarity index 100% rename from libimagentrydatetime/src/datepath/compiler.rs rename to lib/entry/libimagentrydatetime/src/datepath/compiler.rs diff --git a/libimagentrydatetime/src/datepath/error.rs b/lib/entry/libimagentrydatetime/src/datepath/error.rs similarity index 100% rename from libimagentrydatetime/src/datepath/error.rs rename to lib/entry/libimagentrydatetime/src/datepath/error.rs diff --git a/libimagentrydatetime/src/datepath/format.rs b/lib/entry/libimagentrydatetime/src/datepath/format.rs similarity index 100% rename from libimagentrydatetime/src/datepath/format.rs rename to lib/entry/libimagentrydatetime/src/datepath/format.rs diff --git a/libimagentrydatetime/src/datepath/mod.rs b/lib/entry/libimagentrydatetime/src/datepath/mod.rs similarity index 100% rename from libimagentrydatetime/src/datepath/mod.rs rename to lib/entry/libimagentrydatetime/src/datepath/mod.rs diff --git a/libimagentrydatetime/src/datepath/result.rs b/lib/entry/libimagentrydatetime/src/datepath/result.rs similarity index 100% rename from libimagentrydatetime/src/datepath/result.rs rename to lib/entry/libimagentrydatetime/src/datepath/result.rs diff --git a/libimagentrydatetime/src/datepath/to_store_id.rs b/lib/entry/libimagentrydatetime/src/datepath/to_store_id.rs similarity index 100% rename from libimagentrydatetime/src/datepath/to_store_id.rs rename to lib/entry/libimagentrydatetime/src/datepath/to_store_id.rs diff --git a/libimagentrydatetime/src/datetime.rs b/lib/entry/libimagentrydatetime/src/datetime.rs similarity index 100% rename from libimagentrydatetime/src/datetime.rs rename to lib/entry/libimagentrydatetime/src/datetime.rs diff --git a/libimagentrydatetime/src/error.rs b/lib/entry/libimagentrydatetime/src/error.rs similarity index 100% rename from libimagentrydatetime/src/error.rs rename to lib/entry/libimagentrydatetime/src/error.rs diff --git a/libimagentrydatetime/src/lib.rs b/lib/entry/libimagentrydatetime/src/lib.rs similarity index 100% rename from libimagentrydatetime/src/lib.rs rename to lib/entry/libimagentrydatetime/src/lib.rs diff --git a/libimagentrydatetime/src/range.rs b/lib/entry/libimagentrydatetime/src/range.rs similarity index 100% rename from libimagentrydatetime/src/range.rs rename to lib/entry/libimagentrydatetime/src/range.rs diff --git a/libimagentrydatetime/src/result.rs b/lib/entry/libimagentrydatetime/src/result.rs similarity index 100% rename from libimagentrydatetime/src/result.rs rename to lib/entry/libimagentrydatetime/src/result.rs diff --git a/libimagentryedit/Cargo.toml b/lib/entry/libimagentryedit/Cargo.toml similarity index 61% rename from libimagentryedit/Cargo.toml rename to lib/entry/libimagentryedit/Cargo.toml index 56313daa..ae241d2c 100644 --- a/libimagentryedit/Cargo.toml +++ b/lib/entry/libimagentryedit/Cargo.toml @@ -15,7 +15,7 @@ homepage = "http://imag-pim.org" [dependencies] -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagrt = { version = "0.4.0", path = "../libimagrt" } -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagutil = { version = "0.4.0", path = "../libimagutil" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } +libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } diff --git a/lib/entry/libimagentryedit/README.md b/lib/entry/libimagentryedit/README.md new file mode 120000 index 00000000..0923d27a --- /dev/null +++ b/lib/entry/libimagentryedit/README.md @@ -0,0 +1 @@ +../../../doc/src/05100-lib-entryedit.md \ No newline at end of file diff --git a/libimagentryedit/src/edit.rs b/lib/entry/libimagentryedit/src/edit.rs similarity index 100% rename from libimagentryedit/src/edit.rs rename to lib/entry/libimagentryedit/src/edit.rs diff --git a/libimagentryedit/src/error.rs b/lib/entry/libimagentryedit/src/error.rs similarity index 100% rename from libimagentryedit/src/error.rs rename to lib/entry/libimagentryedit/src/error.rs diff --git a/libimagentryedit/src/lib.rs b/lib/entry/libimagentryedit/src/lib.rs similarity index 100% rename from libimagentryedit/src/lib.rs rename to lib/entry/libimagentryedit/src/lib.rs diff --git a/libimagentryedit/src/result.rs b/lib/entry/libimagentryedit/src/result.rs similarity index 100% rename from libimagentryedit/src/result.rs rename to lib/entry/libimagentryedit/src/result.rs diff --git a/libimagentryfilter/Cargo.toml b/lib/entry/libimagentryfilter/Cargo.toml similarity index 78% rename from libimagentryfilter/Cargo.toml rename to lib/entry/libimagentryfilter/Cargo.toml index f20b33b6..decdc730 100644 --- a/libimagentryfilter/Cargo.toml +++ b/lib/entry/libimagentryfilter/Cargo.toml @@ -22,5 +22,5 @@ regex = "0.2" semver = "0.5.*" toml = "^0.4" -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagentrytag = { version = "0.4.0", path = "../libimagentrytag" } +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } +libimagentrytag = { version = "0.4.0", path = "../../../lib/entry/libimagentrytag" } diff --git a/lib/entry/libimagentryfilter/README.md b/lib/entry/libimagentryfilter/README.md new file mode 120000 index 00000000..6cb6f08e --- /dev/null +++ b/lib/entry/libimagentryfilter/README.md @@ -0,0 +1 @@ +../../../doc/src/05100-lib-entryfilter.md \ No newline at end of file diff --git a/libimagentryfilter/src/builtin/bool_filter.rs b/lib/entry/libimagentryfilter/src/builtin/bool_filter.rs similarity index 100% rename from libimagentryfilter/src/builtin/bool_filter.rs rename to lib/entry/libimagentryfilter/src/builtin/bool_filter.rs diff --git a/libimagentryfilter/src/builtin/content/grep.rs b/lib/entry/libimagentryfilter/src/builtin/content/grep.rs similarity index 100% rename from libimagentryfilter/src/builtin/content/grep.rs rename to lib/entry/libimagentryfilter/src/builtin/content/grep.rs diff --git a/libimagentryfilter/src/builtin/content/length/is_over.rs b/lib/entry/libimagentryfilter/src/builtin/content/length/is_over.rs similarity index 100% rename from libimagentryfilter/src/builtin/content/length/is_over.rs rename to lib/entry/libimagentryfilter/src/builtin/content/length/is_over.rs diff --git a/libimagentryfilter/src/builtin/content/length/is_under.rs b/lib/entry/libimagentryfilter/src/builtin/content/length/is_under.rs similarity index 100% rename from libimagentryfilter/src/builtin/content/length/is_under.rs rename to lib/entry/libimagentryfilter/src/builtin/content/length/is_under.rs diff --git a/libimagentryfilter/src/builtin/content/length/mod.rs b/lib/entry/libimagentryfilter/src/builtin/content/length/mod.rs similarity index 100% rename from libimagentryfilter/src/builtin/content/length/mod.rs rename to lib/entry/libimagentryfilter/src/builtin/content/length/mod.rs diff --git a/libimagentryfilter/src/builtin/content/mod.rs b/lib/entry/libimagentryfilter/src/builtin/content/mod.rs similarity index 100% rename from libimagentryfilter/src/builtin/content/mod.rs rename to lib/entry/libimagentryfilter/src/builtin/content/mod.rs diff --git a/libimagentryfilter/src/builtin/header/field_eq.rs b/lib/entry/libimagentryfilter/src/builtin/header/field_eq.rs similarity index 100% rename from libimagentryfilter/src/builtin/header/field_eq.rs rename to lib/entry/libimagentryfilter/src/builtin/header/field_eq.rs diff --git a/libimagentryfilter/src/builtin/header/field_exists.rs b/lib/entry/libimagentryfilter/src/builtin/header/field_exists.rs similarity index 100% rename from libimagentryfilter/src/builtin/header/field_exists.rs rename to lib/entry/libimagentryfilter/src/builtin/header/field_exists.rs diff --git a/libimagentryfilter/src/builtin/header/field_grep.rs b/lib/entry/libimagentryfilter/src/builtin/header/field_grep.rs similarity index 100% rename from libimagentryfilter/src/builtin/header/field_grep.rs rename to lib/entry/libimagentryfilter/src/builtin/header/field_grep.rs diff --git a/libimagentryfilter/src/builtin/header/field_gt.rs b/lib/entry/libimagentryfilter/src/builtin/header/field_gt.rs similarity index 100% rename from libimagentryfilter/src/builtin/header/field_gt.rs rename to lib/entry/libimagentryfilter/src/builtin/header/field_gt.rs diff --git a/libimagentryfilter/src/builtin/header/field_isempty.rs b/lib/entry/libimagentryfilter/src/builtin/header/field_isempty.rs similarity index 100% rename from libimagentryfilter/src/builtin/header/field_isempty.rs rename to lib/entry/libimagentryfilter/src/builtin/header/field_isempty.rs diff --git a/libimagentryfilter/src/builtin/header/field_istype.rs b/lib/entry/libimagentryfilter/src/builtin/header/field_istype.rs similarity index 100% rename from libimagentryfilter/src/builtin/header/field_istype.rs rename to lib/entry/libimagentryfilter/src/builtin/header/field_istype.rs diff --git a/libimagentryfilter/src/builtin/header/field_lt.rs b/lib/entry/libimagentryfilter/src/builtin/header/field_lt.rs similarity index 100% rename from libimagentryfilter/src/builtin/header/field_lt.rs rename to lib/entry/libimagentryfilter/src/builtin/header/field_lt.rs diff --git a/libimagentryfilter/src/builtin/header/field_path.rs b/lib/entry/libimagentryfilter/src/builtin/header/field_path.rs similarity index 100% rename from libimagentryfilter/src/builtin/header/field_path.rs rename to lib/entry/libimagentryfilter/src/builtin/header/field_path.rs diff --git a/libimagentryfilter/src/builtin/header/field_predicate.rs b/lib/entry/libimagentryfilter/src/builtin/header/field_predicate.rs similarity index 100% rename from libimagentryfilter/src/builtin/header/field_predicate.rs rename to lib/entry/libimagentryfilter/src/builtin/header/field_predicate.rs diff --git a/libimagentryfilter/src/builtin/header/mod.rs b/lib/entry/libimagentryfilter/src/builtin/header/mod.rs similarity index 100% rename from libimagentryfilter/src/builtin/header/mod.rs rename to lib/entry/libimagentryfilter/src/builtin/header/mod.rs diff --git a/libimagentryfilter/src/builtin/header/version/eq.rs b/lib/entry/libimagentryfilter/src/builtin/header/version/eq.rs similarity index 100% rename from libimagentryfilter/src/builtin/header/version/eq.rs rename to lib/entry/libimagentryfilter/src/builtin/header/version/eq.rs diff --git a/libimagentryfilter/src/builtin/header/version/gt.rs b/lib/entry/libimagentryfilter/src/builtin/header/version/gt.rs similarity index 100% rename from libimagentryfilter/src/builtin/header/version/gt.rs rename to lib/entry/libimagentryfilter/src/builtin/header/version/gt.rs diff --git a/libimagentryfilter/src/builtin/header/version/lt.rs b/lib/entry/libimagentryfilter/src/builtin/header/version/lt.rs similarity index 100% rename from libimagentryfilter/src/builtin/header/version/lt.rs rename to lib/entry/libimagentryfilter/src/builtin/header/version/lt.rs diff --git a/libimagentryfilter/src/builtin/header/version/mod.rs b/lib/entry/libimagentryfilter/src/builtin/header/version/mod.rs similarity index 100% rename from libimagentryfilter/src/builtin/header/version/mod.rs rename to lib/entry/libimagentryfilter/src/builtin/header/version/mod.rs diff --git a/libimagentryfilter/src/builtin/header/version/range.rs b/lib/entry/libimagentryfilter/src/builtin/header/version/range.rs similarity index 100% rename from libimagentryfilter/src/builtin/header/version/range.rs rename to lib/entry/libimagentryfilter/src/builtin/header/version/range.rs diff --git a/libimagentryfilter/src/builtin/mod.rs b/lib/entry/libimagentryfilter/src/builtin/mod.rs similarity index 100% rename from libimagentryfilter/src/builtin/mod.rs rename to lib/entry/libimagentryfilter/src/builtin/mod.rs diff --git a/libimagentryfilter/src/cli.rs b/lib/entry/libimagentryfilter/src/cli.rs similarity index 100% rename from libimagentryfilter/src/cli.rs rename to lib/entry/libimagentryfilter/src/cli.rs diff --git a/libimagentryfilter/src/lib.rs b/lib/entry/libimagentryfilter/src/lib.rs similarity index 100% rename from libimagentryfilter/src/lib.rs rename to lib/entry/libimagentryfilter/src/lib.rs diff --git a/libimagentryfilter/src/tags/mod.rs b/lib/entry/libimagentryfilter/src/tags/mod.rs similarity index 100% rename from libimagentryfilter/src/tags/mod.rs rename to lib/entry/libimagentryfilter/src/tags/mod.rs diff --git a/libimagentrylink/Cargo.toml b/lib/entry/libimagentrylink/Cargo.toml similarity index 72% rename from libimagentrylink/Cargo.toml rename to lib/entry/libimagentrylink/Cargo.toml index 451a0eb9..32e86873 100644 --- a/libimagentrylink/Cargo.toml +++ b/lib/entry/libimagentrylink/Cargo.toml @@ -23,6 +23,6 @@ rust-crypto = "0.2" env_logger = "0.3" is-match = "0.1" -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagutil = { version = "0.4.0", path = "../libimagutil" } +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } diff --git a/lib/entry/libimagentrylink/README.md b/lib/entry/libimagentrylink/README.md new file mode 120000 index 00000000..15e59aea --- /dev/null +++ b/lib/entry/libimagentrylink/README.md @@ -0,0 +1 @@ +../../../doc/src/05100-lib-entrylink.md \ No newline at end of file diff --git a/libimagentrylink/src/error.rs b/lib/entry/libimagentrylink/src/error.rs similarity index 100% rename from libimagentrylink/src/error.rs rename to lib/entry/libimagentrylink/src/error.rs diff --git a/libimagentrylink/src/external.rs b/lib/entry/libimagentrylink/src/external.rs similarity index 100% rename from libimagentrylink/src/external.rs rename to lib/entry/libimagentrylink/src/external.rs diff --git a/libimagentrylink/src/internal.rs b/lib/entry/libimagentrylink/src/internal.rs similarity index 100% rename from libimagentrylink/src/internal.rs rename to lib/entry/libimagentrylink/src/internal.rs diff --git a/libimagentrylink/src/lib.rs b/lib/entry/libimagentrylink/src/lib.rs similarity index 100% rename from libimagentrylink/src/lib.rs rename to lib/entry/libimagentrylink/src/lib.rs diff --git a/libimagentrylink/src/result.rs b/lib/entry/libimagentrylink/src/result.rs similarity index 100% rename from libimagentrylink/src/result.rs rename to lib/entry/libimagentrylink/src/result.rs diff --git a/libimagentrylist/Cargo.toml b/lib/entry/libimagentrylist/Cargo.toml similarity index 70% rename from libimagentrylist/Cargo.toml rename to lib/entry/libimagentrylist/Cargo.toml index 832f68d9..c28354da 100644 --- a/libimagentrylist/Cargo.toml +++ b/lib/entry/libimagentrylist/Cargo.toml @@ -19,6 +19,6 @@ log = "0.3" toml = "^0.4" prettytable-rs = "0.6.*" -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagutil = { version = "0.4.0", path = "../libimagutil" } +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } diff --git a/lib/entry/libimagentrylist/README.md b/lib/entry/libimagentrylist/README.md new file mode 120000 index 00000000..914fa13f --- /dev/null +++ b/lib/entry/libimagentrylist/README.md @@ -0,0 +1 @@ +../../../doc/src/05100-lib-entrylist.md \ No newline at end of file diff --git a/libimagentrylist/src/cli.rs b/lib/entry/libimagentrylist/src/cli.rs similarity index 100% rename from libimagentrylist/src/cli.rs rename to lib/entry/libimagentrylist/src/cli.rs diff --git a/libimagentrylist/src/error.rs b/lib/entry/libimagentrylist/src/error.rs similarity index 100% rename from libimagentrylist/src/error.rs rename to lib/entry/libimagentrylist/src/error.rs diff --git a/libimagentrylist/src/lib.rs b/lib/entry/libimagentrylist/src/lib.rs similarity index 100% rename from libimagentrylist/src/lib.rs rename to lib/entry/libimagentrylist/src/lib.rs diff --git a/libimagentrylist/src/lister.rs b/lib/entry/libimagentrylist/src/lister.rs similarity index 100% rename from libimagentrylist/src/lister.rs rename to lib/entry/libimagentrylist/src/lister.rs diff --git a/libimagentrylist/src/listers/core.rs b/lib/entry/libimagentrylist/src/listers/core.rs similarity index 100% rename from libimagentrylist/src/listers/core.rs rename to lib/entry/libimagentrylist/src/listers/core.rs diff --git a/libimagentrylist/src/listers/line.rs b/lib/entry/libimagentrylist/src/listers/line.rs similarity index 100% rename from libimagentrylist/src/listers/line.rs rename to lib/entry/libimagentrylist/src/listers/line.rs diff --git a/libimagentrylist/src/listers/mod.rs b/lib/entry/libimagentrylist/src/listers/mod.rs similarity index 100% rename from libimagentrylist/src/listers/mod.rs rename to lib/entry/libimagentrylist/src/listers/mod.rs diff --git a/libimagentrylist/src/listers/path.rs b/lib/entry/libimagentrylist/src/listers/path.rs similarity index 100% rename from libimagentrylist/src/listers/path.rs rename to lib/entry/libimagentrylist/src/listers/path.rs diff --git a/libimagentrylist/src/listers/table.rs b/lib/entry/libimagentrylist/src/listers/table.rs similarity index 100% rename from libimagentrylist/src/listers/table.rs rename to lib/entry/libimagentrylist/src/listers/table.rs diff --git a/libimagentrylist/src/result.rs b/lib/entry/libimagentrylist/src/result.rs similarity index 100% rename from libimagentrylist/src/result.rs rename to lib/entry/libimagentrylist/src/result.rs diff --git a/libimagentrymarkdown/Cargo.toml b/lib/entry/libimagentrymarkdown/Cargo.toml similarity index 77% rename from libimagentrymarkdown/Cargo.toml rename to lib/entry/libimagentrymarkdown/Cargo.toml index 4014d86c..5951f36a 100644 --- a/libimagentrymarkdown/Cargo.toml +++ b/lib/entry/libimagentrymarkdown/Cargo.toml @@ -19,6 +19,6 @@ hoedown = "5.0.0" crossbeam = "0.2" url = "1.2" -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } diff --git a/lib/entry/libimagentrymarkdown/README.md b/lib/entry/libimagentrymarkdown/README.md new file mode 120000 index 00000000..c4bb4365 --- /dev/null +++ b/lib/entry/libimagentrymarkdown/README.md @@ -0,0 +1 @@ +../../../doc/src/05100-lib-entrymarkdown.md \ No newline at end of file diff --git a/libimagentrymarkdown/src/error.rs b/lib/entry/libimagentrymarkdown/src/error.rs similarity index 100% rename from libimagentrymarkdown/src/error.rs rename to lib/entry/libimagentrymarkdown/src/error.rs diff --git a/libimagentrymarkdown/src/html.rs b/lib/entry/libimagentrymarkdown/src/html.rs similarity index 100% rename from libimagentrymarkdown/src/html.rs rename to lib/entry/libimagentrymarkdown/src/html.rs diff --git a/libimagentrymarkdown/src/lib.rs b/lib/entry/libimagentrymarkdown/src/lib.rs similarity index 100% rename from libimagentrymarkdown/src/lib.rs rename to lib/entry/libimagentrymarkdown/src/lib.rs diff --git a/libimagentrymarkdown/src/link.rs b/lib/entry/libimagentrymarkdown/src/link.rs similarity index 100% rename from libimagentrymarkdown/src/link.rs rename to lib/entry/libimagentrymarkdown/src/link.rs diff --git a/libimagentrymarkdown/src/result.rs b/lib/entry/libimagentrymarkdown/src/result.rs similarity index 100% rename from libimagentrymarkdown/src/result.rs rename to lib/entry/libimagentrymarkdown/src/result.rs diff --git a/libimagref/Cargo.toml b/lib/entry/libimagentryref/Cargo.toml similarity index 61% rename from libimagref/Cargo.toml rename to lib/entry/libimagentryref/Cargo.toml index 50472519..7b7763e8 100644 --- a/libimagref/Cargo.toml +++ b/lib/entry/libimagentryref/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "libimagref" +name = "libimagentryref" version = "0.4.0" authors = ["Matthias Beyer "] @@ -22,7 +22,7 @@ toml = "^0.4" version = "2.0.1" walkdir = "1.0.*" -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagutil = { version = "0.4.0", path = "../libimagutil" } -libimagentrylist = { version = "0.4.0", path = "../libimagentrylist" } +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagentrylist = { version = "0.4.0", path = "../../../lib/entry/libimagentrylist" } +libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } diff --git a/lib/entry/libimagentryref/README.md b/lib/entry/libimagentryref/README.md new file mode 120000 index 00000000..d31d299d --- /dev/null +++ b/lib/entry/libimagentryref/README.md @@ -0,0 +1 @@ +../../../doc/src/05100-lib-entryref.md \ No newline at end of file diff --git a/libimagref/src/error.rs b/lib/entry/libimagentryref/src/error.rs similarity index 100% rename from libimagref/src/error.rs rename to lib/entry/libimagentryref/src/error.rs diff --git a/libimagref/src/flags.rs b/lib/entry/libimagentryref/src/flags.rs similarity index 100% rename from libimagref/src/flags.rs rename to lib/entry/libimagentryref/src/flags.rs diff --git a/libimagref/src/hasher.rs b/lib/entry/libimagentryref/src/hasher.rs similarity index 100% rename from libimagref/src/hasher.rs rename to lib/entry/libimagentryref/src/hasher.rs diff --git a/libimagref/src/hashers/mod.rs b/lib/entry/libimagentryref/src/hashers/mod.rs similarity index 100% rename from libimagref/src/hashers/mod.rs rename to lib/entry/libimagentryref/src/hashers/mod.rs diff --git a/libimagref/src/hashers/nbytes.rs b/lib/entry/libimagentryref/src/hashers/nbytes.rs similarity index 100% rename from libimagref/src/hashers/nbytes.rs rename to lib/entry/libimagentryref/src/hashers/nbytes.rs diff --git a/libimagref/src/lib.rs b/lib/entry/libimagentryref/src/lib.rs similarity index 100% rename from libimagref/src/lib.rs rename to lib/entry/libimagentryref/src/lib.rs diff --git a/libimagref/src/lister.rs b/lib/entry/libimagentryref/src/lister.rs similarity index 100% rename from libimagref/src/lister.rs rename to lib/entry/libimagentryref/src/lister.rs diff --git a/libimagref/src/reference.rs b/lib/entry/libimagentryref/src/reference.rs similarity index 100% rename from libimagref/src/reference.rs rename to lib/entry/libimagentryref/src/reference.rs diff --git a/libimagref/src/result.rs b/lib/entry/libimagentryref/src/result.rs similarity index 100% rename from libimagref/src/result.rs rename to lib/entry/libimagentryref/src/result.rs diff --git a/libimagentrytag/Cargo.toml b/lib/entry/libimagentrytag/Cargo.toml similarity index 71% rename from libimagentrytag/Cargo.toml rename to lib/entry/libimagentrytag/Cargo.toml index 1c2cd472..a58b33d0 100644 --- a/libimagentrytag/Cargo.toml +++ b/lib/entry/libimagentrytag/Cargo.toml @@ -22,6 +22,6 @@ itertools = "0.5" is-match = "0.1" filters = "0.1" -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagutil = { version = "0.4.0", path = "../libimagutil" } +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } diff --git a/lib/entry/libimagentrytag/README.md b/lib/entry/libimagentrytag/README.md new file mode 120000 index 00000000..3abc60f6 --- /dev/null +++ b/lib/entry/libimagentrytag/README.md @@ -0,0 +1 @@ +../../../doc/src/05100-lib-entrytag.md \ No newline at end of file diff --git a/libimagentrytag/src/error.rs b/lib/entry/libimagentrytag/src/error.rs similarity index 100% rename from libimagentrytag/src/error.rs rename to lib/entry/libimagentrytag/src/error.rs diff --git a/libimagentrytag/src/exec.rs b/lib/entry/libimagentrytag/src/exec.rs similarity index 100% rename from libimagentrytag/src/exec.rs rename to lib/entry/libimagentrytag/src/exec.rs diff --git a/libimagentrytag/src/lib.rs b/lib/entry/libimagentrytag/src/lib.rs similarity index 100% rename from libimagentrytag/src/lib.rs rename to lib/entry/libimagentrytag/src/lib.rs diff --git a/libimagentrytag/src/result.rs b/lib/entry/libimagentrytag/src/result.rs similarity index 100% rename from libimagentrytag/src/result.rs rename to lib/entry/libimagentrytag/src/result.rs diff --git a/libimagentrytag/src/tag.rs b/lib/entry/libimagentrytag/src/tag.rs similarity index 100% rename from libimagentrytag/src/tag.rs rename to lib/entry/libimagentrytag/src/tag.rs diff --git a/libimagentrytag/src/tagable.rs b/lib/entry/libimagentrytag/src/tagable.rs similarity index 100% rename from libimagentrytag/src/tagable.rs rename to lib/entry/libimagentrytag/src/tagable.rs diff --git a/libimagentrytag/src/ui.rs b/lib/entry/libimagentrytag/src/ui.rs similarity index 100% rename from libimagentrytag/src/ui.rs rename to lib/entry/libimagentrytag/src/ui.rs diff --git a/libimagentryview/Cargo.toml b/lib/entry/libimagentryview/Cargo.toml similarity index 61% rename from libimagentryview/Cargo.toml rename to lib/entry/libimagentryview/Cargo.toml index 410d1cd7..201215b6 100644 --- a/libimagentryview/Cargo.toml +++ b/lib/entry/libimagentryview/Cargo.toml @@ -18,7 +18,7 @@ log = "0.3" toml = "^0.4" glob = "0.2" -libimagrt = { version = "0.4.0", path = "../libimagrt" } -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagentryedit = { version = "0.4.0", path = "../libimagentryedit" } +libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagentryedit = { version = "0.4.0", path = "../../../lib/entry/libimagentryedit" } diff --git a/lib/entry/libimagentryview/README.md b/lib/entry/libimagentryview/README.md new file mode 120000 index 00000000..d24f3271 --- /dev/null +++ b/lib/entry/libimagentryview/README.md @@ -0,0 +1 @@ +../../../doc/src/05100-lib-entryview.md \ No newline at end of file diff --git a/libimagentryview/src/builtin/editor.rs b/lib/entry/libimagentryview/src/builtin/editor.rs similarity index 100% rename from libimagentryview/src/builtin/editor.rs rename to lib/entry/libimagentryview/src/builtin/editor.rs diff --git a/libimagentryview/src/builtin/mod.rs b/lib/entry/libimagentryview/src/builtin/mod.rs similarity index 100% rename from libimagentryview/src/builtin/mod.rs rename to lib/entry/libimagentryview/src/builtin/mod.rs diff --git a/libimagentryview/src/builtin/plain.rs b/lib/entry/libimagentryview/src/builtin/plain.rs similarity index 100% rename from libimagentryview/src/builtin/plain.rs rename to lib/entry/libimagentryview/src/builtin/plain.rs diff --git a/libimagentryview/src/builtin/stdout.rs b/lib/entry/libimagentryview/src/builtin/stdout.rs similarity index 100% rename from libimagentryview/src/builtin/stdout.rs rename to lib/entry/libimagentryview/src/builtin/stdout.rs diff --git a/libimagentryview/src/error.rs b/lib/entry/libimagentryview/src/error.rs similarity index 100% rename from libimagentryview/src/error.rs rename to lib/entry/libimagentryview/src/error.rs diff --git a/libimagentryview/src/lib.rs b/lib/entry/libimagentryview/src/lib.rs similarity index 100% rename from libimagentryview/src/lib.rs rename to lib/entry/libimagentryview/src/lib.rs diff --git a/libimagentryview/src/result.rs b/lib/entry/libimagentryview/src/result.rs similarity index 100% rename from libimagentryview/src/result.rs rename to lib/entry/libimagentryview/src/result.rs diff --git a/libimagentryview/src/viewer.rs b/lib/entry/libimagentryview/src/viewer.rs similarity index 100% rename from libimagentryview/src/viewer.rs rename to lib/entry/libimagentryview/src/viewer.rs diff --git a/libimaginteraction/Cargo.toml b/lib/etc/libimaginteraction/Cargo.toml similarity index 65% rename from libimaginteraction/Cargo.toml rename to lib/etc/libimaginteraction/Cargo.toml index 150f8eb1..6ed38c94 100644 --- a/libimaginteraction/Cargo.toml +++ b/lib/etc/libimaginteraction/Cargo.toml @@ -24,7 +24,7 @@ toml = "^0.4" spinner = "0.4" rustyline = "1.0" -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagentryfilter = { version = "0.4.0", path = "../libimagentryfilter" } -libimagutil = { version = "0.4.0", path = "../libimagutil" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } +libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } +libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } +libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } +libimagentryfilter = { version = "0.4.0", path = "../../../lib/entry/libimagentryfilter" } diff --git a/libimaginteraction/README.md b/lib/etc/libimaginteraction/README.md similarity index 100% rename from libimaginteraction/README.md rename to lib/etc/libimaginteraction/README.md diff --git a/libimaginteraction/src/ask.rs b/lib/etc/libimaginteraction/src/ask.rs similarity index 100% rename from libimaginteraction/src/ask.rs rename to lib/etc/libimaginteraction/src/ask.rs diff --git a/libimaginteraction/src/error.rs b/lib/etc/libimaginteraction/src/error.rs similarity index 100% rename from libimaginteraction/src/error.rs rename to lib/etc/libimaginteraction/src/error.rs diff --git a/libimaginteraction/src/filter.rs b/lib/etc/libimaginteraction/src/filter.rs similarity index 100% rename from libimaginteraction/src/filter.rs rename to lib/etc/libimaginteraction/src/filter.rs diff --git a/libimaginteraction/src/lib.rs b/lib/etc/libimaginteraction/src/lib.rs similarity index 100% rename from libimaginteraction/src/lib.rs rename to lib/etc/libimaginteraction/src/lib.rs diff --git a/libimaginteraction/src/readline.rs b/lib/etc/libimaginteraction/src/readline.rs similarity index 100% rename from libimaginteraction/src/readline.rs rename to lib/etc/libimaginteraction/src/readline.rs diff --git a/libimaginteraction/src/result.rs b/lib/etc/libimaginteraction/src/result.rs similarity index 100% rename from libimaginteraction/src/result.rs rename to lib/etc/libimaginteraction/src/result.rs diff --git a/libimaginteraction/src/ui.rs b/lib/etc/libimaginteraction/src/ui.rs similarity index 100% rename from libimaginteraction/src/ui.rs rename to lib/etc/libimaginteraction/src/ui.rs diff --git a/libimagtimeui/Cargo.toml b/lib/etc/libimagtimeui/Cargo.toml similarity index 100% rename from libimagtimeui/Cargo.toml rename to lib/etc/libimagtimeui/Cargo.toml diff --git a/libimagtimeui/src/cli.rs b/lib/etc/libimagtimeui/src/cli.rs similarity index 100% rename from libimagtimeui/src/cli.rs rename to lib/etc/libimagtimeui/src/cli.rs diff --git a/libimagtimeui/src/date.rs b/lib/etc/libimagtimeui/src/date.rs similarity index 100% rename from libimagtimeui/src/date.rs rename to lib/etc/libimagtimeui/src/date.rs diff --git a/libimagtimeui/src/datetime.rs b/lib/etc/libimagtimeui/src/datetime.rs similarity index 100% rename from libimagtimeui/src/datetime.rs rename to lib/etc/libimagtimeui/src/datetime.rs diff --git a/libimagtimeui/src/lib.rs b/lib/etc/libimagtimeui/src/lib.rs similarity index 100% rename from libimagtimeui/src/lib.rs rename to lib/etc/libimagtimeui/src/lib.rs diff --git a/libimagtimeui/src/parse.rs b/lib/etc/libimagtimeui/src/parse.rs similarity index 100% rename from libimagtimeui/src/parse.rs rename to lib/etc/libimagtimeui/src/parse.rs diff --git a/libimagtimeui/src/time.rs b/lib/etc/libimagtimeui/src/time.rs similarity index 100% rename from libimagtimeui/src/time.rs rename to lib/etc/libimagtimeui/src/time.rs diff --git a/libimagtimeui/src/ui.rs b/lib/etc/libimagtimeui/src/ui.rs similarity index 100% rename from libimagtimeui/src/ui.rs rename to lib/etc/libimagtimeui/src/ui.rs diff --git a/libimagutil/.gitignore b/lib/etc/libimagutil/.gitignore similarity index 100% rename from libimagutil/.gitignore rename to lib/etc/libimagutil/.gitignore diff --git a/libimagutil/Cargo.toml b/lib/etc/libimagutil/Cargo.toml similarity index 100% rename from libimagutil/Cargo.toml rename to lib/etc/libimagutil/Cargo.toml diff --git a/libimagutil/README.md b/lib/etc/libimagutil/README.md similarity index 100% rename from libimagutil/README.md rename to lib/etc/libimagutil/README.md diff --git a/libimagutil/src/cli_validators.rs b/lib/etc/libimagutil/src/cli_validators.rs similarity index 100% rename from libimagutil/src/cli_validators.rs rename to lib/etc/libimagutil/src/cli_validators.rs diff --git a/libimagutil/src/debug_result.rs b/lib/etc/libimagutil/src/debug_result.rs similarity index 100% rename from libimagutil/src/debug_result.rs rename to lib/etc/libimagutil/src/debug_result.rs diff --git a/libimagutil/src/edit.rs b/lib/etc/libimagutil/src/edit.rs similarity index 100% rename from libimagutil/src/edit.rs rename to lib/etc/libimagutil/src/edit.rs diff --git a/libimagutil/src/info_result.rs b/lib/etc/libimagutil/src/info_result.rs similarity index 100% rename from libimagutil/src/info_result.rs rename to lib/etc/libimagutil/src/info_result.rs diff --git a/libimagutil/src/iter.rs b/lib/etc/libimagutil/src/iter.rs similarity index 100% rename from libimagutil/src/iter.rs rename to lib/etc/libimagutil/src/iter.rs diff --git a/libimagutil/src/key_value_split.rs b/lib/etc/libimagutil/src/key_value_split.rs similarity index 100% rename from libimagutil/src/key_value_split.rs rename to lib/etc/libimagutil/src/key_value_split.rs diff --git a/libimagutil/src/lib.rs b/lib/etc/libimagutil/src/lib.rs similarity index 100% rename from libimagutil/src/lib.rs rename to lib/etc/libimagutil/src/lib.rs diff --git a/libimagutil/src/log_result.rs b/lib/etc/libimagutil/src/log_result.rs similarity index 100% rename from libimagutil/src/log_result.rs rename to lib/etc/libimagutil/src/log_result.rs diff --git a/libimagutil/src/testing.rs b/lib/etc/libimagutil/src/testing.rs similarity index 100% rename from libimagutil/src/testing.rs rename to lib/etc/libimagutil/src/testing.rs diff --git a/libimagutil/src/variants.rs b/lib/etc/libimagutil/src/variants.rs similarity index 100% rename from libimagutil/src/variants.rs rename to lib/etc/libimagutil/src/variants.rs diff --git a/libimagutil/src/warn_exit.rs b/lib/etc/libimagutil/src/warn_exit.rs similarity index 100% rename from libimagutil/src/warn_exit.rs rename to lib/etc/libimagutil/src/warn_exit.rs diff --git a/libimagutil/src/warn_result.rs b/lib/etc/libimagutil/src/warn_result.rs similarity index 100% rename from libimagutil/src/warn_result.rs rename to lib/etc/libimagutil/src/warn_result.rs diff --git a/libimagannotation/Cargo.toml b/libimagannotation/Cargo.toml deleted file mode 100644 index f4e3a659..00000000 --- a/libimagannotation/Cargo.toml +++ /dev/null @@ -1,21 +0,0 @@ -[package] -name = "libimagannotation" -version = "0.4.0" -authors = ["Matthias Beyer "] - -description = "Library for the imag core distribution" - -keywords = ["imag", "PIM", "personal", "information", "management"] -readme = "../README.md" -license = "LGPL-2.1" - -[dependencies] -uuid = { version = "0.3.1", features = ["v4"] } -lazy_static = "0.1.15" -toml = "^0.4" - -libimagstore = { version = "0.4.0", path = "../libimagstore" } -libimagnotes = { version = "0.4.0", path = "../libimagnotes" } -libimagerror = { version = "0.4.0", path = "../libimagerror" } -libimagentrylink = { version = "0.4.0", path = "../libimagentrylink" } -libimagutil = { version = "0.4.0", path = "../libimagutil" } diff --git a/libimagannotation/README.md b/libimagannotation/README.md deleted file mode 120000 index 5c4afa4a..00000000 --- a/libimagannotation/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/05100-lib-annotation.md \ No newline at end of file diff --git a/libimagbookmark/README.md b/libimagbookmark/README.md deleted file mode 120000 index f7c5cd05..00000000 --- a/libimagbookmark/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/05100-lib-bookmark.md \ No newline at end of file diff --git a/libimagcounter/README.md b/libimagcounter/README.md deleted file mode 120000 index 90221b8a..00000000 --- a/libimagcounter/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/05100-lib-counter.md \ No newline at end of file diff --git a/libimagdiary/README.md b/libimagdiary/README.md deleted file mode 120000 index 50c0ff34..00000000 --- a/libimagdiary/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/05100-lib-diary.md \ No newline at end of file diff --git a/libimagentryfilter/README.md b/libimagentryfilter/README.md deleted file mode 120000 index 505ed66f..00000000 --- a/libimagentryfilter/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/05100-lib-entryfilter.md \ No newline at end of file diff --git a/libimagentrylink/README.md b/libimagentrylink/README.md deleted file mode 120000 index d30d8ab6..00000000 --- a/libimagentrylink/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/05100-lib-entrylink.md \ No newline at end of file diff --git a/libimagentrylist/README.md b/libimagentrylist/README.md deleted file mode 120000 index 7fd3298b..00000000 --- a/libimagentrylist/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/05100-lib-entrylist.md \ No newline at end of file diff --git a/libimagentrymarkdown/README.md b/libimagentrymarkdown/README.md deleted file mode 120000 index 617d7006..00000000 --- a/libimagentrymarkdown/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/05100-lib-entrymarkdown.md \ No newline at end of file diff --git a/libimagentrytag/README.md b/libimagentrytag/README.md deleted file mode 120000 index bb2c4ed4..00000000 --- a/libimagentrytag/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/05100-lib-entrytag.md \ No newline at end of file diff --git a/libimagentrytimetrack/README.md b/libimagentrytimetrack/README.md deleted file mode 120000 index 1a80613d..00000000 --- a/libimagentrytimetrack/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/05100-lib-timetrack.md \ No newline at end of file diff --git a/libimagerror/README.md b/libimagerror/README.md deleted file mode 120000 index 359a1ec1..00000000 --- a/libimagerror/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/05100-lib-error.md \ No newline at end of file diff --git a/libimagmail/README.md b/libimagmail/README.md deleted file mode 120000 index d5d8fb01..00000000 --- a/libimagmail/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/04020-module-mails.md \ No newline at end of file diff --git a/libimagref/README.md b/libimagref/README.md deleted file mode 120000 index a2b1195d..00000000 --- a/libimagref/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/05100-lib-ref.md \ No newline at end of file diff --git a/libimagrt/README.md b/libimagrt/README.md deleted file mode 120000 index 0fbc1f22..00000000 --- a/libimagrt/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/05100-lib-rt.md \ No newline at end of file diff --git a/libimagstore/README.md b/libimagstore/README.md deleted file mode 120000 index ccb62530..00000000 --- a/libimagstore/README.md +++ /dev/null @@ -1 +0,0 @@ -../doc/src/05100-lib-store.md \ No newline at end of file