matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Add StoreId::from_full_path()

Browse source
This commit is contained in:
Matthias Beyer 2016-09-05 18:21:34 +02:00
parent f60afa581c
commit 8362b077e2
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libimagstore/src/storeid.rs
View file

@ -1,3 +1,5 @@
use std::ops::Deref;
use std::path::Path;
use std::path::PathBuf; use std::path::PathBuf;
use std::fmt::{Display, Debug, Formatter}; use std::fmt::{Display, Debug, Formatter};
@ -8,6 +10,7 @@ use std::path::Components;
use libimagerror::into::IntoError; use libimagerror::into::IntoError;
use error::StoreErrorKind as SEK; use error::StoreErrorKind as SEK;
use error::MapErrInto;
use store::Result; use store::Result;
use store::Store; use store::Store;
@ -24,6 +27,21 @@ impl StoreId {
StoreId::new_baseless(id).map(|mut sid| { sid.base = base; sid }) StoreId::new_baseless(id).map(|mut sid| { sid.base = base; sid })
} }
/// Try to create a StoreId object from a filesystem-absolute path.
///
/// Automatically creates a StoreId object which has a `base` set to `store_part` if stripping
/// the `store_part` from the `full_path` succeeded.
///
/// Returns a `StoreErrorKind::StoreIdBuildFromFullPathError` if stripping failes.
pub fn from_full_path<D>(store_part: &PathBuf, full_path: D) -> Result<StoreId>
where D: Deref<Target = Path>
{
let p = try!(
full_path.strip_prefix(store_part).map_err_into(SEK::StoreIdBuildFromFullPathError)
);
StoreId::new(Some(store_part.clone()), PathBuf::from(p))
}
pub fn new_baseless(id: PathBuf) -> Result<StoreId> { pub fn new_baseless(id: PathBuf) -> Result<StoreId> {
if id.is_absolute() { if id.is_absolute() {
Err(SEK::StoreIdLocalPartAbsoluteError.into_error()) Err(SEK::StoreIdLocalPartAbsoluteError.into_error())