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