Commit graph

315 commits

Author SHA1 Message Date
85097554e9 Add hook implementation for succeeding hook tests 2016-09-19 10:38:46 +02:00
07ff755ed7 Minify error handling in Store::_update with try!() 2016-09-18 14:52:55 +02:00
b288e938f9 Minify error handling in Store::update() 2016-09-18 14:52:00 +02:00
41c7cd2363 [CHERRY-PICK] Add newline before header
The lastest release of the `toml-rs` crate (2.1) removes leading spaces
before arrays and tables, causing our tests to fail.

This fixes it.
2016-09-09 17:22:20 +02:00
d5647069cb Add test that Store::retrieve() does ::create() underneath 2016-09-09 13:07:46 +02:00
c9994c33b6 Add test whether store-internal hashmap gets actually filled on Store::create() 2016-09-09 13:07:45 +02:00
e023a856f1 Add Store testing 2016-09-09 13:07:32 +02:00
7b827ff149 Add newline before header
The lastest release of the `toml-rs` crate (2.1) removes leading spaces
before arrays and tables, causing our tests to fail.

This fixes it.
2016-09-09 11:52:12 +02:00
3252f9b751 Move Update-Hook execution into Store._update() 2016-09-08 14:23:10 +02:00
5f04d29345 Adapt store to not use StoreId::into() but new StoreId::into_pathbuf() 2016-09-06 15:31:55 +02:00
364ad01179 Use StoreId::from_full_path() in GlobStoreIdIterator::next() 2016-09-05 18:22:55 +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
22d6815abd Remove Store::get_all_versions() as we do not longer have the concept of store-entry versions 2016-08-31 08:26:54 +02:00
197940ac33 Fixup Store test implementations 2016-08-28 18:41:55 +02:00
fd1a96fa74 Fix storification of StoreId in CRUD functions 2016-08-28 18:41:55 +02:00
40f1efa258 Fix for new StoreId interface in Iterator for Walk impl 2016-08-28 18:41:54 +02:00
a110ecc2ec Fix GlobStoreIdIterator implementation for new StoreId interface 2016-08-28 18:41:54 +02:00
151877d95d Fix impl Drop for Store for new StoreId interface 2016-08-28 18:41:54 +02:00
5b23059d93 Fix scoping 2016-08-28 18:41:54 +02:00
3c1be0fbe9 Fix use of store ids when passing to FileAbstraction::* 2016-08-28 18:41:54 +02:00
aa6f220659 Fix GlobStoreIterator type implementation
... to use new StoreId interface
2016-08-28 18:41:53 +02:00
9cf7897286 Fixup Walk type to handle StoreId properly 2016-08-28 18:41:53 +02:00
Marcel Müller
820fa287a0
Remove duplication 2016-08-25 09:30:47 +02:00
Marcel Müller
a82ef32142
Add missing FileAbstractions call 2016-08-24 16:58:48 +02:00
Marcel Müller
60a315e553
Rename lazyfile file to file_abstraction 2016-08-24 16:58:47 +02:00
Marcel Müller
c8e296e221
Move all abstractions to LazyFile and change it to FileAbstraction 2016-08-24 16:58:47 +02:00
Marcel Müller
74dcd1f141
Add implementation of Test Lazyfile 2016-08-24 16:58:47 +02:00
Marcel Müller
363a1d246a
Use Read instead of File for from_file
Also change it to `from_reader`
2016-08-24 16:58:46 +02:00
e37316f3f4 Fix possible w-lock panic
For a detailed explanation on the issue this commit tries to solve, have
a look at

    7b5d37a039

which explains the issue in detail.
2016-08-02 18:59:17 +02:00
84ae516dc3 Fix possible w-lock panic
for a detailed explanation of the issue this commit tries to solve have
a look at

    7b5d37a039

which explains the issue in detail.
2016-08-02 18:59:17 +02:00
ea17755ad4 Fix possible w-lock panic
for a detailed explanation have a look at

    7b5d37a039

Which explains the issue this commit solves in more detail.
2016-08-01 20:28:38 +02:00
7b5d37a039 Fix: Make sure we release the Write-Lock
This was suggested by Marcel Müller, who also debugged this issue and
found that this snippet was the error.

The problem was, that we had the write-lock when starting the hooks. If
the hook runs into an Err() mapping part where the Entry could already
be drop()ed, Rust tries to be smart and drops the object. As we are
still in the creation code of the entry, this paniced as we still hold
the W-Lock and the drop() tryies to call _update() on the entry, which
also tries to W-lock it.

