From b00fc5bee2a1e5df81d8018720bbe514bd549122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Mon, 30 Apr 2018 15:10:55 +0200 Subject: [PATCH] Reverse the not found logic in the delete_data method to make it clearer --- lib/remote_storage/rest_provider.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/remote_storage/rest_provider.rb b/lib/remote_storage/rest_provider.rb index 0e95577..1b59601 100644 --- a/lib/remote_storage/rest_provider.rb +++ b/lib/remote_storage/rest_provider.rb @@ -165,7 +165,6 @@ module RemoteStorage def delete_data(user, directory, key) url = url_for_key(user, directory, key) - not_found = false existing_metadata = redis.hgetall "rs:m:#{user}:#{directory}/#{key}" @@ -175,17 +174,17 @@ module RemoteStorage end end - not_found = !try_to_delete(url) + found = try_to_delete(url) log_size_difference(user, existing_metadata["s"], 0) delete_metadata_objects(user, directory, key) delete_dir_objects(user, directory) - if not_found - server.halt 404, "Not Found" - else + if found server.headers["Etag"] = %Q("#{existing_metadata["e"]}") server.halt 200 + else + server.halt 404, "Not Found" end end