Commit graph

438 commits

Author SHA1 Message Date
872114d86f FileLockEntry: Derive Debug 2016-04-20 21:46:02 +02:00
01c226f0ca Revert change to unwrap_err() here, trait bounds not fulfilled 2016-04-20 21:46:02 +02:00
0bb40fca11 libimagstore: Replace .err().unwrap() with .unwrap_err() 2016-04-20 21:46:01 +02:00
144c42aee5 libimagstore Update regex 0.1.x -> 0.1.* 2016-04-17 21:00:31 +02:00
6a407365bd Enhance store config errors by printing (println) 2016-03-26 15:28:35 +01:00
b7aac5e275 Remove aspects which were removed in #277 2016-03-26 15:03:34 +01:00
4a3fdfe862 Merge pull request #288 from matthiasbeyer/libimagstore/fix-wrong-hook-call
Fix wrong hook execution: post-retrieve
2016-03-26 13:57:00 +01:00
9e3de45bdd Merge pull request #281 from matthiasbeyer/per-crate-readme
Per crate readme
2016-03-26 13:56:47 +01:00
94bed5f364 Merge pull request #287 from matthiasbeyer/libimagstore/hooks/fix-missing-tostr-impl
Add missing hook_error_type_as_str() impl
2016-03-26 13:56:43 +01:00
7c276d541d Merge pull request #279 from matthiasbeyer/libimagstore/rewrite-file
Truncate file to zero size before writing new content, so we do not p…
2016-03-26 13:56:06 +01:00
0a181479c8 Merge pull request #277 from matthiasbeyer/libimagstore/remove-unused-aspects
Libimagstore/remove unused aspects
2016-03-26 13:55:46 +01:00
93d7b81dc5 Merge pull request #276 from matthiasbeyer/libimagstore/config-getter
Store::config() added, mainly for debugging use
2016-03-26 13:55:11 +01:00
ad35d0bf50 Add missing hook_error_type_as_str() impl 2016-03-25 19:17:35 +01:00
bb918db5c3 Fix wrong hook execution: post-retrieve 2016-03-25 19:17:19 +01:00
b54576d95d Add README for libimagstore 2016-03-25 15:56:42 +01:00
ab417a17d0 Truncate file to zero size before writing new content, so we do not partially write the file 2016-03-25 15:39:26 +01:00
Kai Sickeler
cdbc0ceae5 Removed unused functions 2016-03-25 15:22:45 +01:00
Kai Sickeler
797a707c8e removed unused Pre- / PostRead aspects 2016-03-25 15:22:45 +01:00
ad18091b88 Store::config() added, mainly for debugging use 2016-03-25 15:15:37 +01:00
c5c60cf36d impl Debug for Store 2016-03-25 13:30:26 +01:00
22052ba9f0 Add some more error types to be more specific about what happened 2016-03-25 13:30:16 +01:00
a96ca837c6 Make HookPosition clonable 2016-03-24 17:57:19 +01:00
2deb98d764 Add deny() so we turn some warnings into errors 2016-03-22 19:44:04 +01:00
c59ed7d2fe Use unused result when file.write_all() and return error 2016-03-22 19:44:04 +01:00
dc7a212278 Use unused result which must be used when file.seek()ing 2016-03-22 19:44:04 +01:00
a45571e299 Remove unused function AspectConfig::config() 2016-03-22 19:44:04 +01:00
8e852384bd Remove unused function from Store 2016-03-22 19:44:04 +01:00
a9eddb088a Remove unused functions from LazyFile
- Remove uses of LazyFile::new() from tests
    - Use LazyFile::get_file_mut() in test as we want the file mut anyways
