Merge pull request #68 from pypeclub/feature/PYPE-502_gui_open_too_long

feature/PYPE-502_gui_open_too_long

Author: mkolar

avalon/tools/gui/models/model_asset.py

@@ -31,22 +31,28 @@ def __init__(self, parent=None):
         super(AssetModel, self).__init__(parent=parent)
         self.refresh()
 
-    def _add_hierarchy(self, parent=None):
+    def _add_hierarchy(self, parent=None, assets={}):
 
         # Find the assets under the parent
-        find_data = {
-            "type": "asset"
-        }
+        current_assets = []
         if parent is None:
-            find_data['$or'] = [
-                {'data.visualParent': {'$exists': False}},
-                {'data.visualParent': None}
-            ]
+            db_assets = io.find({
+                "type": "asset"
+            }).sort('name', 1)
+            assets = {}
+            for asset in db_assets:
+                parent_id = asset.get("data", {}).get("visualParent")
+                if parent_id:
+                    if parent_id not in assets:
+                        assets[parent_id] = []
+                    assets[parent_id].append(asset)
+                else:
+                    current_assets.append(asset)
         else:
-            find_data["data.visualParent"] = parent['_id']
+            if parent["_id"] in assets:
+                current_assets = assets.pop(parent["_id"])
 
-        assets = io.find(find_data).sort('name', 1)
-        for asset in assets:
+        for asset in current_assets:
             # get label from data, otherwise use name
             data = asset.get("data", {})
             label = data.get("label", asset['name'])
@@ -67,7 +73,10 @@ def _add_hierarchy(self, parent=None):
             self.add_child(node, parent=parent)
 
             # Add asset's children recursively
-            self._add_hierarchy(node)
+            if asset['_id'] in assets:
+                assets = self._add_hierarchy(node, assets)
+
+        return assets
 
     def refresh(self):
         """Refresh the data for the model."""