matthiasbeyer
/
imag
1
0
Fork 0
Code Releases Activity

Add is_tag() checks

This commit is contained in:
Matthias Beyer 2016-02-21 19:18:38 +01:00
parent f0424e9e60
commit 38ca44d10d
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libimagtag/src/error.rs
View File

@ -9,6 +9,7 @@ pub enum TagErrorKind {
TagTypeError,
HeaderReadError,
HeaderWriteError,
NotATag,
}
fn tag_error_type_as_str(e: &TagErrorKind) -> &'static str {
@ -16,6 +17,7 @@ fn tag_error_type_as_str(e: &TagErrorKind) -> &'static str {
&TagErrorKind::TagTypeError => "Entry Header Tag Type wrong",
&TagErrorKind::HeaderReadError => "Error while reading entry header",
&TagErrorKind::HeaderWriteError => "Error while writing entry header",
&TagErrorKind::NotATag => "String is not a tag",
}
}

22
libimagtag/src/tagable.rs
View File

@ -3,6 +3,7 @@ use libimagstore::store::{Entry, EntryHeader};
use error::{TagError, TagErrorKind};
use result::Result;
use tag::Tag;
use util::is_tag;
use toml::Value;
@ -34,6 +35,12 @@ impl Tagable for EntryHeader {
if !tags.iter().all(|t| match t { &Value::String(_) => true, _ => false }) {
return Err(TagError::new(TagErrorKind::TagTypeError, None));
}
if tags.iter().any(|t| match t {
&Value::String(ref s) => !is_tag(&s),
_ => unreachable!()})
{
return Err(TagError::new(TagErrorKind::NotATag, None));
}
Ok(tags.iter()
.cloned()
@ -51,6 +58,11 @@ impl Tagable for EntryHeader {
}
fn set_tags(&mut self, ts: Vec<Tag>) -> Result<()> {
if ts.iter().any(|tag| !is_tag(tag)) {
debug!("Not a tag: '{}'", ts.iter().filter(|t| !is_tag(t)).next().unwrap());
return Err(TagError::new(TagErrorKind::NotATag, None));
}
let a = ts.iter().map(|t| Value::String(t.clone())).collect();
self.set("imag.tags", Value::Array(a))
.map(|_| ())
@ -58,6 +70,11 @@ impl Tagable for EntryHeader {
}
fn add_tag(&mut self, t: Tag) -> Result<()> {
if !is_tag(&t) {
debug!("Not a tag: '{}'", t);
return Err(TagError::new(TagErrorKind::NotATag, None));
}
self.get_tags()
.map(|mut tags| {
tags.push(t);
@ -67,6 +84,11 @@ impl Tagable for EntryHeader {
}
fn remove_tag(&mut self, t: Tag) -> Result<()> {
if !is_tag(&t) {
debug!("Not a tag: '{}'", t);
return Err(TagError::new(TagErrorKind::NotATag, None));
}
self.get_tags()
.map(|mut tags| {
tags.retain(|tag| tag.clone() != t);