Commit Graph

5320 Commits

Author SHA1 Message Date
Matthias Beyer 9fc9e7fe17 Outsource iterator in iter module 2018-04-26 12:05:28 +02:00
Matthias Beyer ab15d89e64 Rewrite CategoryRegister as CategoryStore 2018-04-26 12:05:28 +02:00
Matthias Beyer 5f305ef7a7 Add module for category handling 2018-04-26 12:05:28 +02:00
Matthias Beyer c26f1aae2a This module should be named "entry" 2018-04-26 11:20:40 +02:00
Matthias Beyer f321aa82a1 Make sure category is linked when setting it 2018-04-26 11:20:09 +02:00
Matthias Beyer 0bacfb0a88
Merge pull request #1446 from matthiasbeyer/travis-clippy
Travis: clippy
2018-04-26 10:25:45 +02:00
Matthias Beyer 2b250bd8c8 Revert "Add clippy job"
This reverts commit 8ae689863d.
2018-04-25 21:39:56 +02:00
Matthias Beyer ea80a5a09b Derive Default for InMemoryFileAbstraction, remove constructor 2018-04-25 19:15:07 +02:00
Matthias Beyer 6a34e7a8fd Derive Default for FSFileAbstraction, reduces boilerplate 2018-04-25 19:15:07 +02:00
Matthias Beyer bf363c4748 Use "if let" if matching on a single pattern 2018-04-25 19:15:07 +02:00
Matthias Beyer f1142c414d Use ok_or_else() instead of ok_or() 2018-04-25 19:15:07 +02:00
Matthias Beyer 22170a0d55 Do not String::from(String) 2018-04-25 19:13:51 +02:00
Matthias Beyer 6f5590713a Use single quotes here 2018-04-25 19:13:51 +02:00
Matthias Beyer 44521a7c8c Dont use "return" keyword at end of function 2018-04-25 19:13:51 +02:00
Matthias Beyer dc18e650bb Collapse nested if-else-if 2018-04-25 19:13:51 +02:00
Matthias Beyer 67675b2ab2 Remove unecessary clone 2018-04-25 19:13:51 +02:00
Matthias Beyer a25f650ca0 Be more ergonomic here 2018-04-25 19:13:51 +02:00
Matthias Beyer 84249e3fb5 Be less verbose when constructing an object
The rust compiler does some fancy things for us: It automatically finds
the right fields if the name of the variable and the file is the same.

Lets use that to reduce boilerplate with this patch.
2018-04-25 19:13:50 +02:00
Matthias Beyer 154c2e482b Change generate_variants() helper to use base by ref 2018-04-25 19:13:50 +02:00
Matthias Beyer 42c4186dec Use or_else() instead of or() 2018-04-25 19:13:50 +02:00
Matthias Beyer 2b10ab0b36
Merge pull request #1450 from matthiasbeyer/libimagcontact/not-based-on-libimagentryref
libimagcontact: not based on libimagentryref
2018-04-25 14:59:37 +02:00
Matthias Beyer d6f8751f6e Reimplement imag-contact 2018-04-25 13:45:00 +02:00
Matthias Beyer a83d10fb1e Remove feature usage 2018-04-25 13:45:00 +02:00
Matthias Beyer 80c07171aa Make sure we can deserialize
Use default values when field is not there when we deserialize. This
does automatically the right thing.
2018-04-25 13:45:00 +02:00
Matthias Beyer 56c1b78d93 Add getters for DeserVcard helper type 2018-04-25 13:45:00 +02:00
Matthias Beyer abc142f4b5 Rewrite library
libimagcontact stores all contact information in the entry header now.
2018-04-25 12:54:01 +02:00
Matthias Beyer 3eab3af7b0 Remove all libimagentryref usage 2018-04-25 11:30:42 +02:00
Matthias Beyer 5457834ea1
Merge pull request #1449 from matthiasbeyer/imag-contact/only-absolute-pathes-on-import
Deny non-absolut import pathes
2018-04-25 11:28:45 +02:00
Matthias Beyer b90abfb868 Deny non-absolut import pathes 2018-04-25 10:33:12 +02:00
Matthias Beyer 0e567e2358
Merge pull request #1445 from matthiasbeyer/imag-view/seperator
imag-view argument to put seperator between shown entries
2018-04-25 10:01:36 +02:00
Matthias Beyer 775508a6ed Refactor: Use AsRef<str> instead of String as arg type 2018-04-24 23:12:14 +02:00
Matthias Beyer 488ce9fe91 Clippy fixes 2018-04-24 23:12:14 +02:00
Matthias Beyer 8ae689863d Add clippy job 2018-04-24 23:12:14 +02:00
Matthias Beyer 2ac4fa42b3
Merge pull request #1444 from matthiasbeyer/libimagstore/remove-backend-mapper
libimagstore: remove backend mapper
2018-04-24 23:08:30 +02:00
Matthias Beyer 95a4816604 Implement imag-view argument to put seperator between shown entries 2018-04-24 22:49:53 +02:00
Matthias Beyer 524c391ee0 Remove unused dependency 2018-04-24 22:16:40 +02:00
Matthias Beyer 563c76c375 Remove "stdio" file abstraction from store implementation 2018-04-24 22:16:40 +02:00
Matthias Beyer 19e0471f5b Remove tests with JsonMapper in backend 2018-04-24 22:16:40 +02:00
Matthias Beyer ba453323ba Remove support for changing store backend 2018-04-24 22:16:40 +02:00
Matthias Beyer be74afd031 Remove "dump" subcommand 2018-04-24 22:16:40 +02:00
Matthias Beyer 16747aa257
Merge pull request #1442 from matthiasbeyer/imag-view/markdown-compile
imag-view: markdown compile
2018-04-24 19:48:38 +02:00
Matthias Beyer c2fd3fa94e Add support for formatted markdown output
This patch also removes the (unused) "compile" subcommand and replaces
it with a flag "-c" / "--compile" which prints the output in formatted
to the terminal.

Compiling the output from markdown to HTML and showing in the browser is
not yet possible.
2018-04-24 18:06:45 +02:00
Matthias Beyer d12844aff0 Add markdown viewer functionality 2018-04-24 18:06:45 +02:00
Matthias Beyer f882f6eeaf
Merge pull request #1418 from matthiasbeyer/libimagentryview/pass-sink
Rewrite libimagentryview interface
2018-04-24 18:00:57 +02:00
Matthias Beyer 279f7ef2aa Fix: Pass output stream to view_entries() 2018-04-24 16:46:23 +02:00
Matthias Beyer 653db333e6 Fix imag-view for new view_entry() interface 2018-04-24 16:46:23 +02:00
Matthias Beyer 55d9b5456f Adapt to new libimagentryview interface
And properly implement Viewer for DiaryViewer
2018-04-24 16:46:15 +02:00
Matthias Beyer 780dd90c8f Rewrite libimagentryview interface
In the previous versions, the sink (where the entries should be written
to) was not passed.

This did conflict with the libimagrt holding the stdout/stderr handles,
because it automatically writes to stdout (which we don't want to do in
some cases).

Passing the sink is way nicer. This patch changes libimagentryview so
that the sink is passed to the viewer.
2018-04-24 16:46:15 +02:00
Matthias Beyer 726e4c515f
Merge pull request #1422 from matthiasbeyer/imag-git/init
imag-git: init
2018-04-24 15:26:19 +02:00
Matthias Beyer 1fcd4f93ae
Merge pull request #1416 from matthiasbeyer/libimagstore/remove-retrieve-for-module
Remove: Store::retrieve_for_module
2018-04-24 15:26:10 +02:00