matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Rewrite: StoreId::new_baseless() -> StoreId::new()

Browse source 
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
Matthias Beyer 2018-12-05 19:01:42 +01:00
parent b66371f79b
commit 642702b724
9 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bin/core/imag-link/src/main.rs
View file

@ -168,8 +168,8 @@ fn link_from_to<'a, I>(rt: &'a Runtime, from: &'a str, to: I)
} else {
debug!("Linking internally: {:?} -> {:?}", from, entry);
let from_id = StoreId::new_baseless(PathBuf::from(from)).map_err_trace_exit_unwrap();
let entr_id = StoreId::new_baseless(PathBuf::from(entry)).map_err_trace_exit_unwrap();
let from_id = StoreId::new(PathBuf::from(from)).map_err_trace_exit_unwrap();
let entr_id = StoreId::new(PathBuf::from(entry)).map_err_trace_exit_unwrap();
if from_id == entr_id {
error!("Cannot link entry with itself. Exiting");
@ -366,13 +366,13 @@ mod tests {
let mut path = PathBuf::new();
path.set_file_name(name);
let default_entry = Entry::new(StoreId::new_baseless(PathBuf::from("")).unwrap())
let default_entry = Entry::new(StoreId::new(PathBuf::from("")).unwrap())
.to_str()
.unwrap();
debug!("Default entry constructed");
let id = StoreId::new_baseless(path)?;
let id = StoreId::new(path)?;
debug!("StoreId constructed: {:?}", id);
let mut entry = rt.store().create(id.clone())?;

4
bin/core/imag-mv/src/main.rs
View file

@ -72,7 +72,7 @@ fn main() {
.cli()
.value_of("source")
.map(PathBuf::from)
.map(StoreId::new_baseless)
.map(StoreId::new)
.unwrap() // unwrap safe by clap
.map_err_trace_exit_unwrap();
@ -80,7 +80,7 @@ fn main() {
.cli()
.value_of("dest")
.map(PathBuf::from)
.map(StoreId::new_baseless)
.map(StoreId::new)
.unwrap() // unwrap safe by clap
.map_err_trace_exit_unwrap();

12
bin/core/imag-tag/src/main.rs
View file

@ -264,11 +264,11 @@ mod tests {
let mut path = PathBuf::new();
path.set_file_name(name);
let default_entry = Entry::new(StoreId::new_baseless(PathBuf::from("")).unwrap())
let default_entry = Entry::new(StoreId::new(PathBuf::from("")).unwrap())
.to_str()
.unwrap();
let id = StoreId::new_baseless(path)?;
let id = StoreId::new(path)?;
let mut entry = rt.store().create(id.clone())?;
entry.get_content_mut().push_str(&default_entry);
@ -303,7 +303,7 @@ mod tests {
debug!("Add-tags: {:?}", add);
debug!("Altering things");
alter(&rt, StoreId::new_baseless(id.clone()).unwrap(), add, None);
alter(&rt, StoreId::new(id.clone()).unwrap(), add, None);
debug!("Altered");
let test_entry = rt.store().get(id).unwrap().unwrap();
@ -338,7 +338,7 @@ mod tests {
debug!("Rem-tags: {:?}", rem);
debug!("Altering things");
alter(&rt, StoreId::new_baseless(id.clone()).unwrap(), add, rem);
alter(&rt, StoreId::new(id.clone()).unwrap(), add, rem);
debug!("Altered");
let test_entry = rt.store().get(id).unwrap().unwrap();
@ -366,7 +366,7 @@ mod tests {
debug!("Rem-tags: {:?}", rem);
debug!("Altering things");
alter(&rt, StoreId::new_baseless(id.clone()).unwrap(), add, rem);
alter(&rt, StoreId::new(id.clone()).unwrap(), add, rem);
debug!("Altered");
let test_entry = rt.store().get(id).unwrap().unwrap();
@ -394,7 +394,7 @@ mod tests {
debug!("Rem-tags: {:?}", rem);
debug!("Altering things");
alter(&rt, StoreId::new_baseless(id.clone()).unwrap(), add, rem);
alter(&rt, StoreId::new(id.clone()).unwrap(), add, rem);
debug!("Altered");
let test_entry = rt.store().get(id).unwrap().unwrap();

2
lib/core/libimagrt/src/runtime.rs
View file

@ -414,7 +414,7 @@ impl<'a> Runtime<'a> {
trace!("Got IDs = {}", buf);
buf.lines()
.map(PathBuf::from)
.map(|id| StoreId::new_baseless(id).map_err(Error::from))
.map(|id| StoreId::new(id).map_err(Error::from))
.collect()
})
} else {

2
lib/domain/libimagtimetrack/src/tag.rs
View file

@ -65,7 +65,7 @@ impl<'a> From<&'a String> for TimeTrackingTag {
impl IntoStoreId for TimeTrackingTag {
fn into_storeid(self) -> Result<StoreId> {
StoreId::new_baseless(PathBuf::from(self.0))
StoreId::new(PathBuf::from(self.0))
}
}

2
lib/entry/libimagentrydatetime/src/datepath/compiler.rs
View file

@ -119,7 +119,7 @@ impl DatePathCompiler {
}
}
StoreId::new_baseless(PathBuf::from(s))
StoreId::new(PathBuf::from(s))
}
}

4
lib/entry/libimagentrylink/src/internal.rs
View file

@ -568,7 +568,7 @@ fn process_rw_result(links: Result<Option<Value>>) -> Result<LinkIter> {
.map(|link| {
debug!("Matching the link: {:?}", link);
match link {
Value::String(s) => StoreId::new_baseless(PathBuf::from(s))
Value::String(s) => StoreId::new(PathBuf::from(s))
.map(|s| Link::Id { link: s })
.map_err(From::from)
,
@ -588,7 +588,7 @@ fn process_rw_result(links: Result<Option<Value>>) -> Result<LinkIter> {
debug!("Ok, here we go with building a Link::Annotated");
match (link, anno) {
(Value::String(link), Value::String(anno)) => {
StoreId::new_baseless(PathBuf::from(link))
StoreId::new(PathBuf::from(link))
.map_err(From::from)
.map(|link| {
Link::Annotated {

4
lib/entry/libimagentryref/src/refstore.rs
View file

@ -91,7 +91,7 @@ impl<'a> RefStore<'a> for Store {
fn get_ref<RPG: UniqueRefPathGenerator, H: AsRef<str>>(&'a self, hash: H)
-> Result<Option<FileLockEntry<'a>>>
{
let sid = StoreId::new_baseless(PathBuf::from(format!("{}/{}", RPG::collection(), hash.as_ref())))
let sid = StoreId::new(PathBuf::from(format!("{}/{}", RPG::collection(), hash.as_ref())))
.map_err(Error::from)?;
debug!("Getting: {:?}", sid);
@ -104,7 +104,7 @@ impl<'a> RefStore<'a> for Store {
{
let hash = RPG::unique_hash(&path)?;
let pathbuf = PathBuf::from(format!("{}/{}", RPG::collection(), hash));
let sid = StoreId::new_baseless(pathbuf.clone())?;
let sid = StoreId::new(pathbuf.clone())?;
debug!("Creating: {:?}", sid);
self.create(sid)

4
lib/etc/libimaginteraction/src/ui.rs
View file

@ -55,7 +55,7 @@ pub fn get_id(matches: &ArgMatches) -> Result<Vec<StoreId>> {
vals.into_iter()
.fold(Ok(vec![]), |acc, elem| {
acc.and_then(|mut v| {
let elem = StoreId::new_baseless(PathBuf::from(String::from(elem)))?;
let elem = StoreId::new(PathBuf::from(String::from(elem)))?;
v.push(elem);
Ok(v)
})
@ -70,7 +70,7 @@ pub fn get_or_select_id(matches: &ArgMatches, store_path: &PathBuf) -> Result<Ve
.or_else(|_| {
let path = store_path.clone();
let p = pick_file(default_menu_cmd, path)?;
let id = StoreId::new_baseless(p)?;
let id = StoreId::new(p)?;
Ok(vec![id])
})
}