summaryrefslogtreecommitdiff
path: root/src/leap/soledad
diff options
context:
space:
mode:
authorVictor Shyba <victor1984@riseup.net>2017-07-07 02:32:36 -0300
committerdrebs <drebs@leap.se>2017-07-18 15:30:30 -0300
commit679e1bb7990fc1fc9c4971db6383a75ae6acab80 (patch)
tree22e48ea737a95f0433ac217915d31e2ec5ffa00d /src/leap/soledad
parent463073b3147f9ba4e784e92cc8bec1d74ab0b7f4 (diff)
[feature] remote list sorting by date
Listing by date is useful for listing newest/oldest documents on blobs storage and should be used for listing new IncomingMessages as described on specification. -- Resolves: #8879
Diffstat (limited to 'src/leap/soledad')
-rw-r--r--src/leap/soledad/client/_db/blobs.py4
-rw-r--r--src/leap/soledad/server/_blobs.py14
2 files changed, 12 insertions, 6 deletions
diff --git a/src/leap/soledad/client/_db/blobs.py b/src/leap/soledad/client/_db/blobs.py
index 10b90c71..8f9f4769 100644
--- a/src/leap/soledad/client/_db/blobs.py
+++ b/src/leap/soledad/client/_db/blobs.py
@@ -167,9 +167,9 @@ class BlobManager(object):
return self.local.close()
@defer.inlineCallbacks
- def remote_list(self):
+ def remote_list(self, **params):
uri = urljoin(self.remote, self.user + '/')
- data = yield self._client.get(uri)
+ data = yield self._client.get(uri, params=params)
defer.returnValue((yield data.json()))
def local_list(self):
diff --git a/src/leap/soledad/server/_blobs.py b/src/leap/soledad/server/_blobs.py
index f6a8cbc6..793149cd 100644
--- a/src/leap/soledad/server/_blobs.py
+++ b/src/leap/soledad/server/_blobs.py
@@ -102,11 +102,16 @@ class FilesystemBlobsBackend(object):
def get_blob_size(user, blob_id, namespace=''):
raise NotImplementedError
- def list_blobs(self, user, request, namespace=''):
+ def list_blobs(self, user, request, namespace='', order_by=None):
blob_ids = []
base_path = self._get_path(user, custom_preffix=namespace)
- for _, _, filenames in os.walk(base_path):
- blob_ids += filenames
+ for root, dirs, filenames in os.walk(base_path):
+ blob_ids += [os.path.join(root, name) for name in filenames]
+ if order_by in ['date', '+date']:
+ 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)
+ blob_ids = [os.path.basename(path) for path in blob_ids]
return json.dumps(blob_ids)
def get_total_storage(self, user):
@@ -181,7 +186,8 @@ class BlobsResource(resource.Resource):
logger.info("http get: %s" % request.path)
user, blob_id = self._validate(request)
if not blob_id:
- return self._handler.list_blobs(user, request)
+ order = request.args.get('order_by', [None])[0]
+ return self._handler.list_blobs(user, request, order_by=order)
self._handler.add_tag_header(user, blob_id, request)
return self._handler.read_blob(user, blob_id, request)