Commit graph

513 commits

Author SHA1 Message Date
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
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
4896c14086 Merge pull request #681 from matthiasbeyer/rewrite-storeid-type-cleanup-libimagentrylink
libimagentrylink cleanup
2016-09-02 08:25:10 +02:00
b2806ab592 Add StoreId::is_in_collection()
The concept of this function was introduced in

    37076f028c6cde0924b820154f3464f53ef65268

but here added to StoreId as function.
2016-08-31 09:20:08 +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
82f08c6021 Remove version argument from module_entry_path_mod!() macro 2016-08-30 11:40:56 +02:00
ec2eb096e7 Remove id part from macro 2016-08-30 11:40:56 +02:00
fedb75ec98 Impl IntoStoreId for PathBuf, using StoreId::new_baseless() 2016-08-28 18:41:56 +02:00
5462714fcc Remove libimagstore::storeid::build_entry_path() 2016-08-28 18:41:56 +02:00
d252623b75 Add StoreId::components() to get components of StoreId "id" part 2016-08-28 18:41:55 +02:00
197940ac33 Fixup Store test implementations 2016-08-28 18:41:55 +02:00
d538a5b380 Fixup StoreId test 2016-08-28 18:41:55 +02:00
fd1a96fa74 Fix storification of StoreId in CRUD functions 2016-08-28 18:41:55 +02:00
4c435d9347 Add StoreId::with_base() 2016-08-28 18:41:54 +02:00
784f1cc4c6 Fix interface of IntoStoreId trait to return Result<StoreId> and impls 2016-08-28 18:41:54 +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
d5723791a6 Add StoreId::without_base() 2016-08-28 18:41:54 +02:00
ab23d04e04 Add StoreId::new_baseless() 2016-08-28 18:41:54 +02:00
d1f07cd087 Add check in StoreId::new() whether the local part is absolute 2016-08-28 18:41:54 +02:00
ccc2b6b735 Add error kind for StoreId::new() with id-part that is absolute 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
111cb4f29a Add StoreId::to_str() -> String 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
3f88c27834 Remove unused imports 2016-08-28 18:41:53 +02:00
9cf7897286 Fixup Walk type to handle StoreId properly 2016-08-28 18:41:53 +02:00
1de09f1606 Rewrite StoreId::storified() 2016-08-28 18:41:53 +02:00
1af3ab018b Use StoreId::new() in macro 2016-08-28 18:41:53 +02:00
fe73a53d44 Add StoreId::new() 2016-08-28 18:41:53 +02:00
8dff5685fd Make StoreId.base optional 2016-08-28 18:41:53 +02:00
ad92b05fb4 Remove IntoStoreId for PathBuf 2016-08-28 18:41:53 +02:00
adf213bbc7 Remove From<PathBuf> for StoreId 2016-08-28 18:41:53 +02:00
cf84df3ce7 Remove From<String> for StoreId 2016-08-28 18:41:53 +02:00
bcd917055d Remove AsRef<Path> for StoreId 2016-08-28 18:41:53 +02:00
30a76d57f6 Remove Borrow<Path> for StoreId 2016-08-28 18:41:53 +02:00
8c5a427a01 Rewrite Borrow<Path> for StoreId 2016-08-28 18:41:52 +02:00
55953cfe5b Rewrite AsRef<Path> for StoreId 2016-08-28 18:41:52 +02:00
1d165f6fc2 Remove Deref for StoreId but provide basic functions within the type 2016-08-28 18:41:52 +02:00
69b3f6bf87 Rewrite Display for StoreId 2016-08-28 18:41:52 +02:00
fb1df533c5 Rewrite Into<PathBuf> for StoreId 2016-08-28 18:41:52 +02:00
6841b7c340 Rewrite StoreId::storified() 2016-08-28 18:41:52 +02:00
264d651f1d Make StoreId be two parts: base and id 2016-08-28 18:41:52 +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
1c71326ede
Add simple test 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
bc1af19750
Add FileNot{Written,Seeked} errors 2016-08-24 16:58:47 +02:00
Marcel Müller
1d1ad65705
Split up LazyFile for test/prod 2016-08-24 16:58:46 +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
Marcel Müller
ef4455d9f3
Comment out tests 2016-08-24 16:58:43 +02:00
ddbc38e756 Merge pull request #659 from asuivelentine/libimagstore/unused-import
removed unused import
2016-08-23 21:36:03 +02:00
Kai Sickeler
5148bc1a6e removed unused import 2016-08-23 19:58:50 +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
4d650a63f7 Add error kind for implicit create denied 2016-07-25 17:02:38 +02:00
442b1537be Add helper to check config for implicit-create 2016-07-25 17:02:38 +02:00
cdf6bc6fa5 Make warning more verbose, tell what kind of variable cannot be fetched 2016-07-18 15:44:34 +02:00
ce766427da Merge pull request #561 from matthiasbeyer/libimagstore/verify
Libimagstore/verify
2016-07-17 13:03:54 +02:00
6b1fdfbc1d Add Store::verify() 2016-07-17 00:59:04 +02:00
bb8dad256c Fix comment how config has to look 2016-07-16 22:17:05 +02:00
2a95d4f79d Merge pull request #553 from matthiasbeyer/libimagstore/custom-hook-error-data-interface
Add interface for custom error data type
2016-07-16 19:15:39 +02:00
b81750ba09 Add interface for custom error data type 2016-07-16 16:52:02 +02:00
01c21e1d95 Remove "Sync" trait bound - we don't need to sync between threads here
(and we do not have the possibility to, actually).
2016-07-16 16:18:37 +02:00
6c181d32b6 Merge pull request #548 from matthiasbeyer/libimagstore/storeid-hook-exec-in-mutable-hook-exec
Execute StoreIdAccess accessors in MutableHookDataAccessor impl for A…
2016-07-16 11:23:52 +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
083b9da1e9 Merge pull request #545 from matthiasbeyer/libimagstore/fix-aspect-config-getting
Fix AspectConfig::get_for() implementation
2016-07-16 11:23:20 +02:00
c6be35554b Merge pull request #547 from matthiasbeyer/libimagstore/aspect-execution-output
Add error output in Aspect execution code
2016-07-16 11:21:41 +02:00
ed4744449c Execute StoreIdAccess accessors in MutableHookDataAccessor impl for Aspect as well
We have no other way than doing it this way, and it doesn't hurt, does
it?
2016-07-16 01:15:48 +02:00
6a85760feb Debug output in MutableHookDatsaAccessor impl for Aspect 2016-07-16 01:15:08 +02:00
8de32622b9 Add more error levels in hook execution error wrapping 2016-07-16 00:57:33 +02:00
ded6a3f240 Add error output in Aspect execution code 2016-07-16 00:57:20 +02:00
c8edb2102f Fix AspectConfig::get_for() implementation 2016-07-16 00:33:54 +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
8ef7b4e0c6 Cleanup HookError tracing logic.
Use `Result::or_else` instead of matching and no-oping the `Ok` case
manually and extract a helper to centralize repeated trace logic.
2016-07-14 20:37:16 -06: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
c6f9d91599 Merge pull request #513 from matthiasbeyer/libimagstore/hooks/optionally-deny-mutable-hooks
Libimagstore/hooks/optionally deny mutable hooks
2016-07-07 21:52:08 +02:00
7818b523b9 Deny mutable access for hooks if the config says so 2016-07-07 20:29:24 +02:00
eb31da70d1 Remove import: trace_error() function 2016-07-07 17:03:20 +02:00
7f14639c1e Add configuration parsing/getter for denying of mutable hooks 2016-07-06 19:10:17 +02:00
b4b719b753 Add error kind for denied hooks 2016-07-06 19:09:58 +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
580ea28877 Fix Display impl for StoreId by using lossy string rep if PathBuf::to_str() fails 2016-07-05 13:47:58 +02:00
d7f22020e6 Merge pull request #489 from matthiasbeyer/libimagstore/storify-id
Libimagstore/storify
2016-07-04 19:26:42 +02:00
9605d6daa6 Ensure that StoreId::storified() does not alter already storified StoreId objects 2016-07-04 12:49:12 +02:00
a706680fd5 Revert "Store::create() Make outgoing storeid object unstorified"
This reverts commit 41d7d1c213.
2016-07-04 12:46:06 +02:00
31d5dac63d Revert "Add StoreId::unstorified()"
This reverts commit 37380c84b9.

We do not want such a feature in the store, actually.
StoreId objects are either storified or not, but you cannot unstorify
them.
2016-07-04 12:45:17 +02:00
41d7d1c213 Store::create() Make outgoing storeid object unstorified 2016-07-04 12:44:58 +02:00