2016-03-22 19:43:48 +01:00
af161394ad Remove dead code in configuration.rs 2016-03-22 19:43:48 +01:00
a4c820d308 Remove unused keyword "mut" 2016-03-22 19:43:48 +01:00
8aa3f31970 Remove unused variables 2016-03-22 19:43:48 +01:00
2fb59b3ae6 Remove unused imports 2016-03-22 19:43:48 +01:00
041a2a4942 Add encoding error if typeconversion fails 2016-03-19 15:15:04 +01:00
fe0849f8eb Add implementation for Store::retrieve_for_module() 2016-03-19 15:15:04 +01:00
80945fcd16 Rewrite build_entry_path() so it does not panic!() anymore 2016-03-19 14:48:09 +01:00
b8b49b3240 Move: build_entry_path() from imag-store to libimagstore 2016-03-19 14:47:45 +01:00
65a64774b6 Fix: Allow NonMutableAccess in MutableHookDataAcessor 2016-03-16 16:46:54 +01:00
feac9ae9e8 Store::new(): Aspect configuration added 2016-03-16 16:46:54 +01:00
96deb17515 Aspect: Optionally get configuration 2016-03-16 16:46:54 +01:00
f1246093f1 Implement AspectConfig::get_for() 2016-03-16 16:46:54 +01:00
08b36972f1 Make store configuration optional 2016-03-16 16:46:54 +01:00
0286d8a25e Store: Add hook configuration on registration 2016-03-16 16:46:54 +01:00
59fdb7ef3d Store: Get configuration object not as reference, to avoid livetimes 2016-03-16 16:46:54 +01:00
6dae03d731 Hook: Must provide name, gets reference to configuration 2016-03-16 16:46:54 +01:00
9961f64ce6 Add AspectConfig type 2016-03-16 16:46:53 +01:00
c942c74f05 Implement getter for aspect names 2016-03-16 16:46:53 +01:00
d249f604d8 Implement: config_is_valid() 2016-03-16 16:46:53 +01:00
cd55e7d625 Add Aspect building based on configuration 2016-03-16 16:46:53 +01:00
1fe545eb8b Add configuration.rs 2016-03-16 16:46:53 +01:00
a771db9ea4 Add error kind for config errors 2016-03-16 16:46:53 +01:00
9e8ef57f72 Remove {Pre, Post}HookErrorKind types as they are not needed anymore 2016-03-16 16:46:53 +01:00
987b271cc7 Add access type checking error 2016-03-16 16:46:53 +01:00
5ba260943b Make hook execution parallel for NonMutableHookDataAccessor impl for Aspect 2016-03-16 16:46:53 +01:00
7102a57808 Make hook execution parallel for StoreIdAccessor impl for Aspect 2016-03-16 16:46:53 +01:00
d8760c9737 Impl NonMutableHookDataAccessor::access() for Aspect 2016-03-16 16:46:53 +01:00
c4c02f2274 Impl MutableHookDataAccessor::access_mut() for Aspect 2016-03-16 16:46:53 +01:00
2022f4e4bb Impl StoreIdAccessor::access() for Aspect 2016-03-16 16:46:53 +01:00
2c544382a1 We do not need boxes here 2016-03-16 16:46:53 +01:00
679865464b Reimplement hook registration and execution 2016-03-16 16:46:52 +01:00
d6a581e69f Add HookPosition enum 2016-03-16 16:46:52 +01:00
37a505609e Remove hook traits. There can only be one trait: Hook 2016-03-16 16:46:52 +01:00
be1ba5be4b Add Aspect type for hook system 2016-03-16 16:46:52 +01:00
3e62b71605 Add StoreIdAccessor trait 2016-03-16 16:46:52 +01:00
fa9e8e8192 Split hook/mod.rs into several files 2016-03-16 16:46:52 +01:00
3f15fd0fa8 Move hook.rs -> hook/mod.rs 2016-03-16 16:46:52 +01:00
a9600f23b3 Threaded hook execution 2016-03-16 16:46:52 +01:00
79ba3f5151 Hook calling rewrite 2016-03-16 16:46:52 +01:00
0610f0756a Add dep: crossbeam = 0.2.8 2016-03-16 16:46:52 +01:00
3421e8d4d9 Add HookExecutionError error kind 2016-03-16 16:46:52 +01:00
1c40be78a9 Add HookAccessor types for accessing mutable/nonmutable hook calling in a generic way 2016-03-16 16:46:52 +01:00
e1414beb8d Impl Into<HookError> for error kinds to convert errors in a simple way 2016-03-16 16:46:51 +01:00
57831dceb0 Add HookErrorKind enums for Pre and Post errors 2016-03-16 16:46:51 +01:00
d7733aa13a Make hooks configurable
This introduces the Configurable trait and abstracts the
dependency-traits for each trait over a generic "Hook" trait, which
requires Configurable and Debug to be implemented, but has no own
functions.