With the new additional scope, the W-lock gets dropped early and we do
not have this problem anymore.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Suggested-by: Marcel Müller <neikos@neikos.email>
Reported-by: Matthias Beyer <mail@beyermatthias.de>
2016-08-01 20:00:31 +02:00
Kai Sickeler
b6437a0b0f Implement Debug for FileLockEntry, do not derive it 2016-07-27 19:26:45 +02:00
0ba67f7873 Check whether implictely creating the store path is allowed 2016-07-25 17:02:38 +02:00
6b1fdfbc1d Add Store::verify() 2016-07-17 00:59:04 +02:00
76d23577c4 Merge pull request #546 from matthiasbeyer/libimagstore/fixed-and-more-hook-error-wrapping
Add more error levels in hook execution error wrapping
2016-07-16 11:23:38 +02:00
8de32622b9 Add more error levels in hook execution error wrapping 2016-07-16 00:57:33 +02:00
32617d0a16 Add debug config when getting configuration for a hook 2016-07-16 00:32:58 +02:00
33771f3903 Add debugging output when setting hook configuration 2016-07-16 00:32:54 +02:00
fc72b3f53a Add more debug output in Store::new() 2016-07-16 00:32:50 +02:00
John Sirois
7f57e5e234 Move from a helper function to a typeclass.
This introduces the `FoldResut` trait to move from `func(receiver, ...)`
style to `receiver.func(...)` style. Also add a means to pass the
default result explicitly.
2016-07-14 07:28:54 -06:00
John Sirois
2c40b8734e Add a fold_ok utility.
Add a utility that folds an iterator into a result and uses it to reduce
boilerplate in the codebase.
2016-07-13 12:43:04 -06:00
eb31da70d1 Remove import: trace_error() function 2016-07-07 17:03:20 +02:00
d18766b4b4 Remove checking for aborting errors
As the Aspect execution catches the aborting hooks and returns them, we
cannot have a non-aborting error here, so there is no point in checking
for aborting errors.
2016-07-06 18:01:00 +02:00
a706680fd5 Revert "Store::create() Make outgoing storeid object unstorified"
This reverts commit 41d7d1c213.
2016-07-04 12:46:06 +02:00
41d7d1c213 Store::create() Make outgoing storeid object unstorified 2016-07-04 12:44:58 +02:00
12b8f8f331 Move storification of StoreId object to new StoreId::storified() func 2016-07-02 17:52:12 +02:00
45a24de853 store.rs: Replace error boxing and wrapping with result helper from libimagerror 2016-06-27 18:16:43 +02:00
55e6c29275 Add another level of error enclosure 2016-06-08 15:11:53 +02:00
84a0778a5b Refactor: Use helper function for equal codelines 2016-06-08 15:08:06 +02:00
3c40df1ae7 Add Store::save_to() to create a copy of an entry 2016-06-08 15:08:06 +02:00
2ce84a3dbf Add {Pre, Post}Move hooks 2016-06-08 15:08:00 +02:00
12cac663d0 Implement save_as() 2016-06-08 14:03:17 +02:00
f885e6c80b Implement move_by_id() 2016-06-08 14:03:17 +02:00
5b16771f4f Add (unimplemented) functions for moving store entries 2016-06-08 14:02:52 +02:00
88e89d7927 Merge pull request #456 from matthiasbeyer/libimagstore/errors-to-identify-store-api-call
Add a set of error kinds to identify the store call the error came from
2016-06-06 18:28:48 +02:00
ea5319812d Merge pull request #439 from matthiasbeyer/libimagstore/fle-and-entry-have-storeid
Remove duplicated StoreId member in FileLockEntry, use member from Entry
2016-05-29 02:15:26 +02:00
9d37ffef91 Merge pull request #454 from matthiasbeyer/libimagstore/hook-exec-error-fix
Libimagstore/hook exec error fix
2016-05-29 01:31:17 +02:00
55e5255293 Remove duplicated StoreId member in FileLockEntry, use member from Entry 2016-05-29 00:01:05 +02:00
ce12a22ef5 Merge pull request #440 from matthiasbeyer/libimagstore/load-unload-hooks
Libimagstore/load unload hooks
2016-05-28 23:59:32 +02:00
64e28f3c31 Fix C/P fail
The store executed the wrong hooks here, because of a C/P failure.

