Commit Graph

197 Commits

Author SHA1 Message Date
Matthias Beyer e2bf6c48ef Merge pull request #1096 from matthiasbeyer/fix-log-output
Register the no-escape escape functionality in handlebars
2017-09-20 22:00:53 +02:00
Matthias Beyer 87ad85ab3d Merge pull request #1094 from matthiasbeyer/libimagdiary/is_in_diary
Base IsInDiary::is_in_diary() on StoreId::is_in_collection()
2017-09-20 22:00:41 +02:00
Matthias Beyer 9b2ceb31cc Merge pull request #1093 from matthiasbeyer/libimagentrylist/rip-out-cli-mod
libimagentrylist: Remove unused module
2017-09-20 22:00:34 +02:00
Matthias Beyer a73111458e Merge pull request #1091 from matthiasbeyer/libimagstore/toml-pretty
Serialize TOML pretty
2017-09-20 22:00:27 +02:00
Matthias Beyer b431d0ee49 Merge pull request #1092 from matthiasbeyer/minor
Minor things
2017-09-20 19:24:44 +02:00
Matthias Beyer de69d31a58 Register the no-escape escape functionality in handlebars
Before, handlebars automatically applied html escaping, which resulted
in <>'& beeing escaped. But we don't need to escape for terminal output.
2017-09-20 19:12:08 +02:00
Matthias Beyer da4d670cbc Base IsInDiary::is_in_diary() on StoreId::is_in_collection(), which is tested 2017-09-20 18:48:55 +02:00
Matthias Beyer 19c3bc829a Remove unused module 2017-09-20 18:41:54 +02:00
Matthias Beyer 79b6c26502 Serialize TOML pretty 2017-09-20 18:38:31 +02:00
Matthias Beyer c558addbd6 Add debug/trace output in Store 2017-09-20 12:05:44 +02:00
Matthias Beyer 5ce6cb2aa5 Switch from .set() to .insert() 2017-09-20 12:05:44 +02:00
Matthias Beyer 8ddb0f6c24 Do not use "imag" namespace in header
This change switches the header location for the tagging information
from "imag.tags" to "tag.values". "tags" is not used because non-tables
are not allowed at the top level of the header.

Tests are adapted.
2017-09-20 09:24:46 +02:00
Matthias Beyer 8904694b2a Remove plain-text default entry 2017-09-19 22:31:23 +02:00
Matthias Beyer 75bc1b0511 Fix README symlink 2017-09-19 18:34:56 +02:00
Matthias Beyer ec0c58d360 Fix README symlink 2017-09-19 18:32:34 +02:00
Matthias Beyer 162b36d6ee Update dependency specs
Most notably:

* env_logger: 0.4 -> 0.5
* hoedown: 5.0.0 -> 6.0.0
* itertools: 0.5 -> 0.6
* lazy_static: 0.1.15 -> 0.2
* regex: 0.1 -> 0.2
* semver: 0.5 -> 0.8
* url: 1.2 -> 1.5
* uuid: 0.3 -> 0.5

