babf74e1e5
Fix Store::get() to not check FS but internal hashmap
2016-09-21 10:20:16 +02:00
4f2019a20a
Extend test_store_create_delete_get()
...
to actually test:
1. get -> Should return Ok(None)
2. create -> Should return Ok(())
3. get -> Should return Ok(Some(_))
4. delete -> Should return Ok(())
5. get -> Should return Ok(None)
2016-09-21 09:52:37 +02:00
513a9bd066
Merge pull request #751 from matthiasbeyer/libimagstore/store-tests-succeeding-hook-tests
...
libimagstore/store: tests succeeding hook tests
2016-09-19 22:39:23 +02:00
72a95ee5da
Rewrite config validity checker to return Result<()>
...
And add more detailed error kinds for config errors
2016-09-19 21:52:28 +02:00
83ebe88022
Add PreCreate hook test
2016-09-19 21:51:14 +02:00
4155924f85
Add test for Store::retrieve_for_module()
2016-09-19 11:25:36 +02:00
fd41fe5998
Fix Store::delete() for nonexistent IDs
...
If the ID does not exist, we should return an error instead of doing
nothing, shouldn't we?
2016-09-19 11:07:38 +02:00
8345ff8248
Add test to delete non-existent entries
2016-09-19 11:03:38 +02:00
52b2a4589d
Add test to get non-existent entries
2016-09-19 11:01:56 +02:00
de6b641201
Merge branch 'master' into libimagstorestdhook/git-integration
...
This is a integration-merge, because the libimagstorestdhook/git branch
got really long and rebasing is not an option, as it would mainly
destroy history.
Using an integration branch is less hassle, really.
2016-09-19 10:44:57 +02:00
85097554e9
Add hook implementation for succeeding hook tests
2016-09-19 10:38:46 +02:00
0cdeeb4c55
Fix test backend implementation
...
We must return an error if the file is not found here.
This is because if we unwrap() here, we panic if the store action was
Store::retrieve() and there wasn't a file there. We then unwrap() on
None and panic because of this, causing all other tests to panic as
well because the Mutex gets corrupted.
The store handles FileNotFound errors on its own, so it is safe to
return the error here.
2016-09-19 10:37:28 +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
ff5a4b46c7
Remove StoreId::is_file()
2016-09-09 12:56:29 +02:00
21714660df
Merge pull request #729 from matthiasbeyer/fix-header-missing-newline
...
Add newline before header
2016-09-09 12:54:28 +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
88ff94fb6d
Remove StoreId::is_dir()
2016-09-08 15:05:25 +02:00
3252f9b751
Move Update-Hook execution into Store._update()
2016-09-08 14:23:10 +02:00
d1fee32c7d
Just do not execute mutable hooks, but let pass the nonmutables
2016-09-07 22:05:30 +02:00
af4a0bfaf2
Export result-helper here
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
aa7e050436
Merge pull request #707 from matthiasbeyer/libimagstore/remove-storeid-storified
...
Remove StoreId::storified()
2016-09-06 12:31:01 +02:00
d7447a64c8
Remove StoreId::storified()
2016-09-06 09:37:25 +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
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
Kai Sickeler
16935d9153
Upgrade toml dependency to 0.2
2016-08-06 17:22:39 +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
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
2016-08-02 18:59:17 +02:00
ea17755ad4
Fix possible w-lock panic
...
for a detailed explanation have a look at
7b5d37a039
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
9337a14cdd
Update all version strings: 0.1.0 -> 0.2.0
2016-07-12 11:51:20 +02: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
2016-07-04 12:45:17 +02:00
41d7d1c213
Store::create() Make outgoing storeid object unstorified
2016-07-04 12:44:58 +02:00
9f213ddc31
Add error kind for storeid handling errors
2016-07-04 12:44:58 +02:00
37380c84b9
Add StoreId::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
ea4487a481
Impl Display for StoreId
2016-06-30 11:02:58 +02:00
45a24de853
store.rs: Replace error boxing and wrapping with result helper from libimagerror
2016-06-27 18:16:43 +02:00
484520842a
lazyfile.rs: Replace error boxing and creation by call to new helper function
2016-06-27 18:00:12 +02:00
0a05b9825c
call helper generator macros in error module
2016-06-27 17:59:46 +02:00
55e6c29275
Add another level of error enclosure
2016-06-08 15:11:53 +02:00
e75b524e53
Add error kinds for Move functions
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
