Commit Graph

502 Commits

Author SHA1 Message Date
Matthias Beyer 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
Matthias Beyer 07ff755ed7 Minify error handling in Store::_update with try!() 2016-09-18 14:52:55 +02:00
Matthias Beyer b288e938f9 Minify error handling in Store::update() 2016-09-18 14:52:00 +02:00
Matthias Beyer 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
Matthias Beyer ff5a4b46c7 Remove StoreId::is_file() 2016-09-09 12:56:29 +02:00
Matthias Beyer 21714660df Merge pull request #729 from matthiasbeyer/fix-header-missing-newline
Add newline before header
2016-09-09 12:54:28 +02:00
Matthias Beyer 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
Matthias Beyer 88ff94fb6d Remove StoreId::is_dir() 2016-09-08 15:05:25 +02:00
Matthias Beyer 3252f9b751 Move Update-Hook execution into Store._update() 2016-09-08 14:23:10 +02:00
Matthias Beyer d1fee32c7d Just do not execute mutable hooks, but let pass the nonmutables 2016-09-07 22:05:30 +02:00
Matthias Beyer af4a0bfaf2 Export result-helper here 2016-09-06 15:31:55 +02:00
Matthias Beyer 5f04d29345 Adapt store to not use StoreId::into() but new StoreId::into_pathbuf() 2016-09-06 15:31:55 +02:00
Matthias Beyer a313cede06 Add StoreId::into_pathbuf() 2016-09-06 15:31:55 +02:00
Matthias Beyer b8f612632d Add error kind if StoreId has no base part 2016-09-06 15:31:29 +02:00
Matthias Beyer 84b279de95 Remove Into<PathBuf> for StoreId 2016-09-06 15:31:29 +02:00
Matthias Beyer aa7e050436 Merge pull request #707 from matthiasbeyer/libimagstore/remove-storeid-storified
Remove StoreId::storified()
2016-09-06 12:31:01 +02:00
Matthias Beyer d7447a64c8 Remove StoreId::storified() 2016-09-06 09:37:25 +02:00
Matthias Beyer 364ad01179 Use StoreId::from_full_path() in GlobStoreIdIterator::next() 2016-09-05 18:22:55 +02:00
Matthias Beyer 8362b077e2 Add StoreId::from_full_path() 2016-09-05 18:21:34 +02:00
Matthias Beyer f60afa581c Add error type for failed build of StoreId object from full path 2016-09-05 18:21:21 +02:00
Matthias Beyer 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
Matthias Beyer 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
Matthias Beyer 253c8a6f54 Adapt tests for new StoreId::is_in_collection() interface 2016-09-03 19:32:27 +02:00
Matthias Beyer 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
Matthias Beyer 85f79ae3e5 Replace .map().all(|x| x) by calling .all() in the first place 2016-09-02 17:01:40 +02:00
Matthias Beyer 4896c14086 Merge pull request #681 from matthiasbeyer/rewrite-storeid-type-cleanup-libimagentrylink
libimagentrylink cleanup
2016-09-02 08:25:10 +02:00
Matthias Beyer 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
Matthias Beyer 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
Matthias Beyer 82f08c6021 Remove version argument from module_entry_path_mod!() macro 2016-08-30 11:40:56 +02:00
Matthias Beyer ec2eb096e7 Remove id part from macro 2016-08-30 11:40:56 +02:00
Matthias Beyer fedb75ec98 Impl IntoStoreId for PathBuf, using StoreId::new_baseless() 2016-08-28 18:41:56 +02:00
Matthias Beyer 5462714fcc Remove libimagstore::storeid::build_entry_path() 2016-08-28 18:41:56 +02:00
Matthias Beyer d252623b75 Add StoreId::components() to get components of StoreId "id" part 2016-08-28 18:41:55 +02:00
Matthias Beyer 197940ac33 Fixup Store test implementations 2016-08-28 18:41:55 +02:00
Matthias Beyer d538a5b380 Fixup StoreId test 2016-08-28 18:41:55 +02:00
Matthias Beyer fd1a96fa74 Fix storification of StoreId in CRUD functions 2016-08-28 18:41:55 +02:00
Matthias Beyer 4c435d9347 Add StoreId::with_base() 2016-08-28 18:41:54 +02:00
Matthias Beyer 784f1cc4c6 Fix interface of IntoStoreId trait to return Result<StoreId> and impls 2016-08-28 18:41:54 +02:00
Matthias Beyer 40f1efa258 Fix for new StoreId interface in Iterator for Walk impl 2016-08-28 18:41:54 +02:00
Matthias Beyer a110ecc2ec Fix GlobStoreIdIterator implementation for new StoreId interface 2016-08-28 18:41:54 +02:00
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