From 4804cea63412c55c4e9a7e25b4777e85a1fef736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Ml=C3=A1dek?= <t@mldk.cz>
Date: Sun, 4 Apr 2021 18:44:01 +0200
Subject: [PATCH] rewrite fetch_or_create_dir slightly for more clarity

---
 src/filesystem.rs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/filesystem.rs b/src/filesystem.rs
index f57e188..7536f62 100644
--- a/src/filesystem.rs
+++ b/src/filesystem.rs
@@ -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)?;