Commit graph

2780 commits

Author SHA1 Message Date
06038b8405 Merge pull request #708 from matthiasbeyer/imag-link/test-fixup
Imag link/test fixup
2016-09-06 16:40:38 +02:00
8c12315ff8 Merge pull request #694 from matthiasbeyer/libimagtodo/debug-output
libimagtodo: Debug output
2016-09-06 16:38:54 +02:00
66782ca87b Refactor file opening in helper function 2016-09-06 15:31:55 +02:00
46123622b2 Have and use internal error types for better error messages 2016-09-06 15:31:55 +02:00
04166dd7a3 Import libimagerror with macros, so we can have own error types internally 2016-09-06 15:31:55 +02:00
95b77d7c92 When generating an error code, we should allow dead code here 2016-09-06 15:31:55 +02:00
144a8bf897 Flock hook: Rewrite EntryFlock trait to return HookResult 2016-09-06 15:31:55 +02:00
af4a0bfaf2 Export result-helper here 2016-09-06 15:31:55 +02:00
a6377f322e Fix Ref::get_path_hash() to use ::into_pathbuf() 2016-09-06 15:31:55 +02:00
a53adb854d Use StoreId::into_pathbuf() rather than ::into() 2016-09-06 15:31:55 +02:00
5f04d29345 Adapt store to not use StoreId::into() but new StoreId::into_pathbuf() 2016-09-06 15:31:55 +02:00
a313cede06 Add StoreId::into_pathbuf() 2016-09-06 15:31:55 +02:00
b8f612632d Add error kind if StoreId has no base part 2016-09-06 15:31:29 +02:00
84b279de95 Remove Into<PathBuf> for StoreId 2016-09-06 15:31:29 +02:00
40014051ec Bugfix: unique()ing the list of links
That should happen _after_ they are all in the same format.
This commit introduces overhead, as we clone() each string here for
comparison and that should clearly be fixed.

Though the bug-fix is more important at this point.
2016-09-06 15:30:26 +02:00
584ac3d46e Fix link test to check properly 2016-09-06 15:30:26 +02:00
2e6f833bf2 Add test for linking the same entries twice 2016-09-06 15:30:26 +02:00
60de2eefec Fix store id specification 2016-09-06 15:30:26 +02:00
47c5b7edf3 Fix string-compare 2016-09-06 15:30:26 +02:00
73d05d80ae Remove version part from IDs 2016-09-06 15:30:26 +02:00
4456c4240e Merge pull request #709 from matthiasbeyer/libimagstore/test-fixup
Fix absolute StoreId specification in imag-store test
2016-09-06 13:53:06 +02:00
aa7e050436 Merge pull request #707 from matthiasbeyer/libimagstore/remove-storeid-storified
Remove StoreId::storified()
2016-09-06 12:31:01 +02:00
5ed60f48cd Print errors (dbg) when import_task() failed 2016-09-06 12:03:27 +02:00
d7447a64c8 Remove StoreId::storified() 2016-09-06 09:37:25 +02:00
b3b90e5303 Merge pull request #712 from matthiasbeyer/libimagentrylink/fix-header-path
libimagentrylink/fix header path
2016-09-06 09:35:55 +02:00
12f4012384 Merge pull request #710 from matthiasbeyer/libimagstore/fix-globstoreiditerator
libimagstore/fix GlobStoreIdIterator
2016-09-06 09:32:34 +02:00
123133c99c test: Return if retrieve failed 2016-09-06 09:32:05 +02:00
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