matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Add dedicated function for creating an entry with content

Browse source
This commit is contained in:
Matthias Beyer 2016-01-31 19:01:40 +01:00
parent 756bd09a83
commit 67a7f1ab78
1 changed files with 39 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
imag-store/src/create.rs
View file

@ -28,13 +28,17 @@ pub fn create(rt: &Runtime) {
let path = build_entry_path(rt, scmd.value_of("path").unwrap()); let path = build_entry_path(rt, scmd.value_of("path").unwrap());
debug!("path = {:?}", path); debug!("path = {:?}", path);
scmd.subcommand_matches("entry") if scmd.subcommand_matches("entry").is_some() {
.map(|entry| create_from_cli_spec(rt, scmd, &path)) create_from_cli_spec(rt, scmd, &path)
.ok_or(()) // hackythehackhack .or_else(|_| create_from_source(rt, scmd, &path))
.map_err(|_| { .or_else(|_| create_with_content_and_header(rt,
create_from_source(rt, scmd, &path) &path,
.unwrap_or_else(|e| debug!("Error building Entry: {:?}", e)) String::new(),
}); EntryHeader::new()))
} else {
create_with_content_and_header(rt, &path, String::new(), EntryHeader::new())
}
.unwrap_or_else(|e| debug!("Error building Entry: {:?}", e))
}); });
} }
@ -61,24 +65,11 @@ fn create_from_cli_spec(rt: &Runtime, matches: &ArgMatches, path: &PathBuf) -> R
debug!("Got content with len = {}", content.len()); debug!("Got content with len = {}", content.len());
rt.store() let header = matches.subcommand_matches("entry")
.create(PathBuf::from(path)) .map(|entry_matches| build_toml_header(entry_matches, EntryHeader::new()))
.map(|mut element| { .unwrap_or(EntryHeader::new());
{
let mut e_content = element.get_content_mut(); create_with_content_and_header(rt, path, content, header)
*e_content = content;
debug!("New content set");
}
{
let mut e_header = element.get_header_mut();
matches.subcommand_matches("entry")
.map(|entry_matches| {
*e_header = build_toml_header(entry_matches, EntryHeader::new());
debug!("New header set");
});
}
})
.map_err(|e| StoreError::new(StoreErrorKind::BackendError, Some(Box::new(e))))
} }
fn create_from_source(rt: &Runtime, matches: &ArgMatches, path: &PathBuf) -> Result<()> { fn create_from_source(rt: &Runtime, matches: &ArgMatches, path: &PathBuf) -> Result<()> {
@ -106,6 +97,29 @@ fn create_from_source(rt: &Runtime, matches: &ArgMatches, path: &PathBuf) -> Res
.map_err(|serr| StoreError::new(StoreErrorKind::BackendError, Some(Box::new(serr)))) .map_err(|serr| StoreError::new(StoreErrorKind::BackendError, Some(Box::new(serr))))
} }
fn create_with_content_and_header(rt: &Runtime,
path: &PathBuf,
content: String,
header: EntryHeader) -> Result<()>
{
debug!("Creating entry with content");
rt.store()
.create(PathBuf::from(path))
.map(|mut element| {
{
let mut e_content = element.get_content_mut();
*e_content = content;
debug!("New content set");
}
{
let mut e_header = element.get_header_mut();
*e_header = header;
debug!("New header set");
}
})
.map_err(|e| StoreError::new(StoreErrorKind::BackendError, Some(Box::new(e))))
}
fn string_from_raw_src(raw_src: &str) -> String { fn string_from_raw_src(raw_src: &str) -> String {
let mut content = String::new(); let mut content = String::new();
if raw_src == "-" { if raw_src == "-" {