Merge pull request #1105 from matthiasbeyer/minor

Minor

doc/src/02000-store.md

@@ -71,11 +71,13 @@ An example for a file in the store follows.
 
 ---
 [imag]
-links = ["/home/user/more_kittens.mpeg"]
 version = "0.4.0"
 
 [note]
 name = "foo"
+
+[link]
+internal = ["some/other/imag/entry"]
 ---
 
 This is an example text, written by the user.

doc/src/09000-todos.md

@@ -12,8 +12,9 @@ First the modules which have been implemented in some way (not necessarily
 perfect or feature-complete):
 
 - [x] imag-bookmark - A bookmark manager for web browsing.
-- [x] imag-diary - A diary, or multiple.
 - [x] imag-counter - Counting things.
+- [x] imag-diary - A diary, or multiple.
+- [x] imag-grep - A utility for greping through content
 - [x] imag-link - Linking imag entries to eachother
 - [x] imag-notes - Note taking
 - [x] imag-ref - Refering to files outside the imag store.
@@ -89,16 +90,16 @@ Now the modules that are not yet started:
 ## Project structure and development
 
 - [ ] Move away from github
-  - [ ] Have own issue tracking (possibly git-dit)
-  - [ ] Find a solution to having no travis-ci via github anymore
+    - [ ] Have own issue tracking (possibly git-dit)
+    - [ ] Find a solution to having no travis-ci via github anymore
 
-  - [ ] Setup a viewer for the mailinglist archive
+    - [ ] Setup a viewer for the mailinglist archive
 - [ ] Add maintainer scripts to repository
-  - [ ] To check patches for Signed-off-by lines
-	- [ ] To automatically craft a reply to a contributor about a missing
-	  signed-off-by line
-	- [ ] To automatically craft a reply to a contributor about a patchset that
-	  cannot be applied
-  - [ ] To check pull requests for GPG signatures
-  - [ ] To apply a patchset in a new branch
+    - [ ] To check patches for Signed-off-by lines
+        - [ ] To automatically craft a reply to a contributor about a missing
+          signed-off-by line
+        - [ ] To automatically craft a reply to a contributor about a patchset that
+        cannot be applied
+    - [ ] To check pull requests for GPG signatures
+    - [ ] To apply a patchset in a new branch
 

imagrc.toml

@@ -39,11 +39,136 @@ destinations = [ "-" ]
 
 [imag.logging.format]
 trace = "[imag][{{red level}}][{{module_path}}]: {{message}}"
-debug = "[imag][{{cyan level}}]: {{message}}"
+debug = "[imag][{{cyan level}}][{{yellow target}}]: {{message}}"
 info  = "[imag]: {{message}}"
 warn  = "[imag][{{bold level}}]: {{yellow message}}"
 error = "[imag][{{red level}}]: {{red message}}"
 
+[imag.logging.modules.libimagutil]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimagtimeui]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimaginteraction]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimagstore]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimagrt]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimagerror]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimagbookmark]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimagnotes]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimagcounter]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimagdiary]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimagtimetrack]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimagtodo]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimagmail]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimagentryfilter]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimagentrycategory]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimagentryannotation]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimagentrylink]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimagentrytag]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimagentrygps]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimagentrylist]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimagentryedit]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimagentryref]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimagentryview]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimagentrymarkdown]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
+[imag.logging.modules.libimagentrydatetime]
+destinations = [ "-" ]
+level = "debug"
+enabled = true
+
 #
 # Configuration options for the user interface
 #

lib/entry/libimagentrygps/src/lib.rs

@@ -23,7 +23,7 @@ extern crate toml_query;
 #[macro_use] extern crate error_chain;
 
 extern crate libimagstore;
-#[macro_use] extern crate libimagerror;
+extern crate libimagerror;
 
 #[cfg(test)]
 extern crate env_logger;

lib/entry/libimagentrygps/src/types.rs

@@ -27,7 +27,6 @@ use toml::Value;
 use error::GPSErrorKind as GPSEK;
 use error::GPSError as GPSE;
 use error::Result;
-use error::ResultExt;
 
 pub trait FromValue : Sized {
     fn from_value(v: &Value) -> Result<Self>;