Commit graph

2753 commits

Author SHA1 Message Date
0d59305199 Merge pull request #692 from matthiasbeyer/libimagerror/map_err_trace
Add Result helpers for trace()ing errors
2016-09-05 20:30:44 +02:00
b1765fa994 Merge pull request #697 from matthiasbeyer/libimagref/hasher-name-in-hdr
libimagref/hasher name in hdr
2016-09-05 20:30:21 +02:00
56576c16bb Merge pull request #696 from matthiasbeyer/imag-diary/refactor
imag-diary/refactor
2016-09-05 20:30:14 +02:00
7bf654158e Merge pull request #695 from matthiasbeyer/libimagutil/warn-exit
libimagutil: Add warn_exit() convenience helper
2016-09-05 19:24:01 +02:00
1dfe877cd9 Fix typo in is_external_link_storeid() helper fn 2016-09-05 18:52:42 +02:00
c23a11060f Add debug output 2016-09-05 18:51:35 +02:00
2956df81f1 Fix: We save the url at imag.content.url, not imag.content.uri 2016-09-05 18:49:12 +02:00
364ad01179 Use StoreId::from_full_path() in GlobStoreIdIterator::next() 2016-09-05 18:22:55 +02:00
8362b077e2 Add StoreId::from_full_path() 2016-09-05 18:21:34 +02:00
f60afa581c Add error type for failed build of StoreId object from full path 2016-09-05 18:21:21 +02:00
e4e5b52171 Fix Iterator impl for GlobStoreIdIterator
This patch fixes the `impl Iterator for GlobStoreIdIterator` which used
the glob() result to fetch the files from the FS, but glob() returns the
absolute pathes (to filesystem root).

We have to strip the `store_path` prefix and use the local part for
building the StoreId object.
2016-09-05 18:12:29 +02:00
47389f0f24 Merge pull request #693 from matthiasbeyer/libimagutil/result-extension-cleanup
Libimagutil/result extension cleanup (documentation)
2016-09-05 17:46:19 +02:00
d8c61d25c4 Fix absolute storeid specification in test 2016-09-05 17:05:18 +02:00
bfd8e14d04 Add Result helpers for trace()ing errors 2016-09-05 16:16:06 +02:00
6b5d91e447 Replace is_none() -> unwrap() with unwrap_or_else() 2016-09-05 16:15:54 +02:00
b2b8f013af Replace is_none() -> unwrap() with unwrap_or_else() 2016-09-05 16:15:54 +02:00
b7c8fa4d18 Replace is_none() -> unwrap() with unwrap_or_else() 2016-09-05 16:15:54 +02:00
f61e14ff41 Replace is_none() -> unwrap() with unwrap_or_else() 2016-09-05 16:15:54 +02:00
5e739df3f8 Replace is_none() -> unwrap() with unwrap_or_else() 2016-09-05 16:15:54 +02:00
66ccd97ef2 Simplify error handling 2016-09-05 16:15:54 +02:00
02b58a45c5 Simplify error handling 2016-09-05 16:15:54 +02:00
4ddb558837 Replace complex match with if let Err(e) 2016-09-05 16:15:54 +02:00
44675a4b4f Refactor: use map_err_into() instead of manual building 2016-09-05 16:15:54 +02:00
f8db1273e7 Export MapErrInto as well here 2016-09-05 16:15:54 +02:00
b2f764d004 Add warn_exit() convenience helper 2016-09-05 16:15:50 +02:00
ec9da007a5 Add comment for warn_result code 2016-09-05 16:15:45 +02:00
87e170df72 Add comment for info_result code 2016-09-05 16:15:45 +02:00
2c89de1332 Add comment for debug_result code 2016-09-05 16:15:45 +02:00
6b6e3a0e12 Add documentation for the code-generator macro 2016-09-05 16:15:45 +02:00
55846168dc Add variant of Ref::get_stored_hash() to get stored hash with custom hasher 2016-09-05 16:15:40 +02:00
5399b8ca7b Add variant of Ref::update_ref() to update with custom Hasher instance 2016-09-05 16:15:40 +02:00
a6ca041903 Fix Ref::get_stored_hash() for reading the right header field 2016-09-05 16:15:40 +02:00
8a3d4fc0b2 Fix Ref::update_ref() to set the appropriate header field 2016-09-05 16:15:40 +02:00
6a1ffe059b This patch puts the hasher name in the header
This was a bug, as the previous implementation simply sets the hash, but
we need to set the hash in a place where we can re-find it with a
hasher.
2016-09-05 16:15:40 +02:00
737aab80dc Merge pull request #667 from matthiasbeyer/rewrite-storeid-type
Rewrite storeid type
2016-09-05 16:10:47 +02:00
07d4c45b3f Refactor long line for more readability 2016-09-05 09:21:06 +02:00
24c73325f3 Remove version part from imag-store tests 2016-09-05 09:21:06 +02:00
70a17ca62c Fix typo 2016-09-05 00:35:04 +02:00
3a0739c1cf Merge pull request #690 from matthiasbeyer/rewrite-storeid-type-general-cleanup
General cleanup for #667
2016-09-04 18:03:20 +02:00
dfcc5c6a0e Merge pull request #603 from asuivelentine/imag-view/view-in-editor
get default editor
2016-09-04 15:36:22 +02:00
ccffeb91a2 Remove StoreId::is_in_collection(), add StoreId::local()
Having a ::is_in_collection() is a nice thing, though it is _way_ better
if we just give the user of the `StoreId` object access to the local
part of the ID.

Using this new function, one can do all the actions one might need on
the Path for the actual entry without nasty copying or such.

`StoreId::is_in_collection()` can be replaced by
`StoreId::local().starts_with()` and everything is fine, as we do not
have to move a `PathBuf` object into the function anymore.
2016-09-04 10:40:38 +02:00
253c8a6f54 Adapt tests for new StoreId::is_in_collection() interface 2016-09-03 19:32:27 +02:00
3c31854e66 Use new StoreId::is_in_collection() interface 2016-09-02 17:17:41 +02:00
4da331f990 Use new StoreId::is_in_collection() interface 2016-09-02 17:16:03 +02:00
a77cc2bab2 Change the interface of StoreId::is_in_collection()
to use &PathBuf rather than &[&str] as argument.
2016-09-02 17:15:15 +02:00
85f79ae3e5 Replace .map().all(|x| x) by calling .all() in the first place 2016-09-02 17:01:40 +02:00
8e779fc87e Merge pull request #679 from matthiasbeyer/libimagdiary-is-in-diary-with-storeid-is-in-collection
libimagdiary cleanup
2016-09-02 08:25:37 +02:00
901df1fb3a Merge pull request #680 from matthiasbeyer/rewrite-storeid-type-imag-store-cleanup
imag-store cleanup
2016-09-02 08:25:21 +02:00
4896c14086 Merge pull request #681 from matthiasbeyer/rewrite-storeid-type-cleanup-libimagentrylink
libimagentrylink cleanup
2016-09-02 08:25:10 +02:00
ae280f178c Merge pull request #682 from matthiasbeyer/rewrite-storeid-type-cleanup-libimagentryview
libimagentryview cleanup
2016-09-02 08:24:50 +02:00