matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Merge pull request #1334 from matthiasbeyer/libimagcontact/ref-from-uid

Browse source 
Change ref creation to use UID from vcard object
This commit is contained in:
Matthias Beyer 2018-03-12 17:06:54 +01:00 committed by GitHub
commit bbd0570013
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/domain/libimagcontact/src/error.rs
View file

@ -49,6 +49,11 @@ error_chain! {
display("Entry {:?} not found", sid) display("Entry {:?} not found", sid)
} }
UidMissing(path: String) {
description("Vcard object has no UID")
display("Vcard at {:?} has no UID", path)
}
} }
} }

26
lib/domain/libimagcontact/src/store.rs
View file

@ -20,21 +20,19 @@
use std::path::Path; use std::path::Path;
use std::path::PathBuf; use std::path::PathBuf;
use std::result::Result as RResult; use std::result::Result as RResult;
use std::ffi::OsStr;
use vobject::parse_component; use vobject::parse_component;
use uuid::Uuid;
use libimagstore::store::Store; use libimagstore::store::Store;
use libimagstore::store::FileLockEntry; use libimagstore::store::FileLockEntry;
use libimagstore::storeid::StoreIdIterator; use libimagstore::storeid::StoreIdIterator;
use libimagentryref::refstore::RefStore; use libimagentryref::refstore::RefStore;
use libimagentryref::refstore::UniqueRefPathGenerator; use libimagentryref::refstore::UniqueRefPathGenerator;
use libimagentryref::generators::sha1::Sha1;
use libimagentryutil::isa::Is; use libimagentryutil::isa::Is;
use contact::IsContact; use contact::IsContact;
use error::ContactError as CE; use error::ContactError as CE;
use error::ContactErrorKind as CEK;
use error::Result; use error::Result;
use util; use util;
@ -49,17 +47,19 @@ impl UniqueRefPathGenerator for UniqueContactPathGenerator {
/// A function which should generate a unique string for a Path /// A function which should generate a unique string for a Path
fn unique_hash<A: AsRef<Path>>(path: A) -> RResult<String, Self::Error> { fn unique_hash<A: AsRef<Path>>(path: A) -> RResult<String, Self::Error> {
debug!("Generating unique hash for path: {:?}", path.as_ref()); use vobject::vcard::Vcard;
if let Some(p) = path.as_ref().file_stem().and_then(OsStr::to_str).map(String::from) { debug!("Generating unique hash for path: {:?}", path.as_ref());
debug!("Found UUID string: '{}'", p); util::read_to_string(path.as_ref())
Uuid::parse_str(&p) .and_then(|s| Vcard::build(&s).map_err(CE::from))
.map_err(CE::from) .and_then(|card| {
.map(|u| format!("{}", u.hyphenated())) // FIXME I don't know how to do in not-ugly card.uid()
} else { // else, we sha1 the (complete) content .map(|u| u.raw().clone())
debug!("Couldn't find UUID string, using SHA1 of contents"); .ok_or_else(|| {
Sha1::unique_hash(path).map_err(CE::from) let s = path.as_ref().to_str().unwrap_or("Unknown path");
} CEK::UidMissing(String::from(s)).into()
})
})
} }
} }