matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Add Store::load_by_hash()

Browse source
This commit is contained in:
Matthias Beyer 2015-12-28 15:00:02 +01:00
parent 5a55636c65
commit 3a5bb3a5ce
1 changed files with 16 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/storage/mod.rs
View file

@ -187,48 +187,27 @@ impl Store {
-> Option<Rc<RefCell<File>>> -> Option<Rc<RefCell<File>>>
where HP: FileHeaderParser where HP: FileHeaderParser
{ {
macro_rules! try_some {
($expr:expr) => (match $expr {
::std::option::Option::Some(val) => val,
::std::option::Option::None => return ::std::option::Option::None,
});
($expr:expr => return) => (match $expr {
::std::option::Option::Some(val) => val,
::std::option::Option::None => return,
})
}
use glob::{glob, Paths, PatternError}; use glob::{glob, Paths, PatternError};
let hashstr : String = hash.into(); let hashstr : String = hash.into();
let globstr = format!("{}/*-{}.imag", self.storepath, hashstr); let globstr = format!("{}/*-{}.imag", self.storepath, hashstr);
debug!("glob({})", globstr);
let globs = glob(&globstr[..]); glob(&globstr[..]).map(|paths| {
if globs.is_err() { // We assume there is only one ... TODO: Check whether there is actually just one
return None; paths.last().map(|path| {
} if let Ok(pathbuf) = path {
let fname = pathbuf.file_name().and_then(|s| s.to_str());
let path = globs.unwrap().last(); fname.map(|s| {
debug!("path = {:?}", path); FileID::parse(&String::from(s)).map(|id| {
self.load_in_cache(m, parser, id).map(|file| {
let pathbuf = try_some!(path); return Some(file)
if pathbuf.is_err() { return None; } })
});
let pathbuf_un = pathbuf.unwrap(); });
let filename = pathbuf_un.file_name(); }
let s = try_some!(filename).to_str(); })
let string = String::from(try_some!(s)); });
let id = try_some!(FileID::parse(&string)); None
debug!("Loaded ID = '{:?}'", id);
self.load_in_cache(m, parser, id)
.map(|file| {
debug!("Loaded File = '{:?}'", file);
Some(file)
}).unwrap_or(None)
} }
pub fn remove(&self, id: FileID) -> bool { pub fn remove(&self, id: FileID) -> bool {