(This list is most surely not complete)
2017-09-19 17:16:19 +02:00
Matthias Beyer a01a2c18f8 Check in Store::move_by_id() whether target exists, not only in cache but also on FS 2017-09-17 15:44:19 +02:00
Matthias Beyer 29e1107d3e Add file abstraction function to check whether path exists 2017-09-17 15:43:57 +02:00
Matthias Beyer 22b9f8ecdd Do not insert the links array in the core header 2017-09-16 19:44:09 +02:00
Matthias Beyer 6228de1066 Query-path fixed 2017-09-15 23:01:45 +02:00
Matthias Beyer 324110cb76 Add more debugging/tracing output 2017-09-15 23:01:26 +02:00
Matthias Beyer 2c1d322a1c Add test to test external linking 2017-09-15 22:49:40 +02:00
Matthias Beyer 29e9fffd03 Move env_logger dep to dev-dependencies 2017-09-15 22:49:24 +02:00
Matthias Beyer be8a3d1242 Merge pull request #1065 from matthiasbeyer/libimagnotes/do-not-wrap
libimagnotes: Do not wrap store types.
2017-09-15 21:00:24 +02:00
Matthias Beyer 5271255ae3 Fix libimagentryannotation for changes in libimagnotes 2017-09-15 13:53:30 +02:00
Matthias Beyer 94855fb722 Refactor libimagdiary
To not wrap types anymore, but rather use extension traits for extending
all the things.
2017-09-15 13:53:16 +02:00
Matthias Beyer 8b8e4e9c6e Minify iterator helper implementation 2017-09-15 13:17:12 +02:00
Matthias Beyer fce5df48c8 Add simple iterator helpers for StoreIdIterator -> CRUD Iterator 2017-09-15 13:07:49 +02:00
Matthias Beyer 53c7d602eb Merge pull request #1062 from matthiasbeyer/libimagstore/error-opt
libimagstore: Optimize errors
2017-09-10 11:45:59 +02:00
Matthias Beyer 785e17a4a3 Add param to StoreIdHasNoBaseError 2017-09-10 10:48:51 +02:00
Matthias Beyer a670172880 Add param to StoreIdLocalPartAbsoluteError 2017-09-10 10:48:50 +02:00
Matthias Beyer b772908697 Add params to EntryRenameError 2017-09-10 10:48:50 +02:00
Matthias Beyer 2ce2ba54da Replace GlobError with link to ::glob::PatternError 2017-09-10 10:48:50 +02:00
Matthias Beyer 6aa695974c Add param to EntryAlreadyExists error 2017-09-10 10:48:50 +02:00
Matthias Beyer 126aa75a2c Add param to ConfigTypeError 2017-09-09 22:24:58 +02:00
Matthias Beyer 307165d1b2 Remove ConfigReadError because ::toml_query::error::Error is now linked in 2017-09-09 22:15:18 +02:00
Matthias Beyer a015b07f6a Remove TomlReadError by linking in ::toml_query::error::Error 2017-09-09 22:09:36 +02:00
Matthias Beyer 4849cc4822 Remove TemplateStringRegistrationError by linking in handlebars error type 2017-09-09 22:04:32 +02:00
Matthias Beyer 83f9350d98 Add param to EntryAlreadyBorrowed error 2017-09-09 21:59:36 +02:00
Matthias Beyer a28613b889 Add param to StorePathCreate 2017-09-09 21:59:36 +02:00
Matthias Beyer ff8569809b Add parameter to StorePathExists error 2017-09-09 21:59:36 +02:00
Matthias Beyer 78db822917 Remove unused error type 2017-09-09 21:59:36 +02:00
Matthias Beyer ca9123c740 Add parameter to IdNotFound error 2017-09-09 21:27:10 +02:00
Matthias Beyer b682e7f8db Remove warning which is printed by the store 2017-09-09 21:14:08 +02:00
Matthias Beyer 21440d58aa Remove outdated comment 2017-09-09 21:13:38 +02:00
Matthias Beyer 3d8f75300d Remove unecessary error chaining 2017-09-09 21:13:21 +02:00
Matthias Beyer 8aa5c2d82d Fix header locations
Also change that the implementation uses toml_query::set instead of
toml_query::insert.

Inserting values creates intermediate tables, set doesn't. And we really
want that convenience here, as the code is complex enough on its own.
2017-09-09 16:36:21 +02:00
Matthias Beyer 250bc3d8a7 Add tests for processing with appropriate setting switched off 2017-09-07 20:57:22 +02:00
Matthias Beyer 18ebd568dc Add test for processing two refs 2017-09-07 20:57:22 +02:00
Matthias Beyer 98aa7bf716 Add test to test ref creation 2017-09-07 20:57:22 +02:00
Matthias Beyer 24985a2384 Add test for processing external link 2017-09-07 20:57:22 +02:00
Matthias Beyer 3cb2393c08 Add test for automatically creating linked entries 2017-09-07 20:57:22 +02:00
Matthias Beyer 0aea9151dd Add test for faulty link 2017-09-07 20:57:22 +02:00
Matthias Beyer 0b640e18be Add test to check whether internal links are parsed and set correctly 2017-09-07 20:57:22 +02:00
Matthias Beyer 0a60f5ca55 Add test for processing entry without links 2017-09-07 20:57:22 +02:00
Matthias Beyer 9c68514dfb Add processor for collecting links from content
and putting them into the header via the functionality offered by
`libimagentrylink`.
2017-09-07 20:57:22 +02:00
Matthias Beyer 976f280511 Update toml-query: 0.3.* -> ^0.3.1
This release contains a bugfix for a critical bug in the
`TomlValueInsertExt::insert()` algorithm which was triggered by an
edgecase.
2017-09-06 19:30:32 +02:00
Matthias Beyer 86fae34d0d Merge pull request #1056 from matthiasbeyer/libimagstore/rewrite-store-entries-fn
Rewrite Store::entries() implementation
2017-09-06 17:39:44 +02:00
Matthias Beyer b10d63c134 Rewrite Store::entries() implementation
As we rely on the filesystem in Store::entries(), which is a bug and
shouldn't be done, we rewrite this function and use the file_abstraction
framework.
2017-09-06 16:11:19 +02:00
Matthias Beyer 9d8a8f0bf4 Fix Store loading in tests: Use in-memory store backend 2017-09-05 22:00:58 +02:00
Matthias Beyer c115215fa4 Merge branch 'master' into libimagerror/integration
This merge solved a _LOT_ of conflicts and was a rather complicated one,
as parts of the conflict-resolution involved rewriting of half the
stuff.

