kotovalexarian-likes-gitlab
/
hagrid-keyserver--hagrid
mirror of https://gitlab.com/hagrid-keyserver/hagrid.git
1
0
Fork 0
Code Releases Activity

database: simplify lookup_primary_fingerprint

This commit is contained in:
Vincent Breitmoser 2019-06-10 17:29:49 +02:00
parent 73e6a59318
commit f2ef0d166f
No known key found for this signature in database
GPG Key ID: 7BD18320DEADFA11
1 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
database/src/fs.rs
View File

@ -342,35 +342,14 @@ impl Database for Filesystem {
fn lookup_primary_fingerprint(&self, term: &Query) -> Option<Fingerprint> {
use super::Query::*;
match term {
ByFingerprint(ref fp) => {
let path = self.link_by_fingerprint(fp);
let typ = match path.symlink_metadata() {
Ok(meta) => meta.file_type(),
Err(_) => return None,
};
if typ.is_file() {
Some(fp.clone())
} else if typ.is_symlink() {
path.read_link().ok()
.and_then(|link_path| Filesystem::path_to_fingerprint(&link_path))
} else {
// Neither file nor symlink. Freak value.
None
}
},
ByKeyID(ref keyid) => {
let path = self.link_by_keyid(keyid);
path.read_link().ok()
.and_then(|path| Filesystem::path_to_fingerprint(&path))
},
ByEmail(ref email) => {
let path = self.link_by_email(email);
path.read_link().ok()
.and_then(|path| Filesystem::path_to_fingerprint(&path))
},
}
let path = match term {
ByFingerprint(ref fp) => self.link_by_fingerprint(fp),
ByKeyID(ref keyid) => self.link_by_keyid(keyid),
ByEmail(ref email) => self.link_by_email(email),
};
path.read_link()
.ok()
.and_then(|link_path| Filesystem::path_to_fingerprint(&link_path))
}
/// Gets the path to the underlying file, if any.