Commit graph

4560 commits

Author SHA1 Message Date
41374fb620 Add more helpers for handlebars 2017-10-14 11:02:30 +02:00
704c01b2c9 Merge pull request #1130 from matthiasbeyer/imag-annotate/init
Imag annotate/init
2017-10-13 16:20:57 +02:00
9357019551 Merge pull request #1138 from matthiasbeyer/libimagstore/entries-do-not-yield-dirs
Fix Store::entries() to not yield directories
2017-10-13 15:31:17 +02:00
60f2a34074 Add debug output 2017-10-13 14:53:57 +02:00
797b764027 Fix: Return annotation object when found
Before we did not return the annotation object after unlinking it. This
patch fixes this.
2017-10-13 14:53:57 +02:00
1d270ee1cf Add changelog entry 2017-10-13 14:53:57 +02:00
da013d65dc Initial import for imag-annotate 2017-10-13 14:53:57 +02:00
b83367f383 Merge pull request #1137 from matthiasbeyer/logging-modifications
Alter default configuration
2017-10-13 14:50:37 +02:00
23f4d7948f Fix Store::entries() to not yield directories
Before the iterator did also yield storeids for directories, which was a
bug.

This change introduces a new if_file() function in the store-internal
backend, which is needed to check whether a path actually points to a
File, be it inmemory or on the real filesystem.

That's because tests might fail if they check via PathBuf::is_file() as
in tests, the entries only exist inmemory.
2017-10-13 14:26:06 +02:00
7d933725d6 Alter default configuration
Explain how the module logging destinations work, remove the specified
logging destination, because the global log definition already logs to
stderr.

libimagstore logs with trace now, also to a logfile in /tmp/
2017-10-13 14:04:19 +02:00
a24baca779 Merge pull request #1129 from matthiasbeyer/libimagentryannotation/not-based-on-libimagnotes
Libimagentryannotation/not based on libimagnotes
2017-10-12 23:47:15 +02:00
dde343965a Merge pull request #1133 from matthiasbeyer/update-error-chain
Update dependency: error-chain: 0.10 -> 0.11
2017-10-12 23:46:56 +02:00
d4633d466e Add changelog entry 2017-10-12 22:15:13 +02:00
7978e71bde Rewrite API 2017-10-12 22:15:13 +02:00
ec855fefc7 Remove dependency on libimagnotes 2017-10-12 22:15:13 +02:00
758166637b Update toml-query: 0.3.* -> 0.4
This update is needed for the error-chain update, as the toml-query
0.4.0 release also bumps this dependency.
2017-10-12 22:13:04 +02:00
663242db7e Update dependency: error-chain: 0.10 -> 0.11 2017-10-12 22:12:27 +02:00
3ed9c1fcc8 Merge pull request #1131 from matthiasbeyer/libimagerror/trace-and-unwrap-helper
Add helper for tracing error and exit or unwrap the value
2017-10-12 22:08:48 +02:00
0a3f7d9e49 Merge pull request #1135 from matthiasbeyer/update-deps
Update deps
2017-10-12 21:39:56 +02:00
edf2378404 Merge pull request #1134 from matthiasbeyer/travis-update-rustc
travis: rustc 1.17/1.18 -> 1.19/1.20
2017-10-12 21:11:25 +02:00
815cde76d0 Rewrite .map_err_trace_exit().unwrap() with new helper fn 2017-10-12 20:15:46 +02:00
013e82f04f Update dependency: filters: 0.1 -> 0.2 2017-10-12 19:48:01 +02:00
67a127f700 Update dependency: itertools: 0.6 -> 0.7 2017-10-12 19:45:50 +02:00
bb26d1c895 Update dependency: ansi_term: 0.9 -> 0.10 2017-10-12 19:44:33 +02:00
9111692276 travis: rustc 1.17/1.18 -> 1.19/1.20
We want to be able to compile imag with the latest compiler, but also
two compilers before the current one.

So Update the travis spec to include rustc 1.19 and 1.20, but not 1.17
and 1.18 anymore.
2017-10-12 19:36:28 +02:00
9871a8bc0a Merge pull request #1128 from matthiasbeyer/libimaginteraction/format-helpers
Move handlebars custom helpers to libimaginteraction
2017-10-12 19:16:13 +02:00
eb4681bf65 Add helper for tracing error and exit or unwrap the value 2017-10-12 19:02:37 +02:00
d044e7a928 Add helper functions to register all helpers 2017-10-12 18:46:58 +02:00
eb07bce1d0 Move handlebars custom helpers to libimaginteraction 2017-10-12 18:46:58 +02:00
ac704cab76 Merge pull request #1126 from asuivelentine/imag-store/id-dump
Dump all StoreIds
2017-10-09 15:10:59 +02:00
Kai Sickeler
1f84643486 Dump all StoreIds
Add StoreId Dump changes
2017-10-09 12:18:27 +02:00
75a8041c0e Merge pull request #1127 from matthiasbeyer/libimagrt/logging-to-file
Add multi-destination logging to logger
2017-10-08 19:00:07 +02:00
f266791142 Add multi-destination logging to logger
The logger was not able to handle multiple destinations before. Now it
is possible for the logger.

The file must be held behind an Arc<Mutex<_>> so we can use the logging
from multiple threads but also because we need to borrow mutably, so
that bit changes whith this commit.
2017-10-08 18:08:51 +02:00
e5155cacca Merge pull request #1125 from matthiasbeyer/imag-view/cli-rewrite
Imag view/cli rewrite
2017-10-08 16:42:30 +02:00
9dcb323c45 Add example configuration for imag-view 2017-10-08 15:08:27 +02:00
969211174a Rewrite imag-view
The imag-view command was redesigned with this change. It now looks up
view-templates in the config and calls them with the "in" subcommand.

This way, an entry can be viewed with editor, browser or whatever one
likes.

Compiling markdown is not supported yet.
2017-10-08 15:08:27 +02:00
d26e8b62ac Merge pull request #1124 from matthiasbeyer/imag-view/positional-args
Use positional argument for id
2017-10-08 15:07:48 +02:00
d9add138d2 Use positional argument for id 2017-10-08 13:02:56 +02:00
19b5b53b2a Merge pull request #1121 from matthiasbeyer/imag-mv
Initial import of imag-mv
2017-10-01 12:11:30 +02:00
c5ad59e96f Initial import of imag-mv 2017-10-01 10:07:29 +02:00
389f24d51f Merge pull request #1123 from matthiasbeyer/libimagstore/fix-move
libimagstore: fix move
2017-10-01 10:06:08 +02:00
b587bbbdc1 Fix: Create directory before renaming file 2017-10-01 01:59:41 +02:00
24210c0068 Add some debug output 2017-10-01 01:59:13 +02:00
ecc8cc4567 Merge pull request #1120 from matthiasbeyer/remove-foldresult
Remove FoldResult
2017-09-30 11:21:09 +02:00
169107d569 Remove FoldResult 2017-09-30 10:45:10 +02:00
d8055b4553 Merge pull request #1118 from matthiasbeyer/remove-imag-counter
Remove libimagcounter / imag-counter
2017-09-29 09:20:59 +02:00
1d16e67857 Merge pull request #1119 from matthiasbeyer/cleanup-travis
Cleanup travis
2017-09-29 09:20:51 +02:00
8933648657 Remove apt addons which are not needed anymore 2017-09-28 22:46:34 +02:00
521415cc12 Remove 'tree' dependency 2017-09-28 22:43:40 +02:00
b2aab2cf54 Remove unneeded deps 2017-09-28 22:43:15 +02:00