This merge commit fixes all the things so a `cargo check --all`
succeeds, but I did not yet check whether tests run without failure.
2017-09-04 23:02:45 +02:00
Matthias Beyer 6d1dab3117 Merge pull request #1029 from matthiasbeyer/all-extensions-as-traits
All extensions as traits
2017-09-04 21:59:54 +02:00
Matthias Beyer 39dd9e8d7c Add Task trait for getting UUID from task 2017-09-04 09:20:14 +02:00
Matthias Beyer 72ea21ee1f Rename module task -> taskstore 2017-09-04 09:20:14 +02:00
Matthias Beyer 18e806f588 Remove dedicated result modules, use error chain generated Result types 2017-09-04 09:19:29 +02:00
Matthias Beyer eefcfd02dc Allow generated fns from macros to be unused 2017-09-03 22:01:40 +02:00
Matthias Beyer 7ce44e8090 Remove "IntoError" trait, use error_chain functionality 2017-09-03 21:34:07 +02:00
Matthias Beyer 28d7085b2d Remove error_chain dependency, not needed 2017-09-03 21:33:55 +02:00
Matthias Beyer 936a314efa libimagtodo: Rewrite error handling 2017-09-03 21:33:54 +02:00
Matthias Beyer a5bb7a9bec libimagtimetrack: Rewrite error handling 2017-09-03 21:33:54 +02:00
Matthias Beyer 22cff91653 libimagmail: Rewrite error handling 2017-09-03 21:33:54 +02:00
Matthias Beyer 677a5e8886 libimagdiary: Rewrite error handling 2017-09-03 21:33:54 +02:00
Matthias Beyer 31dc0eebc2 libimagcounter: Rewrite error handling 2017-09-03 21:33:54 +02:00
Matthias Beyer c9dbf76395 libimagbookmark: Rewrite error handling 2017-09-03 21:33:54 +02:00
Matthias Beyer 5b781702cc libimagentryview: Rewrite error handling 2017-09-03 21:33:54 +02:00
Matthias Beyer 0ede39a991 libimagentrytag: Rewrite error handling 2017-09-03 21:33:54 +02:00
Matthias Beyer 8d8a91e7c5 libimagentrycategory: Rewrite error handling 2017-09-03 21:33:54 +02:00
Matthias Beyer 262aae39f4 libimagentryannotation: Rewrite error handling 2017-09-03 21:33:54 +02:00
Matthias Beyer d443b83b52 libimagentrydatetime: Rewrite error handling 2017-09-03 21:33:54 +02:00
Matthias Beyer 0b068df84e libimagnotes: Rewrite error handling 2017-09-03 21:33:54 +02:00
Matthias Beyer 22be1627b7 libimagentryref: Rewrite error handling 2017-09-03 21:33:54 +02:00
Matthias Beyer bb6956740d libimagentrymarkdown: Rewrite error handling 2017-09-03 21:33:54 +02:00
Matthias Beyer 9aa5d7439d libimagentrylist: Rewrite error handling 2017-09-03 21:33:54 +02:00
Matthias Beyer 4b4b0b0804 libimagentryedit: Rewrite error handling 2017-09-03 21:33:54 +02:00
Matthias Beyer ca0dd5906d libimagentrylink: Rewrite error handling 2017-09-03 21:33:54 +02:00
Matthias Beyer ac34b4ee66 libimaginteraction: Rewrite error handling 2017-09-03 21:33:54 +02:00
Matthias Beyer b6909a2c86 libimagrt: Rewrite error handling 2017-09-03 21:33:54 +02:00
Matthias Beyer 2df99524e7 libimagstore: rewrite error handling code 2017-09-03 21:33:54 +02:00
Matthias Beyer 603808a9fa Impl IntoError for error kinds 2017-09-03 15:42:06 +02:00
Matthias Beyer 9713a4632c Remove error_gen module entirely 2017-09-03 15:42:06 +02:00
Matthias Beyer a309fdb280 Add recursion limits to crates 2017-09-03 15:42:06 +02:00
Matthias Beyer 11d881d3a9 Add dependency to crates: error_chain = 0.10 2017-09-03 15:42:06 +02:00
Matthias Beyer e77d353c52 Rewrite macros to do error-chain behind the scenes 2017-09-03 15:42:03 +02:00
Matthias Beyer 4908cc6aaa Add more helpers 2017-09-03 13:48:05 +02:00
Matthias Beyer 0683bf198b Fix recursion problem 2017-09-03 13:48:05 +02:00
Matthias Beyer 93444be412 Light code cleanup 2017-09-03 13:48:05 +02:00
Matthias Beyer 64f96092cd Fix aggregation 2017-09-03 13:48:05 +02:00
Matthias Beyer 482377abb9 Actually print error here (as logging isnt initialized at this point) 2017-09-03 13:48:05 +02:00
Matthias Beyer 5ec1cd48a0 Implement format-fetching from config/cli 2017-09-03 13:48:05 +02:00
Matthias Beyer ae24954020 Implement templating 2017-09-03 13:48:05 +02:00