Commit Graph

562 Commits

Author SHA1 Message Date
Matthias Beyer 151877d95d Fix impl Drop for Store for new StoreId interface 2016-08-28 18:41:54 +02:00
Matthias Beyer d5723791a6 Add StoreId::without_base() 2016-08-28 18:41:54 +02:00
Matthias Beyer ab23d04e04 Add StoreId::new_baseless() 2016-08-28 18:41:54 +02:00
Matthias Beyer d1f07cd087 Add check in StoreId::new() whether the local part is absolute 2016-08-28 18:41:54 +02:00
Matthias Beyer ccc2b6b735 Add error kind for StoreId::new() with id-part that is absolute 2016-08-28 18:41:54 +02:00
Matthias Beyer 5b23059d93 Fix scoping 2016-08-28 18:41:54 +02:00
Matthias Beyer 3c1be0fbe9 Fix use of store ids when passing to FileAbstraction::* 2016-08-28 18:41:54 +02:00
Matthias Beyer 111cb4f29a Add StoreId::to_str() -> String 2016-08-28 18:41:54 +02:00
Matthias Beyer aa6f220659 Fix GlobStoreIterator type implementation
... to use new StoreId interface
2016-08-28 18:41:53 +02:00
Matthias Beyer 3f88c27834 Remove unused imports 2016-08-28 18:41:53 +02:00
Matthias Beyer 9cf7897286 Fixup Walk type to handle StoreId properly 2016-08-28 18:41:53 +02:00
Matthias Beyer 1de09f1606 Rewrite StoreId::storified() 2016-08-28 18:41:53 +02:00
Matthias Beyer 1af3ab018b Use StoreId::new() in macro 2016-08-28 18:41:53 +02:00
Matthias Beyer fe73a53d44 Add StoreId::new() 2016-08-28 18:41:53 +02:00
Matthias Beyer 8dff5685fd Make StoreId.base optional 2016-08-28 18:41:53 +02:00
Matthias Beyer ad92b05fb4 Remove IntoStoreId for PathBuf 2016-08-28 18:41:53 +02:00
Matthias Beyer adf213bbc7 Remove From<PathBuf> for StoreId 2016-08-28 18:41:53 +02:00
Matthias Beyer cf84df3ce7 Remove From<String> for StoreId 2016-08-28 18:41:53 +02:00
Matthias Beyer bcd917055d Remove AsRef<Path> for StoreId 2016-08-28 18:41:53 +02:00
Matthias Beyer 30a76d57f6 Remove Borrow<Path> for StoreId 2016-08-28 18:41:53 +02:00
Matthias Beyer 8c5a427a01 Rewrite Borrow<Path> for StoreId 2016-08-28 18:41:52 +02:00
Matthias Beyer 55953cfe5b Rewrite AsRef<Path> for StoreId 2016-08-28 18:41:52 +02:00
Matthias Beyer 1d165f6fc2 Remove Deref for StoreId but provide basic functions within the type 2016-08-28 18:41:52 +02:00
Matthias Beyer 69b3f6bf87 Rewrite Display for StoreId 2016-08-28 18:41:52 +02:00
Matthias Beyer fb1df533c5 Rewrite Into<PathBuf> for StoreId 2016-08-28 18:41:52 +02:00
Matthias Beyer 6841b7c340 Rewrite StoreId::storified() 2016-08-28 18:41:52 +02:00
Matthias Beyer 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
Matthias Beyer 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
Matthias Beyer 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
Matthias Beyer 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
Matthias Beyer 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
Matthias Beyer 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
Matthias Beyer 0ba67f7873 Check whether implictely creating the store path is allowed 2016-07-25 17:02:38 +02:00
Matthias Beyer 4d650a63f7 Add error kind for implicit create denied 2016-07-25 17:02:38 +02:00
Matthias Beyer 442b1537be Add helper to check config for implicit-create 2016-07-25 17:02:38 +02:00
Matthias Beyer cdf6bc6fa5 Make warning more verbose, tell what kind of variable cannot be fetched 2016-07-18 15:44:34 +02:00
Matthias Beyer ce766427da Merge pull request #561 from matthiasbeyer/libimagstore/verify
Libimagstore/verify
2016-07-17 13:03:54 +02:00
Matthias Beyer 6b1fdfbc1d Add Store::verify() 2016-07-17 00:59:04 +02:00
Matthias Beyer bb8dad256c Fix comment how config has to look 2016-07-16 22:17:05 +02:00
Matthias Beyer 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
Matthias Beyer b81750ba09 Add interface for custom error data type 2016-07-16 16:52:02 +02:00
Matthias Beyer 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
Matthias Beyer 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
Matthias Beyer 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
Matthias Beyer 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
Matthias Beyer 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
Matthias Beyer 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
Matthias Beyer 6a85760feb Debug output in MutableHookDatsaAccessor impl for Aspect 2016-07-16 01:15:08 +02:00
Matthias Beyer 8de32622b9 Add more error levels in hook execution error wrapping 2016-07-16 00:57:33 +02:00
Matthias Beyer ded6a3f240 Add error output in Aspect execution code 2016-07-16 00:57:20 +02:00
Matthias Beyer c8edb2102f Fix AspectConfig::get_for() implementation 2016-07-16 00:33:54 +02:00
Matthias Beyer 32617d0a16 Add debug config when getting configuration for a hook 2016-07-16 00:32:58 +02:00
Matthias Beyer 33771f3903 Add debugging output when setting hook configuration 2016-07-16 00:32:54 +02:00
Matthias Beyer 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
Matthias Beyer 9337a14cdd Update all version strings: 0.1.0 -> 0.2.0 2016-07-12 11:51:20 +02:00
Matthias Beyer 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
Matthias Beyer 7818b523b9 Deny mutable access for hooks if the config says so 2016-07-07 20:29:24 +02:00
Matthias Beyer eb31da70d1 Remove import: trace_error() function 2016-07-07 17:03:20 +02:00
Matthias Beyer 7f14639c1e Add configuration parsing/getter for denying of mutable hooks 2016-07-06 19:10:17 +02:00
Matthias Beyer b4b719b753 Add error kind for denied hooks 2016-07-06 19:09:58 +02:00
Matthias Beyer 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
Matthias Beyer 580ea28877 Fix Display impl for StoreId by using lossy string rep if PathBuf::to_str() fails 2016-07-05 13:47:58 +02:00
Matthias Beyer d7f22020e6 Merge pull request #489 from matthiasbeyer/libimagstore/storify-id
Libimagstore/storify
2016-07-04 19:26:42 +02:00
Matthias Beyer 9605d6daa6 Ensure that StoreId::storified() does not alter already storified StoreId objects 2016-07-04 12:49:12 +02:00
Matthias Beyer a706680fd5 Revert "Store::create() Make outgoing storeid object unstorified"
This reverts commit 41d7d1c213.
2016-07-04 12:46:06 +02:00
Matthias Beyer 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
Matthias Beyer 41d7d1c213 Store::create() Make outgoing storeid object unstorified 2016-07-04 12:44:58 +02:00
Matthias Beyer 9f213ddc31 Add error kind for storeid handling errors 2016-07-04 12:44:58 +02:00
Matthias Beyer 37380c84b9 Add StoreId::unstorified() 2016-07-04 12:44:58 +02:00
Matthias Beyer 12b8f8f331 Move storification of StoreId object to new StoreId::storified() func 2016-07-02 17:52:12 +02:00
Matthias Beyer ea4487a481 Impl Display for StoreId 2016-06-30 11:02:58 +02:00
Matthias Beyer 45a24de853 store.rs: Replace error boxing and wrapping with result helper from libimagerror 2016-06-27 18:16:43 +02:00
Matthias Beyer 484520842a lazyfile.rs: Replace error boxing and creation by call to new helper function 2016-06-27 18:00:12 +02:00
Matthias Beyer 0a05b9825c call helper generator macros in error module 2016-06-27 17:59:46 +02:00
Matthias Beyer 55e6c29275 Add another level of error enclosure 2016-06-08 15:11:53 +02:00
Matthias Beyer e75b524e53 Add error kinds for Move functions 2016-06-08 15:11:53 +02:00
Matthias Beyer 84a0778a5b Refactor: Use helper function for equal codelines 2016-06-08 15:08:06 +02:00
Matthias Beyer 3c40df1ae7 Add Store::save_to() to create a copy of an entry 2016-06-08 15:08:06 +02:00
Matthias Beyer 2ce84a3dbf Add {Pre, Post}Move hooks 2016-06-08 15:08:00 +02:00
Matthias Beyer 12cac663d0 Implement save_as() 2016-06-08 14:03:17 +02:00
Matthias Beyer f885e6c80b Implement move_by_id() 2016-06-08 14:03:17 +02:00
Matthias Beyer 5b16771f4f Add (unimplemented) functions for moving store entries 2016-06-08 14:02:52 +02:00
Matthias Beyer 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
Matthias Beyer 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
Matthias Beyer 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
Matthias Beyer 55e5255293 Remove duplicated StoreId member in FileLockEntry, use member from Entry 2016-05-29 00:01:05 +02:00
Matthias Beyer ce12a22ef5 Merge pull request #440 from matthiasbeyer/libimagstore/load-unload-hooks
Libimagstore/load unload hooks
2016-05-28 23:59:32 +02:00
Matthias Beyer 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
Matthias Beyer 812379c46d Hook data accessors should implement Debug 2016-05-28 23:47:13 +02:00
Matthias Beyer d85f747066 Add a set of error kinds to identify the store call the error came from 2016-05-28 23:30:50 +02:00
Matthias Beyer a42b6a10db Add error tracing support in Aspect implementation
This removes the parallelization feature from the Aspect codebase as
std::error::Error does not implement Send, so we cannot send the error
from a child thread to a parent thread.

