summaryrefslogtreecommitdiff
path: root/src/leap/soledad/server
diff options
context:
space:
mode:
authorVictor Shyba <victor1984@riseup.net>2017-07-08 04:57:28 -0300
committerdrebs <drebs@leap.se>2017-07-18 15:30:30 -0300
commitc60bc3583cc9de49d05162efc05ce6c766c9a48e (patch)
tree9f2fae7be6e3f1603040e4b2c86bcb8a53271d29 /src/leap/soledad/server
parent1aa9dee0ce87434188d37c821617caeff24fd70f (diff)
[style] fixes from review
Updates IBlobsBackend with list_blobs order_by parameter and add a elif clause to order_by checking, raising if the ordering parameter isn't supported.
Diffstat (limited to 'src/leap/soledad/server')
-rw-r--r--src/leap/soledad/server/_blobs.py2
-rw-r--r--src/leap/soledad/server/interfaces.py6
2 files changed, 6 insertions, 2 deletions
diff --git a/src/leap/soledad/server/_blobs.py b/src/leap/soledad/server/_blobs.py
index 7648e18e..37247c9e 100644
--- a/src/leap/soledad/server/_blobs.py
+++ b/src/leap/soledad/server/_blobs.py
@@ -111,6 +111,8 @@ class FilesystemBlobsBackend(object):
blob_ids.sort(key=lambda x: os.path.getmtime(x))
elif order_by == '-date':
blob_ids.sort(key=lambda x: os.path.getmtime(x), reverse=True)
+ elif order_by:
+ raise Exception("Unsupported order_by parameter: %s" % order_by)
blob_ids = [os.path.basename(path) for path in blob_ids]
return json.dumps(blob_ids)
diff --git a/src/leap/soledad/server/interfaces.py b/src/leap/soledad/server/interfaces.py
index ccb2ffdc..ee73aac8 100644
--- a/src/leap/soledad/server/interfaces.py
+++ b/src/leap/soledad/server/interfaces.py
@@ -49,9 +49,11 @@ class IBlobsBackend(Interface):
Get the size of the given blob id.
"""
- def list_blobs(user, request, namespace=''):
+ def list_blobs(user, request, namespace='', order_by=None):
"""
- Returns a json-encoded list of ids from user's blob.
+ Returns a json-encoded list of ids from user's blobs storage,
+ optionally ordered by order_by parameter and optionally restricted by
+ namespace.
:returns: a deferred that fires upon finishing.
"""