This fixes this bug.
2016-05-28 23:47:26 +02:00
d85f747066 Add a set of error kinds to identify the store call the error came from 2016-05-28 23:30:50 +02:00
6c7d6c29ea Rewrite pre-hook execution 2016-05-28 21:08:55 +02:00
42289a085e Fix glob() pattern 2016-05-28 17:28:38 +02:00
a6200b67c0 Merge pull request #446 from matthiasbeyer/libimagstore/fix-get
Fix Store::get()
2016-05-28 10:35:42 +02:00
19aec6327f Fix Store::get() 2016-05-27 23:58:37 +02:00
183c46a7dd Use Into implementations to convert error kinds into error types 2016-05-27 10:11:51 +02:00
2ad5cb48aa Implement store-unload hooks 2016-05-26 21:04:04 +02:00
dd7e146081 impl Into<StoreIdIterator> for GlobStoreIdIterator to be able to convert easily 2016-05-23 14:52:32 +02:00
839ec051a4 Add Store::get_all_versions() for getting all versions of a StoreId entry 2016-05-23 14:52:13 +02:00
b4f17576f6 Add Store::get() for getting or failing if entry does not exist 2016-05-23 14:51:38 +02:00
a56f000e3e Remove unneeded scope 2016-05-15 14:02:30 +02:00
a26a0645bd Remove iflet by mapping 2016-05-15 14:01:55 +02:00
944a9bf876 Remove unwrap() calls by matching 2016-05-15 14:01:55 +02:00
0b7f815104 Remove unwrap() calls by matching 2016-05-15 14:01:55 +02:00
81810dbcc8 Remove unwrap() calls by matching 2016-05-15 14:01:55 +02:00
604e59ae3c Remove unwrap() calls by matching 2016-05-15 14:01:55 +02:00
2a6e4c62fe Remove unwrap() by matching, remove unneeded deref() 2016-05-15 14:01:55 +02:00
8d9bd5154d Remove unwrap() by matching, remove unneeded deref() 2016-05-15 14:01:55 +02:00
a481200c9a Replace unwrap() by matching 2016-05-15 14:01:55 +02:00
1e1cbec98b Replace unwrap() by matching 2016-05-15 14:01:55 +02:00
70b3d3906e Replace unwrap() by matching 2016-05-15 14:01:55 +02:00
1f66f67791 Replaced unwrap() by matching 2016-05-15 14:01:55 +02:00
7b612ce8fb Remove iflet by mapping over Option/Result types 2016-05-15 14:01:55 +02:00
f9f5fa5717 Shorten code by using StoreError as SE and StoreErrorKind as SEK 2016-05-15 14:01:55 +02:00
a852da54dd Remove iflet by using Option::{map_err, and}() 2016-05-15 14:00:40 +02:00
3fb6d507e5 Remove unwrap() by matching 2016-05-15 14:00:40 +02:00
ac8bcde239 Remove unwrap() hell by matching 2016-05-15 14:00:40 +02:00
Andre Bogus
cd224eaeff roll back closure, remove unneeded slice & imports 2016-05-14 20:12:19 +02:00
Andre Bogus
981707c9c9 more style adaptations
again following clippy
2016-05-13 22:27:53 +02:00
b9d8e5728b Move GlobStoreIdIterator implementation so we can have it non-public 2016-05-12 17:27:41 +02:00
5972ce7f37 Make StoreIdIterator generic
This patch makes the StoreIdIterator type generic over all iterators
with Item = StoreId.

As the StoreIdIterator type was previousely used for iterating over a
glob() result, I had to wrap this result type in another iterator type
which is then wrapped in StoreIdIterator.

With this patch applied, other libraries may use the StoreIdIterator
type to abstract things away in their implementation.
2016-05-12 17:21:04 +02:00
285832f45f Merge pull request #349 from matthiasbeyer/libimagstore/walk
Libimagstore/walk
2016-05-09 15:53:17 +02:00
c32065c2d6 Implement Store::walk() 2016-05-07 13:17:23 +02:00
3842e177d7 Make Entry::{from_file,from_str} generic over IntoStoreId 2016-05-04 13:30:19 +02:00
5d6c226953 Make some store functions generic over IntoStoreId 2016-05-04 13:30:19 +02:00
4d4acf9168 Fix IntoStoreId implementation 2016-05-03 14:58:05 +02:00
b629d0b8f1 Merge pull request #367 from matthiasbeyer/unwrap_err
Unwrap err
2016-04-21 15:08:36 +02:00
cb3683940e Remove unneeded module specifiers from Deref{,Mut} impls 2016-04-21 13:13:58 +02:00
872114d86f FileLockEntry: Derive Debug 2016-04-20 21:46:02 +02:00