Merge branch 'minor' into master

This commit is contained in:
Matthias Beyer 2019-04-27 02:00:49 +02:00
commit 989624cc5e
5 changed files with 19 additions and 14 deletions

View file

@ -6,15 +6,6 @@
but we do not consider anything stable or usable at this moment. Feel free to but we do not consider anything stable or usable at this moment. Feel free to
play around anyways.** play around anyways.**
## Vacation notice
**Notice:** I, the author of imag, will be on vacation from mid-May 2018 until
early 2019. I hope I can continue develop imag during that time, but I cannot
guarantee that. I hope I can continue development of imag after that and I
certainly plan to do so.
But from May 2018 until February 2019, expect long response times.
## Goal / What is imag? ## Goal / What is imag?

View file

@ -120,6 +120,7 @@ fn main() {
fn list(rt: &Runtime) { fn list(rt: &Runtime) {
let scmd = rt.cli().subcommand_matches("list").unwrap(); let scmd = rt.cli().subcommand_matches("list").unwrap();
let list_format = get_contact_print_format("contact.list_format", rt, &scmd); let list_format = get_contact_print_format("contact.list_format", rt, &scmd);
debug!("List format: {:?}", list_format);
let iterator = rt let iterator = rt
.store() .store()
@ -138,6 +139,7 @@ fn list(rt: &Runtime) {
.enumerate(); .enumerate();
if scmd.is_present("json") { if scmd.is_present("json") {
debug!("Listing as JSON");
let v : Vec<DeserVcard> = iterator.map(|tpl| tpl.1).collect(); let v : Vec<DeserVcard> = iterator.map(|tpl| tpl.1).collect();
match ::serde_json::to_string(&v) { match ::serde_json::to_string(&v) {
@ -148,6 +150,7 @@ fn list(rt: &Runtime) {
} }
} }
} else { } else {
debug!("Not listing as JSON");
let output = rt.stdout(); let output = rt.stdout();
let mut output = output.lock(); let mut output = output.lock();
iterator iterator

View file

@ -63,12 +63,8 @@ think hard whether this is really necessary.
### Library error types/kinds ### Library error types/kinds
Libraries must use "error-chain" to create error types and kinds. Libraries must use "failure" to create error objects.
Most likely, a library needs some kinds for wrapping the errors from underlying
libraries, such as the store itself.
A library must _never_ introduce multiple error types, but is free to introduce
as many error kinds as required.
### Libraries with commandline frontends ### Libraries with commandline frontends

View file

@ -14,6 +14,20 @@ the changelog (though updating of dependencies is).
Please note that we do not have a "Breaking changes" section as we are in Please note that we do not have a "Breaking changes" section as we are in
Version 0.y.z and thus we can break the API like we want and need to. Version 0.y.z and thus we can break the API like we want and need to.
## 0.9.1
Bugfix release for fixing:
* Fix off by one error in error tracing
* Fix negation error in imag-habit filtering mechanism
* Fix config override mechanism
* "status" subcommand might not be present in imag-habit, but standard command
should work anyways
* We go to the next month, not to the current one (off by one error)
* 'start-time' cannot be None in imag-timetrack, clap ensures that
* Do not use deprecated StoreId::exists() function in libimagentrycategory
## 0.9.0 ## 0.9.0
* [f912d3e7f3](https://git.imag-pim.org/imag/commit/?id=f912d3e7f362e524347cd061f316d3569dfb18a0) * [f912d3e7f3](https://git.imag-pim.org/imag/commit/?id=f912d3e7f362e524347cd061f316d3569dfb18a0)

View file

@ -70,6 +70,7 @@ progressticker_chars = "|/-\\-/-\\"
# #
[imag.aliases] [imag.aliases]
store = [ "s", "st" ] store = [ "s", "st" ]
notes = [ "note" ] # imag-notes really should be imag-note
[imag.logging] [imag.logging]
level = "debug" level = "debug"