5apps/liquor-cabinet
5apps/liquor-cabinet
4
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Activity

Fix listing of a user's root directory

Browse Source 
Refs #62
This commit is contained in:
Greg Karékinian 2015-06-29 18:27:00 +02:00
parent d01aafa5e9
commit 1cf99377dc
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/remote_storage/swift.rb
View File

@ -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,8 +282,12 @@ module RemoteStorage
end
def url_for_directory(user, directory)
if directory.empty?
container_url_for(user)
else
"#{container_url_for(user)}/#{escape(directory)}"
end
end
def base_url
@base_url ||= settings.swift["host"]