From 5b7603b3d6f946aab9188abb0d0ce8f563db2a05 Mon Sep 17 00:00:00 2001 From: Gabbi Fisher Date: Thu, 19 Sep 2019 22:17:40 -0700 Subject: [PATCH 1/2] Ensure that deletion phase of sync also uses keys with value hashes appended --- src/commands/kv/bucket/mod.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/commands/kv/bucket/mod.rs b/src/commands/kv/bucket/mod.rs index b2fa0033c..778ad08fc 100644 --- a/src/commands/kv/bucket/mod.rs +++ b/src/commands/kv/bucket/mod.rs @@ -60,7 +60,12 @@ fn directory_keys_only(directory: &Path) -> Result, failure::Error> let entry = entry.unwrap(); let path = entry.path(); if path.is_file() { - let (key, _) = generate_key(path, directory, None)?; + let value = std::fs::read(path)?; + + // Need to base64 encode value + let b64_value = base64::encode(&value); + + let (_, key) = generate_key(path, directory, Some(b64_value.clone()))?; upload_vec.push(key); } From cb8a6a8fedd1fe3cdbda298740afc6812ecae0d1 Mon Sep 17 00:00:00 2001 From: Avery Harnish Date: Fri, 20 Sep 2019 09:49:21 -0500 Subject: [PATCH 2/2] Remove clone of b64_value --- src/commands/kv/bucket/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/kv/bucket/mod.rs b/src/commands/kv/bucket/mod.rs index 778ad08fc..e6a6dcea9 100644 --- a/src/commands/kv/bucket/mod.rs +++ b/src/commands/kv/bucket/mod.rs @@ -65,7 +65,7 @@ fn directory_keys_only(directory: &Path) -> Result, failure::Error> // Need to base64 encode value let b64_value = base64::encode(&value); - let (_, key) = generate_key(path, directory, Some(b64_value.clone()))?; + let (_, key) = generate_key(path, directory, Some(b64_value))?; upload_vec.push(key); }