This is clearly not an optimal implementation now, but we have hook
non-aborting-error tracing support, which is more important than
parallelization support, at least in this early stage of development.

An issue has to be opened for re-implementing parallelization of hooks.
2016-05-28 21:08:55 +02:00
Matthias Beyer 6c7d6c29ea Rewrite pre-hook execution 2016-05-28 21:08:55 +02:00
Matthias Beyer eb80714402 HookError: Add optional non-aborting mode 2016-05-28 21:08:07 +02:00
Matthias Beyer 42289a085e Fix glob() pattern 2016-05-28 17:28:38 +02:00
Matthias Beyer a6200b67c0 Merge pull request #446 from matthiasbeyer/libimagstore/fix-get
Fix Store::get()
2016-05-28 10:35:42 +02:00
Matthias Beyer 19aec6327f Fix Store::get() 2016-05-27 23:58:37 +02:00
Matthias Beyer 3d9d5795e4 Rewrite hook error module with error macros 2016-05-27 10:15:29 +02:00
Matthias Beyer cb87b4b5d8 Remove old error code which is unused 2016-05-27 10:13:03 +02:00
Matthias Beyer 183c46a7dd Use Into implementations to convert error kinds into error types 2016-05-27 10:11:51 +02:00
Matthias Beyer e91eb2f55d Use error.into() instead of building full type 2016-05-26 22:19:29 +02:00
Matthias Beyer 5e98bd76b1 Shorten type names in import 2016-05-26 22:19:08 +02:00
Matthias Beyer 25c4bea818 Shorten type names in import 2016-05-26 22:17:08 +02:00
Matthias Beyer fdb5d1bb24 Replace old error construction code with new libimagerror functionality 2016-05-26 22:16:29 +02:00
Matthias Beyer 2ad5cb48aa Implement store-unload hooks 2016-05-26 21:04:04 +02:00
Matthias Beyer f19c057258 Merge pull request #432 from matthiasbeyer/libimagerror/simple-into
libimagerror: Impl Into<error name> for all <errorkindname>
2016-05-24 15:23:08 +02:00
Matthias Beyer 41b5d6d230 Merge pull request #400 from matthiasbeyer/libimagutil/match-helper
Libimagutil/match helper
2016-05-24 14:41:43 +02:00
Matthias Beyer b1f43e3ef5 Impl Into<error name> for all <errorkindname> 2016-05-24 14:31:44 +02:00
Matthias Beyer b6f5b71df1 libimagstore: Refactor code with is_match!() macro 2016-05-23 21:43:20 +02:00
Matthias Beyer f0b665e5f2 libimagstore: Add dependency: libimagutil 2016-05-23 21:43:10 +02:00
Matthias Beyer 80b9cae5fe Merge pull request #391 from matthiasbeyer/libimagstore/get
Libimagstore/get
2016-05-23 20:01:38 +02:00
Matthias Beyer e45d9200bf Adapt error generating code in libimagstore 2016-05-23 17:06:07 +02:00
Matthias Beyer dd7e146081 impl Into<StoreIdIterator> for GlobStoreIdIterator to be able to convert easily 2016-05-23 14:52:32 +02:00
Matthias Beyer 839ec051a4 Add Store::get_all_versions() for getting all versions of a StoreId entry 2016-05-23 14:52:13 +02:00
Matthias Beyer df33dec0c3 Add new error kind: StorePathError 2016-05-23 14:51:39 +02:00
Matthias Beyer b4f17576f6 Add Store::get() for getting or failing if entry does not exist 2016-05-23 14:51:38 +02:00
Matthias Beyer bf14b9ae4e Update dependency: fs2 0.2.2 -> 0.2.* 2016-05-23 13:37:26 +02:00
Matthias Beyer cc8642f54f libimagstore: Replace error module imports with macro helper 2016-05-19 18:22:03 +02:00
Matthias Beyer 42f7e086a3 Replace error code with macro for code generation 2016-05-17 00:26:35 +02:00
Matthias Beyer 627fa7de46 Replace error code with macro for code generation 2016-05-17 00:26:35 +02:00
Matthias Beyer a69fd78058 Add dependency: libimagerror 2016-05-17 00:26:35 +02:00
Matthias Beyer a56f000e3e Remove unneeded scope 2016-05-15 14:02:30 +02:00
Matthias Beyer a26a0645bd Remove iflet by mapping 2016-05-15 14:01:55 +02:00
Matthias Beyer 944a9bf876 Remove unwrap() calls by matching 2016-05-15 14:01:55 +02:00
Matthias Beyer 0b7f815104 Remove unwrap() calls by matching 2016-05-15 14:01:55 +02:00
Matthias Beyer 81810dbcc8 Remove unwrap() calls by matching 2016-05-15 14:01:55 +02:00
Matthias Beyer 604e59ae3c Remove unwrap() calls by matching 2016-05-15 14:01:55 +02:00
Matthias Beyer 2a6e4c62fe Remove unwrap() by matching, remove unneeded deref() 2016-05-15 14:01:55 +02:00
Matthias Beyer 8d9bd5154d Remove unwrap() by matching, remove unneeded deref() 2016-05-15 14:01:55 +02:00
Matthias Beyer a481200c9a Replace unwrap() by matching 2016-05-15 14:01:55 +02:00
Matthias Beyer 1e1cbec98b Replace unwrap() by matching 2016-05-15 14:01:55 +02:00
Matthias Beyer 70b3d3906e Replace unwrap() by matching 2016-05-15 14:01:55 +02:00
Matthias Beyer 1f66f67791 Replaced unwrap() by matching 2016-05-15 14:01:55 +02:00
Matthias Beyer 7b612ce8fb Remove iflet by mapping over Option/Result types 2016-05-15 14:01:55 +02:00
Matthias Beyer f9f5fa5717 Shorten code by using StoreError as SE and StoreErrorKind as SEK 2016-05-15 14:01:55 +02:00