Configuring is done _without_ the Runtime object, so we can be sure that
the hooks do not have access to the store object.
2016-03-16 16:46:51 +01:00
d9a4512821 Add debug output for hook exec functions 2016-03-16 16:46:51 +01:00
da3554d98e Add debug output for hook register functions 2016-03-16 16:46:51 +01:00
6af5be15ad Hooks must implement Debug 2016-03-16 16:46:51 +01:00
bb0e7e2468 Implement: execute_post_delete_hooks() 2016-03-16 16:46:51 +01:00
f703e8a4cd Implement: execute_post_update_hooks() 2016-03-16 16:46:51 +01:00
7014256407 Implement: execute_post_retrieve_hooks() 2016-03-16 16:46:51 +01:00
5831d3bc7b Implement: execute_post_create_hooks() 2016-03-16 16:46:51 +01:00
196be30d91 Implement: execute_post_read_hooks() 2016-03-16 16:46:51 +01:00
09acddaef9 Implement: execute_pre_delete_hooks() 2016-03-16 16:46:51 +01:00
5aa663987b Implement: execute_pre_update_hooks() 2016-03-16 16:46:51 +01:00
94128f8bcc Implement: execute_pre_retrieve_hooks() 2016-03-16 16:46:50 +01:00
3244b87c7e Implement: execute_pre_create_hooks() 2016-03-16 16:46:50 +01:00
975a2bc8b9 Implement: execute_pre_read_hooks() 2016-03-16 16:46:50 +01:00
ac280ba616 Insert pre/post hook execution functions 2016-03-16 16:46:50 +01:00
3cf2588104 Add error types for pre/post hooks 2016-03-16 16:39:39 +01:00
17b1d6c390 Redefine hook trait system 2016-03-16 16:39:39 +01:00
001c80b72d Hook: Add traits which must be implemented for Hook 2016-03-16 16:39:39 +01:00
b9127381b8 Add hook registering 2016-03-16 16:39:39 +01:00
d99d25a3e1 Add HookRegisterError kind 2016-03-16 16:39:14 +01:00
e969b8678e Add hook traits 2016-03-16 16:39:14 +01:00
361dec4cec Revert "Check whether the StoreId is inside the store, before doing anything on the FS"
This reverts commit 373502217e.
2016-03-12 16:06:10 +01:00
9a918c9252 Merge pull request #242 from matthiasbeyer/libimagstore/revert-id_in_store-check
Revert "Check whether the StoreId is inside the store, before doing a…
2016-03-11 16:02:11 +01:00
6d7065d10e Fix test: StoreId does not start with "/" anymore 2016-03-10 19:12:00 +01:00
a9a64d4ab6 Fix: implicitely create directories on file saving 2016-03-10 19:06:27 +01:00
a3a09ff4ee Fix store creation of libimagstore
The macro may not prefix the StoreId internal PathBuf with '/', so this
path is not absolute. This way we can introduce `storify_id()` which
creates a proper PathBuf into the store out of our StoreId object.

Does not yet do verification whether the path is inside the store,
actually.
2016-03-10 18:46:26 +01:00
3413646934 Revert "Check whether the StoreId is inside the store, before doing anything on the FS"
This reverts commit 373502217e
as this commit was introducing a bug.

The StoreId type says `/test/example` for a store id path, which is
completely valid, as the root (`/`) is the store itself. The
id_in_store() function assumed that the store-id is the full
(file-system) path to the store entry, which is false.

