From 3ce3efd0fc20ad6a3816256bc2e786a00fa6e6f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Mon, 29 Jun 2015 21:42:21 +0200 Subject: [PATCH] Revert "Fix listing of a user's root directory" This reverts commit 1cf99377dc7ecf26fd2d5b43c03f615d82876d13. --- lib/remote_storage/swift.rb | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/remote_storage/swift.rb b/lib/remote_storage/swift.rb index 2923c1f..b6aa7ec 100644 --- a/lib/remote_storage/swift.rb +++ b/lib/remote_storage/swift.rb @@ -78,11 +78,7 @@ module RemoteStorage end end - res = if directory.empty? - do_get_request("#{container_url_for(user)}/?format=json") - else - do_get_request("#{container_url_for(user)}/?format=json&path=#{escape(directory)}/") - end + res = do_get_request("#{container_url_for(user)}/?format=json&path=#{escape(directory)}/") if body = JSON.parse(res.body) listing = directory_listing(body) @@ -282,11 +278,7 @@ module RemoteStorage end def url_for_directory(user, directory) - if directory.empty? - container_url_for(user) - else - "#{container_url_for(user)}/#{escape(directory)}" - end + "#{container_url_for(user)}/#{escape(directory)}" end def base_url