girder-large-image 1.30.2.dev2__tar.gz → 1.30.2.dev4__tar.gz

{girder_large_image-1.30.2.dev2 → girder_large_image-1.30.2.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: girder-large-image
-Version: 1.30.2.dev2
+Version: 1.30.2.dev4
 Summary: A Girder plugin to work with large, multiresolution images.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -21,9 +21,9 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: girder>=3.1.18
 Requires-Dist: girder-jobs>=3.0.3
-Requires-Dist: large_image>=1.30.2.dev2
+Requires-Dist: large_image>=1.30.2.dev4
 Provides-Extra: tasks
-Requires-Dist: large-image-tasks[girder]>=1.30.2.dev2; extra == "tasks"
+Requires-Dist: large-image-tasks[girder]>=1.30.2.dev4; extra == "tasks"
 Requires-Dist: girder-worker[girder]>=0.6.0; extra == "tasks"
 
 A Girder plugin to work with large, multiresolution images.

{girder_large_image-1.30.2.dev2 → girder_large_image-1.30.2.dev4}/girder_large_image/rest/__init__.py

@@ -75,10 +75,10 @@ def _groupingPipeline(initialPipeline, cbase, grouping, sort=None):
         {'keys': ['meta.dicom.PatientID'], 'counts': {
         'meta.dicom.StudyInstanceUID': 'meta._count.studycount',
         'meta.dicom.SeriesInstanceUID': 'meta._count.seriescount'}}
-    :param sort: an optional lost of (key, direction) tuples
+    :param sort: an optional list of (key, direction) tuples
     """
     for gidx, gr in enumerate(grouping['keys']):
-        grsort = [(gr, 1)] + (sort or [])
+        grsort = [(gr, 1)] + (sort or []) + [('_id', 1)]
         initialPipeline.extend([{
             '$match': {gr: {'$exists': True}},
         }, {
@@ -130,6 +130,7 @@ def _itemFindRecursive(  # noqa
     from bson.objectid import ObjectId
 
     if folderId:
+        user = self.getCurrentUser()
         if recurse:
             pipeline = [
                 {'$match': {'_id': ObjectId(folderId)}},
@@ -141,6 +142,7 @@ def _itemFindRecursive(  # noqa
                     'as': '_folder',
                     'startWith': '$_id',
                 }},
+                {'$match': Folder().permissionClauses(user, AccessType.READ, '_folder.')},
                 {'$group': {'_id': '$_folder._id'}},
             ]
             children = [ObjectId(folderId)] + next(Folder().collection.aggregate(pipeline))['_id']
@@ -155,7 +157,6 @@ def _itemFindRecursive(  # noqa
             if name:
                 filters['name'] = name
             filters['folderId'] = {'$in': children}
-            user = self.getCurrentUser()
             if isinstance(sort, list):
                 sort.append(('parentId', 1))
 
@@ -163,14 +164,6 @@ def _itemFindRecursive(  # noqa
             # except it adds a grouping stage
             initialPipeline = [
                 {'$match': filters},
-                {'$lookup': {
-                    'from': 'folder',
-                    'localField': Item().resourceParent,
-                    'foreignField': '_id',
-                    'as': '__parent',
-                }},
-                {'$match': Item().permissionClauses(user, AccessType.READ, '__parent.')},
-                {'$project': {'__parent': False}},
             ]
             if group is not None:
                 if not isinstance(group, list):
@@ -200,6 +193,7 @@ def _itemFindRecursive(  # noqa
             if offset:
                 fullPipeline.append({'$skip': offset})
 
+            print(fullPipeline)
             logger.debug('Find item pipeline %r', fullPipeline)
 
             options = {
@@ -220,8 +214,6 @@ def _itemFindRecursive(  # noqa
             result.count = count
             result.fromAggregate = True
             return result
-
-            return Item().findWithPermissions(filters, offset, limit, sort=sort, user=user)
     return origItemFind(folderId, text, name, limit, offset, sort, filters)
 
 

{girder_large_image-1.30.2.dev2 → girder_large_image-1.30.2.dev4}/girder_large_image.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: girder-large-image
-Version: 1.30.2.dev2
+Version: 1.30.2.dev4
 Summary: A Girder plugin to work with large, multiresolution images.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -21,9 +21,9 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: girder>=3.1.18
 Requires-Dist: girder-jobs>=3.0.3
-Requires-Dist: large_image>=1.30.2.dev2
+Requires-Dist: large_image>=1.30.2.dev4
 Provides-Extra: tasks
-Requires-Dist: large-image-tasks[girder]>=1.30.2.dev2; extra == "tasks"
+Requires-Dist: large-image-tasks[girder]>=1.30.2.dev4; extra == "tasks"
 Requires-Dist: girder-worker[girder]>=0.6.0; extra == "tasks"
 
 A Girder plugin to work with large, multiresolution images.

{girder_large_image-1.30.2.dev2 → girder_large_image-1.30.2.dev4}/girder_large_image.egg-info/requires.txt

@@ -1,7 +1,7 @@
 girder>=3.1.18
 girder-jobs>=3.0.3
-large_image>=1.30.2.dev2
+large_image>=1.30.2.dev4
 
 [tasks]
-large-image-tasks[girder]>=1.30.2.dev2
+large-image-tasks[girder]>=1.30.2.dev4
 girder-worker[girder]>=0.6.0