diff options
56 files changed, 77 insertions, 56 deletions
diff --git a/bin/core/imag-annotate/Cargo.toml b/bin/core/imag-annotate/Cargo.toml index 198cff5a..b3e48753 100644 --- a/bin/core/imag-annotate/Cargo.toml +++ b/bin/core/imag-annotate/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/bin/core/imag-diagnostics/Cargo.toml b/bin/core/imag-diagnostics/Cargo.toml index f017e40b..fc4230ab 100644 --- a/bin/core/imag-diagnostics/Cargo.toml +++ b/bin/core/imag-diagnostics/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/bin/core/imag-edit/Cargo.toml b/bin/core/imag-edit/Cargo.toml index bd62093e..bccd113b 100644 --- a/bin/core/imag-edit/Cargo.toml +++ b/bin/core/imag-edit/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" @@ -25,7 +25,7 @@ maintenance = { status = "actively-developed" } log = "0.3" version = "2.0.1" toml = "0.4" -toml-query = "0.4" +toml-query = "0.6" libimagstore = { version = "0.7.0", path = "../../../lib/core/libimagstore" } libimagrt = { version = "0.7.0", path = "../../../lib/core/libimagrt" } diff --git a/bin/core/imag-gps/Cargo.toml b/bin/core/imag-gps/Cargo.toml index bc0697f8..96b72ae0 100644 --- a/bin/core/imag-gps/Cargo.toml +++ b/bin/core/imag-gps/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/bin/core/imag-grep/Cargo.toml b/bin/core/imag-grep/Cargo.toml index 47bb98c8..13d215bb 100644 --- a/bin/core/imag-grep/Cargo.toml +++ b/bin/core/imag-grep/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/bin/core/imag-ids/Cargo.toml b/bin/core/imag-ids/Cargo.toml index 519e7088..68ea7cb4 100644 --- a/bin/core/imag-ids/Cargo.toml +++ b/bin/core/imag-ids/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/bin/core/imag-init/Cargo.toml b/bin/core/imag-init/Cargo.toml index 9424adf6..a17b480e 100644 --- a/bin/core/imag-init/Cargo.toml +++ b/bin/core/imag-init/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/bin/core/imag-link/Cargo.toml b/bin/core/imag-link/Cargo.toml index ba7d5afd..5bec1e9d 100644 --- a/bin/core/imag-link/Cargo.toml +++ b/bin/core/imag-link/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/bin/core/imag-mv/Cargo.toml b/bin/core/imag-mv/Cargo.toml index 6057217f..19e0913e 100644 --- a/bin/core/imag-mv/Cargo.toml +++ b/bin/core/imag-mv/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/bin/core/imag-ref/Cargo.toml b/bin/core/imag-ref/Cargo.toml index d5d5ff15..56f4d7d2 100644 --- a/bin/core/imag-ref/Cargo.toml +++ b/bin/core/imag-ref/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/bin/core/imag-store/Cargo.toml b/bin/core/imag-store/Cargo.toml index 1ccc88d1..21e0831e 100644 --- a/bin/core/imag-store/Cargo.toml +++ b/bin/core/imag-store/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/bin/core/imag-tag/Cargo.toml b/bin/core/imag-tag/Cargo.toml index 1c2c407d..bccc0b7f 100644 --- a/bin/core/imag-tag/Cargo.toml +++ b/bin/core/imag-tag/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/bin/core/imag-view/Cargo.toml b/bin/core/imag-view/Cargo.toml index 686ad569..861a6f50 100644 --- a/bin/core/imag-view/Cargo.toml +++ b/bin/core/imag-view/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/bin/core/imag/Cargo.toml b/bin/core/imag/Cargo.toml index b8c4f8b7..216a2c14 100644 --- a/bin/core/imag/Cargo.toml +++ b/bin/core/imag/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/bin/core/imag/src/main.rs b/bin/core/imag/src/main.rs index a847af08..27c82a75 100644 --- a/bin/core/imag/src/main.rs +++ b/bin/core/imag/src/main.rs @@ -96,7 +96,7 @@ fn help_text(cmds: Vec<String>) -> String { imag is free software. It is released under the terms of LGPLv2.1 - (c) 2016 Matthias Beyer and contributors"#, + (c) 2015-2018 Matthias Beyer and contributors"#, imagbins = cmds .into_iter() .map(|cmd| format!("\t{}\n", cmd)) diff --git a/bin/domain/imag-bookmark/Cargo.toml b/bin/domain/imag-bookmark/Cargo.toml index 4160a7b7..5a871692 100644 --- a/bin/domain/imag-bookmark/Cargo.toml +++ b/bin/domain/imag-bookmark/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/bin/domain/imag-contact/Cargo.toml b/bin/domain/imag-contact/Cargo.toml index fe9d4b16..a6033fb3 100644 --- a/bin/domain/imag-contact/Cargo.toml +++ b/bin/domain/imag-contact/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/bin/domain/imag-diary/Cargo.toml b/bin/domain/imag-diary/Cargo.toml index 5aa23e3c..3ff15cc1 100644 --- a/bin/domain/imag-diary/Cargo.toml +++ b/bin/domain/imag-diary/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/bin/domain/imag-habit/Cargo.toml b/bin/domain/imag-habit/Cargo.toml index 9c819248..ba5349b1 100644 --- a/bin/domain/imag-habit/Cargo.toml +++ b/bin/domain/imag-habit/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/bin/domain/imag-log/Cargo.toml b/bin/domain/imag-log/Cargo.toml index 7acd9468..f3c407db 100644 --- a/bin/domain/imag-log/Cargo.toml +++ b/bin/domain/imag-log/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/bin/domain/imag-mail/Cargo.toml b/bin/domain/imag-mail/Cargo.toml index 2962b89d..e818bd56 100644 --- a/bin/domain/imag-mail/Cargo.toml +++ b/bin/domain/imag-mail/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/bin/domain/imag-notes/Cargo.toml b/bin/domain/imag-notes/Cargo.toml index 22c11d1b..567a8ec3 100644 --- a/bin/domain/imag-notes/Cargo.toml +++ b/bin/domain/imag-notes/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/bin/domain/imag-timetrack/Cargo.toml b/bin/domain/imag-timetrack/Cargo.toml index 8bf3c9c3..7d365413 100644 --- a/bin/domain/imag-timetrack/Cargo.toml +++ b/bin/domain/imag-timetrack/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/bin/domain/imag-todo/Cargo.toml b/bin/domain/imag-todo/Cargo.toml index 32d73207..3db875ad 100644 --- a/bin/domain/imag-todo/Cargo.toml +++ b/bin/domain/imag-todo/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/doc/src/09020-changelog.md b/doc/src/09020-changelog.md index db922818..be26b39d 100644 --- a/doc/src/09020-changelog.md +++ b/doc/src/09020-changelog.md @@ -50,6 +50,9 @@ This section contains the changelog from the last release to the next release. subcommands: `Runtime::handle_unknown_subcommand()`. See docs for details. * `imag-link list` prints output in ascii-table now, use `--plain` to print as plain text. + * The build script automatically generates autocomplete scripts for bash, + fish and zsh now when compiling the `imag` command. + * `libimagwiki` and `imag-wiki` were introduced. * Minor changes * A license-checker was included into the CI setup, which checks whether all ".rs"-files have the license header at the top of the file @@ -76,6 +79,11 @@ This section contains the changelog from the last release to the next release. Filepath of found contacts. * `imag view` can now view multiple entries at once * `imag view -I` reads store ids from stdin now. + * `libimagstore` iterators have less restricting lifetimes now + * `libimagentrygrep` was introduced, a crate for seaching in the + header/content parts of an entry. + * `imag-ids` can now filter by collection + * All crates use "clap" with the "wrap_help" feature now. * Bugfixes * imag does not panic anymore when piping and breaking that pipe, for example like with `imag store ids | head -n 1`. @@ -104,6 +112,15 @@ This section contains the changelog from the last release to the next release. * `libimagstore::store::Store::create` overwrote existing entries. * `libimaghabit::habit::HabitTemplate` did not link new instances. * `imag-init` creates `~/.imag` but not `~/.imag/store`. + * `libimagrt` got a bugfix in the editor command setup where command + arguments were not processed correctly which could result in calling the + editor with an empty argument (`vim " "`). + * `imag-grep` did not count in all cases. + * `libimagdiary` sorts entries by date when viewing/listing them. + * A `libimagentryref` bug was fixed where the wrong variable was passed as + path to the referenced file, causing all tools based on this lib to break. + * `libimagrt` had a bug where the logging level was set to "Info" as soon as + "--verbose" was passed, but the value of "--verbose" was not even checked. ## 0.6.3 diff --git a/lib/core/libimagerror/Cargo.toml b/lib/core/libimagerror/Cargo.toml index c07d4858..3fc4022c 100644 --- a/lib/core/libimagerror/Cargo.toml +++ b/lib/core/libimagerror/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/lib/core/libimagrt/Cargo.toml b/lib/core/libimagrt/Cargo.toml index 74fc964c..3400f314 100644 --- a/lib/core/libimagrt/Cargo.toml +++ b/lib/core/libimagrt/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/lib/core/libimagstore/Cargo.toml b/lib/core/libimagstore/Cargo.toml index 60a63345..9e85eebc 100644 --- a/lib/core/libimagstore/Cargo.toml +++ b/lib/core/libimagstore/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/lib/core/libimagstore/src/storeid.rs b/lib/core/libimagstore/src/storeid.rs index 15348c04..b25f2441 100644 --- a/lib/core/libimagstore/src/storeid.rs +++ b/lib/core/libimagstore/src/storeid.rs @@ -74,8 +74,10 @@ impl StoreId { pub fn new_baseless(id: PathBuf) -> Result<StoreId> { debug!("Trying to get a new baseless id from: {:?}", id); if id.is_absolute() { + debug!("Error: Id is absolute!"); Err(SE::from_kind(SEK::StoreIdLocalPartAbsoluteError(id))) } else { + debug!("Building Storeid object baseless"); Ok(StoreId { base: None, id: id diff --git a/lib/domain/libimagbookmark/Cargo.toml b/lib/domain/libimagbookmark/Cargo.toml index 1a375893..53d7a228 100644 --- a/lib/domain/libimagbookmark/Cargo.toml +++ b/lib/domain/libimagbookmark/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" diff --git a/lib/domain/libimagcontact/Cargo.toml b/lib/domain/libimagcontact/Cargo.toml index 795d1e88..bccb3fba 100644 --- a/lib/domain/libimagcontact/Cargo.toml +++ b/lib/domain/libimagcontact/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["imag", "PIM", "personal", "information", "management"] readme = "../../../README.md" license = "LGPL-2.1" -documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html" +documentation = "https://imag-pim.org/doc/" repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } error-chain = "0.11" log = "0.3" toml = "0.4" -toml-query = "0.4" +toml-query = "0.6" vobject = "0.4" uuid = { version = "0.6", features = ["v4"] } serde = { version = "1", optional = true } diff --git a/lib/domain/libimagdiary/Cargo.toml b/lib/domain/libimagdiary/Cargo.toml index 1a07c17e..fe6da3b4 100644 --- a/lib/domain/libimagdiary/Cargo.toml +++ b/lib/domain/libimagdiary/Cargo.toml |