This commit does not introduce a fix but revert the check.
2016-03-10 18:14:53 +01:00
df1fd31771 libimagstore: Update glob 0.2.10 -> 0.2.11 2016-03-07 17:46:58 +01:00
257fe1880e EntryHeader: Function to get toml object 2016-03-06 11:51:09 +01:00
74634227e0 Use unused result 2016-03-01 21:23:09 +01:00
22e9f8a93b Remove unused import 2016-03-01 21:21:14 +01:00
1a8106dfd2 Add missing error-forwarding 2016-03-01 21:20:53 +01:00
38b9e15615 Remove unreachable statement 2016-03-01 21:19:15 +01:00
08c37c5fcb Remove unused "mut" from EntryHeader::delete() 2016-03-01 21:18:17 +01:00
ed3da38701 Remove unused "mut" from EntryHeader::read_with_sep() 2016-03-01 21:18:10 +01:00
309e70df14 Remove unused "mut" from EntryHeader::set_with_sep() 2016-03-01 21:18:04 +01:00
85e69f083e Remove unused "mut" from EntryHeader::insert_with_sep() 2016-03-01 21:17:49 +01:00
4390c39a6c Remove unused "mut" from Store::delete() 2016-03-01 21:17:40 +01:00
8dfccba0b8 Remove unused "mut" from Store::retrieve_copy() 2016-03-01 21:17:33 +01:00
87bf7854c7 store: Update regex = 0.1.54 2016-02-23 13:13:22 +01:00
df4bc13018 use lazy_static so we do not compile regex multiple times 2016-02-20 21:06:47 +01:00
0cab0f114d Merge pull request #149 from matthiasbeyer/libimagstore/header-field-path-util
Add header field addressing by str
2016-02-14 16:10:56 +01:00
9951422dc4 Impl From<Table> for EntryHeader 2016-02-12 22:07:15 +01:00
794e7617e3 Impl Into<Table> for EntryHeader 2016-02-12 22:02:33 +01:00
df9313c599 Add EntryHeader::insert_with_sep() 2016-02-12 21:57:53 +01:00
54ba22d0ef Add EntryHeader::set_with_sep() 2016-02-12 21:56:48 +01:00
bca0143343 Add EntryHeader::read_with_sep() which allows seperator modification 2016-02-12 21:55:06 +01:00
a4fa1bac07 Add split-char setting 2016-02-12 21:50:44 +01:00
6397068ddc Add test for EntryHeader::delete() 2016-02-12 20:02:57 +01:00
cb87f31a23 Add EntryHeader::delete() 2016-02-12 20:02:56 +01:00
30e8afeced Add tests for inserting values 2016-02-12 20:02:56 +01:00
965c3445a1 Add test for setting value at new path 2016-02-12 20:02:56 +01:00
dd53e467d7 Add EntryHeader::set() test 2016-02-12 20:02:56 +01:00
b4362f5c65 Alter: EntryHeader should contain a Value, not the BTreeMap<> 2016-02-12 20:02:56 +01:00
74a9b844ca Add debugging output in tests 2016-02-12 20:02:41 +01:00
60ccf58f84 Merge pull request #148 from neithernut/impl-store-retrieve_copy
Implement Store::retrieve_copy()
2016-02-12 18:59:56 +01:00
103a0dea17 Add test: EntryHeader::read() 2016-02-11 15:45:48 +01:00
731a446546 Implement EntryHeader::read() 2016-02-11 15:45:47 +01:00
548aee8d5f Implement EntryHeader::set() 2016-02-11 15:45:47 +01:00
4d94f8a67f Implement: EntryHeader::insert() 2016-02-11 15:45:47 +01:00
3b09e0c214 Move helper functions outside of walk_header(), so we can use them 2016-02-11 15:45:47 +01:00
42aade5cef Add tests for path-to-value extractor functionality 2016-02-11 15:43:58 +01:00
4759076249 Implement walk_header() 2016-02-11 15:43:58 +01:00
a2e3598c01 Add more error types for header walking 2016-02-11 15:43:58 +01:00
0727fca797 Add tokenizer helper function 2016-02-11 15:43:58 +01:00
2f6cfb5868 Add interface for header field addressing by str 2016-02-11 15:43:58 +01:00
00ccc22ef5 Add some debugging output for {create,retrieve,delete} 2016-02-09 20:09:12 +01:00
d85f985694 Fixup path-includes-path checker 2016-02-09 20:08:58 +01:00
ddd54e03ad Add store path getter 2016-02-09 13:45:13 +01:00
a0afc9245b Merge pull request #186 from TheNeikos/verify-toml_table
Verify that nothing but tables exist in base table
2016-02-07 01:54:35 +01:00
ebb076c9fd Merge pull request #184 from matthiasbeyer/libimagstore/fix-179
Check whether the StoreId is inside the store
2016-02-07 01:45:48 +01:00
Marcel Müller
e315fa9dcf
Remove unwrap in drop and warn users 2016-02-07 01:28:16 +01:00
Marcel Müller
9ba2439da3
Add debug output 2016-02-07 01:28:15 +01:00
Marcel Müller
6173cff762
Verify that nothing but tables exist in base table 2016-02-07 01:27:50 +01:00
Marcel Müller
293fd0da00
Add verify 2016-02-06 18:57:39 +01:00
Marcel Müller
e079628397
Remove unneeded closure 2016-02-06 18:52:17 +01:00
373502217e Check whether the StoreId is inside the store, before doing anything on the FS 2016-02-06 18:48:59 +01:00
eb0d1dba69 Merge pull request #176 from matthiasbeyer/update-crate-version
libimagstore: Update dep: version: 1.1.0 -> 2.0.1
2016-02-05 22:04:27 +01:00
ddd61f9c1f libimagstore: Update dep: version: 1.1.0 -> 2.0.1 2016-02-05 21:53:26 +01:00
959a68f1a6 Merge pull request #153 from matthiasbeyer/libimagstore/add-debugging-output
Libimagstore/add debugging output
2016-02-05 16:03:23 +01:00
0931ede580 Merge pull request #165 from matthiasbeyer/remove-unused-imports
Remove unused imports
2016-01-30 13:47:57 +01:00
213cb32a88 Fix: Add EntryHeader::toml_mut() 2016-01-30 12:38:36 +01:00
f6e03c804e store/store: Remove unused imports 2016-01-29 23:06:15 +01:00
814e85508b store/error: Remove unused imports 2016-01-29 23:06:04 +01:00
33b6a89a02 Merge pull request #156 from matthiasbeyer/libimagstore/fix-private-intostoreid
Fix: Make IntoStoreId public
2016-01-29 19:11:03 +01:00
618d39cf7c Merge pull request #155 from matthiasbeyer/libimagstore/fix-missing-doc
Fix: Add missing documentation for mod module_path
2016-01-29 19:10:56 +01:00
fbb296495b Merge pull request #154 from matthiasbeyer/libimagstore/fix-152
Fix: negation error
2016-01-29 19:10:51 +01:00
72cf550c9f Fix: seek() file back on reading it 2016-01-29 18:17:41 +01:00
69bebfcfc0 Fix: Make IntoStoreId public 2016-01-29 17:03:24 +01:00
c64cdad63b Fix: Add missing documentation for mod module_path 2016-01-29 17:03:05 +01:00
38791ea2f9 Fix: negation error
Suggested-by: Marcel Müller <neikos@neikos.email>
2016-01-29 16:53:13 +01:00
3b51328aa7 Merge pull request #145 from neithernut/fix-store-retrieve
Fix Store::retrieve()
2016-01-29 16:29:38 +01:00
b04c676eb9 Add store debugging output 2016-01-28 21:06:49 +01:00
4bc905c692 Add debug output for LazyFile::{get_file_mut,create_file}() 2016-01-28 21:00:33 +01:00
2c398d941b Let LazyFile derive Debug 2016-01-28 21:00:13 +01:00
88f6086c97 Add dep: log = 0.3.5 2016-01-28 20:59:43 +01:00
Julian Ganz
c6ec47a8af Change status _after_ calling StoreEntry::get_entry()
StoreEntry::get_entry() will return an error if the store entry's status
is "borrowed".
2016-01-28 20:47:34 +01:00
Julian Ganz
355ec697c1 Implement Store::retrieve_copy() 2016-01-25 22:26:00 +01:00
Julian Ganz
1085127036 Add missing error handling
We don't want to panick if a lock inside the store is broken. We want to
notify the user, so she can start panicking.
2016-01-25 20:38:45 +01:00
6c53f172dc Minify implementation of Store::retrieve() 2016-01-25 15:32:50 +01:00
Julian Ganz
540348380e Mark store entry as borrowed 2016-01-25 12:34:37 +01:00
Julian Ganz
86ab4ba4b1 Slimline translation from entry to file lock entry 2016-01-25 12:32:30 +01:00
Julian Ganz
9760f72e79 get_entry() already asserts the entry is not borrowed 2016-01-25 12:31:22 +01:00
Julian Ganz
acfbb16eb2 Fix Store::retrieve()
The previous version of `Store::retrieve()` required the entry to be
already registered in the store's hashmap.
2016-01-24 22:57:11 +01:00
4a08eed700 Merge pull request #144 from matthiasbeyer/libimagstore/add-missing-pub
Fix: Add missing "pub" on Entry functions
2016-01-24 20:29:11 +01:00
82873d82ba Merge pull request #143 from TheNeikos/add-store_update
Implement storenetry:write_entry
2016-01-24 20:25:57 +01:00
d24f661778 Fix: Add missing "pub" on Entry functions 2016-01-24 20:20:43 +01:00
Marcel Müller
4e990465c8
Implement storeentry:write_entry 2016-01-24 20:05:33 +01:00
bbd08d9526 Add Store::retrieve_for_module() 2016-01-24 17:40:06 +01:00
36770abac5 Add iterator type for StoreId 2016-01-24 17:39:41 +01:00
e951666e3d Use glob 2016-01-24 17:39:41 +01:00
1d69aa5066 Add dep: glob = 0.2.10 2016-01-24 17:39:41 +01:00
Marcel Müller
ee8cf35fcc
Implement store::create 2016-01-24 17:34:29 +01:00
Marcel Müller
c7f584a81a
Add from_str to Entry 2016-01-24 17:04:33 +01:00
Marcel Müller
fdc3dde95b
Change names to reflect changes 2016-01-24 17:04:33 +01:00
Marcel Müller
15931d3471
Remove EntryHeader::new_current 2016-01-24 17:04:33 +01:00
Marcel Müller
a64ffdfc56
Implement entry reading 2016-01-24 17:04:33 +01:00
Marcel Müller
97b7090824
Partially implement get_entry 2016-01-24 17:04:33 +01:00
Marcel Müller
50413101c4
Move entry, content and header into store 2016-01-24 17:04:32 +01:00
Marcel Müller
ba2e52788b
Add entry_creation 2016-01-24 17:04:32 +01:00
Marcel Müller
d949cddc65
Implement Store::retrieve 2016-01-24 17:04:32 +01:00
24ebe6736e Merge pull request #114 from matthiasbeyer/libimagstore/store-new-behaviour
Store::new(): Create path if nonexistent
2016-01-23 19:57:44 +01:00
796cd01343 Init the header with default values 2016-01-23 16:41:22 +01:00
38292ea8cb Dont pass the table to the header object, but generate it in ::new() 2016-01-23 16:40:00 +01:00
c48f3afcf4 Return error if create() fails 2016-01-23 11:57:40 +01:00
0c3bcc3f15 Add error kind: Create errors 2016-01-23 11:57:40 +01:00
80b0501d03 Introduce error if the store path exists but is a file 2016-01-23 11:57:40 +01:00
4f71563eb4 Store::new(): Create path if nonexistent 2016-01-23 11:57:40 +01:00