matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Outsource header/content parsing from store.rs to util.rs for reusability

Browse source
This commit is contained in:
Matthias Beyer 2017-06-18 00:50:18 +02:00
parent 91c427925b
commit c013ca8025
2 changed files with 39 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libimagstore/src/store.rs
View file

@ -24,7 +24,6 @@ use std::result::Result as RResult;
use std::sync::Arc; use std::sync::Arc;
use std::sync::RwLock; use std::sync::RwLock;
use std::io::Read; use std::io::Read;
use std::convert::From;
use std::convert::Into; use std::convert::Into;
use std::ops::Deref; use std::ops::Deref;
use std::ops::DerefMut; use std::ops::DerefMut;
@ -33,7 +32,6 @@ use std::fmt::Debug;
use std::fmt::Error as FMTError; use std::fmt::Error as FMTError;
use toml::Value; use toml::Value;
use regex::Regex;
use glob::glob; use glob::glob;
use walkdir::WalkDir; use walkdir::WalkDir;
use walkdir::Iter as WalkDirIter; use walkdir::Iter as WalkDirIter;
@ -919,33 +917,14 @@ impl Entry {
/// - Header cannot be parsed into a TOML object /// - Header cannot be parsed into a TOML object
/// ///
pub fn from_str<S: IntoStoreId>(loc: S, s: &str) -> Result<Entry> { pub fn from_str<S: IntoStoreId>(loc: S, s: &str) -> Result<Entry> {
debug!("Building entry from string"); use util::entry_buffer_to_header_content;
lazy_static! {
static ref RE: Regex = Regex::new(r"(?smx)
^---$
(?P<header>.*) # Header
^---$\n
(?P<content>.*) # Content
").unwrap();
}
let matches = match RE.captures(s) { let (header, content) = try!(entry_buffer_to_header_content(s));
None => return Err(SE::new(SEK::MalformedEntry, None)),
Some(s) => s,
};
let header = match matches.name("header") {
None => return Err(SE::new(SEK::MalformedEntry, None)),
Some(s) => s
};
let content = matches.name("content").map(|r| r.as_str()).unwrap_or("");
debug!("Header and content found. Yay! Building Entry object now");
Ok(Entry { Ok(Entry {
location: try!(loc.into_storeid()), location: try!(loc.into_storeid()),
header: try!(Value::parse(header.as_str())), header: header,
content: String::from(content), content: content,
}) })
} }

35
libimagstore/src/util.rs
View file

@ -17,6 +17,15 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
// //
use regex::Regex;
use toml::Value;
use libimagerror::into::IntoError;
use store::Result;
use error::StoreErrorKind as SEK;
use toml_ext::Header;
#[cfg(feature = "early-panic")] #[cfg(feature = "early-panic")]
#[macro_export] #[macro_export]
macro_rules! if_cfg_panic { macro_rules! if_cfg_panic {
@ -33,3 +42,29 @@ macro_rules! if_cfg_panic {
($fmt:expr, $($arg:tt)+) => { }; ($fmt:expr, $($arg:tt)+) => { };
} }
pub fn entry_buffer_to_header_content(buf: &str) -> Result<(Value, String)> {
debug!("Building entry from string");
lazy_static! {
static ref RE: Regex = Regex::new(r"(?smx)
^---$
(?P<header>.*) # Header
^---$\n
(?P<content>.*) # Content
").unwrap();
}
let matches = match RE.captures(buf) {
None => return Err(SEK::MalformedEntry.into_error()),
Some(s) => s,
};
let header = match matches.name("header") {
None => return Err(SEK::MalformedEntry.into_error()),
Some(s) => s
};
let content = matches.name("content").map(|r| r.as_str()).unwrap_or("");
Ok((try!(Value::parse(header.as_str())), String::from(content)))
}