thm
/
upend
1
0
Fork 0
Code Issues 73 Pull Requests Packages Projects Releases 5 Wiki Activity

rewrite fetch_or_create_dir slightly for more clarity

feat/vaults
Tomáš Mládek 2021-04-04 18:44:01 +02:00
parent d6b877400f
commit 4804cea634
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/filesystem.rs
View File

@ -277,13 +277,12 @@ pub fn fetch_or_create_dir<C: Connection<Backend = Sqlite>>(
None => trace!("FETCHING/CREATING /{:#}", directory),
}
let dir_value = EntryValue::Value(Value::String(directory.name));
let directories: Vec<Address> = query(
let matching_directories: Vec<Address> = query(
connection,
Query::SingleQuery(QueryPart::Matches(EntryQuery {
entity: QueryComponent::Any,
attribute: QueryComponent::Exact(String::from(DIR_KEY)),
value: QueryComponent::Exact(dir_value.clone()),
value: QueryComponent::Exact(EntryValue::Value(Value::String(directory.name.clone()))),
})),
)?
.into_iter()
@ -302,12 +301,12 @@ pub fn fetch_or_create_dir<C: Connection<Backend = Sqlite>>(
)?
.extract_addresses();
directories
matching_directories
.into_iter()
.filter(|a| parent_has.contains(a))
.collect()
}
None => directories,
None => matching_directories,
};
match valid_directories.len() {
@ -324,7 +323,7 @@ pub fn fetch_or_create_dir<C: Connection<Backend = Sqlite>>(
let directory_entry = Entry {
entity: new_directory_address.clone(),
attribute: String::from(DIR_KEY),
value: dir_value,
value: EntryValue::Value(Value::String(directory.name)),
};
insert_entry(connection, directory_entry)?;