Loader with aggregation and visual loading state

avalon/io.py

@@ -397,6 +397,12 @@ def distinct(*args, **kwargs):
  *args, **kwargs)
 
 
+@auto_reconnect
+def aggregate(*args, **kwargs):
+ return self._database[Session["AVALON_PROJECT"]].aggregate(
+ *args, **kwargs)
+
+
 @auto_reconnect
 def drop(*args, **kwargs):
  return self._database[Session["AVALON_PROJECT"]].drop(

avalon/tools/lib.py

@@ -5,7 +5,7 @@
 from .. import io, api, style
 from ..vendor import qtawesome
 
-from ..vendor.Qt import QtWidgets, QtCore, QtGui
+from ..vendor.Qt import QtWidgets, QtCore
 
 self = sys.modules[__name__]
 self._jobs = dict()
@@ -468,3 +468,10 @@ def project_use_silo(project_doc):
  if "{silo}" in template:
  return True
  return False
+
+
+def create_qthread(func, *args, **kwargs):
+ class Thread(QtCore.QThread):
+ def run(self):
+ func(*args, **kwargs)
+ return Thread()

avalon/tools/loader/app.py

@@ -162,9 +162,8 @@ def _assetschanged(self):
  """Selected assets have changed"""
 
  assets_model = self.data["model"]["assets"]
- subsets = self.data["model"]["subsets"]
- subsets_model = subsets.model
- subsets_model.clear()
+ subsets_widget = self.data["model"]["subsets"]
+ subsets_model = subsets_widget.model
 
  t1 = time.time()
 
@@ -183,6 +182,17 @@ def _assetschanged(self):
  document_name = document["name"]
  document_silo = document.get("silo")
 
+ # Start loading
+ subsets_widget.set_loading_state(loading=bool(document_name),
+ empty=True)
+
+ def on_refreshed(has_item):
+ empty = not has_item
+ subsets_widget.set_loading_state(loading=False, empty=empty)
+ subsets_model.refreshed.disconnect()
+ self.echo("Duration: %.3fs" % (time.time() - t1))
+
+ subsets_model.refreshed.connect(on_refreshed)
  subsets_model.set_asset(document_id)
 
  # Clear the version information on asset change
@@ -191,7 +201,6 @@ def _assetschanged(self):
  self.data["state"]["context"]["asset"] = document_name
  self.data["state"]["context"]["assetId"] = document_id
  self.data["state"]["context"]["silo"] = document_silo
- self.echo("Duration: %.3fs" % (time.time() - t1))
 
  def _versionschanged(self):
 
@@ -258,14 +267,6 @@ def closeEvent(self, event):
  modifiers = QtWidgets.QApplication.queryKeyboardModifiers()
  shift_pressed = QtCore.Qt.ShiftModifier & modifiers
 
- if shift_pressed:
- print("Force quitted..")
- self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
-
- # Kill on holding SHIFT
- modifiers = QtWidgets.QApplication.queryKeyboardModifiers()
- shift_pressed = QtCore.Qt.ShiftModifier & modifiers
-
  if shift_pressed:
  print("Force quitted..")
  self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
@@ -452,6 +453,8 @@ def cli(args):
  args = parser.parse_args(args)
  project = args.project
 
+ print("Entering Project: %s" % project)
+
  io.install()
 
  # Store settings

avalon/tools/loader/model.py

@@ -17,6 +17,10 @@ def is_filtering_recursible():
 
 
 class SubsetsModel(TreeModel):
+
+ doc_fetched = QtCore.Signal()
+ refreshed = QtCore.Signal(bool)
+
  Columns = [
  "subset",
  "family",
@@ -43,14 +47,19 @@ def __init__(self, grouping=True, parent=None):
  self._icons = {
  "subset": qtawesome.icon("fa.file-o", color=style.colors.default)
  }
+ self._doc_fetching_thread = None
+ self._doc_fetching_stop = False
+ self._doc_payload = list()
+
+ self.doc_fetched.connect(self.on_doc_fetched)
 
  def set_asset(self, asset_id):
  self._asset_id = asset_id
  self.refresh()
 
  def set_grouping(self, state):
  self._grouping = state
- self.refresh()
+ self.on_doc_fetched()
 
  def setData(self, index, value, role=QtCore.Qt.EditRole):
 
@@ -141,17 +150,72 @@ def set_version(self, index, version):
  "step": version_data.get("step", None)
  })
 
- def refresh(self):
+ def fetch_subset_and_version(self):
+ """Query all subsets and latest versions from aggregation
+
+ (NOTE) The returned version documents are NOT the real version
+ document, it's generated from the MongoDB's aggregation so
+ some of the first level field may not be presented.
+
+ """
+ def _fetch():
+ _subsets = list()
+ _ids = list()
+ for subset in io.find({"type": "subset",
+ "parent": self._asset_id}):
+ if self._doc_fetching_stop:
+ return
+ _subsets.append(subset)
+ _ids.append(subset["_id"])
+
+ _pipeline = [
+ # Find all versions of those subsets
+ {"$match": {"type": "version", "parent": {"$in": _ids}}},
+ # Sorting versions all together
+ {"$sort": {"name": 1}},
+ # Group them by "parent", but only take the last
+ {"$group": {"_id": "$parent",
+ "_version_id": {"$last": "$_id"},
+ "name": {"$last": "$name"},
+ "data": {"$last": "$data"},
+ "locations": {"$last": "$locations"},
+ "schema": {"$last": "$schema"}}},
+ ]
+ versions = dict()
+ for doc in io.aggregate(_pipeline):
+ if self._doc_fetching_stop:
+ return
+ doc["parent"] = doc["_id"]
+ doc["_id"] = doc.pop("_version_id")
+ versions[doc["parent"]] = doc
+
+ self._doc_payload[:] = [(subset, versions.get(subset["_id"]))
+ for subset in _subsets]
+ self.doc_fetched.emit()
+
+ self._doc_payload[:] = []
+ self._doc_fetching_stop = False
+ self._doc_fetching_thread = lib.create_qthread(_fetch)
+ self._doc_fetching_thread.start()
+
+ def stop_fetch_thread(self):
+ if self._doc_fetching_thread is not None:
+ self._doc_fetching_stop = True
+ while self._doc_fetching_thread.isRunning():
+ pass
 
+ def refresh(self):
+ self.stop_fetch_thread()
  self.clear()
- self.beginResetModel()
  if not self._asset_id:
- self.endResetModel()
  return
+ self.fetch_subset_and_version()
 
- asset_id = self._asset_id
+ def on_doc_fetched(self):
+ self.clear()
+ self.beginResetModel()
 
- active_groups = lib.get_active_group_config(asset_id)
+ active_groups = lib.get_active_group_config(self._asset_id)
 
  # Generate subset group nodes
  group_items = dict()
@@ -166,15 +230,10 @@ def refresh(self):
  group_items[name] = group
  self.add_child(group)
 
- filter = {"type": "subset", "parent": asset_id}
-
  # Process subsets
  row = len(group_items)
- for subset in io.find(filter):
-
- last_version = io.find_one({"type": "version",
- "parent": subset["_id"]},
- sort=[("name", -1)])
+ has_item = False
+ for subset, last_version in self._doc_payload:
  if not last_version:
  # No published version for the subset
  continue
@@ -203,8 +262,10 @@ def refresh(self):
  # Set the version information
  index = self.index(row_, 0, parent=parent_index)
  self.set_version(index, last_version)
+ has_item = True
 
  self.endResetModel()
+ self.refreshed.emit(has_item)
 
  def data(self, index, role):
 

avalon/tools/loader/widgets.py

@@ -1,12 +1,14 @@
+import os
 import datetime
 import pprint
 import inspect
 
-from ...vendor.Qt import QtWidgets, QtCore, QtCompat
+from ...vendor.Qt import QtWidgets, QtCore, QtGui, QtSvg
 from ...vendor import qtawesome
 from ... import io
 from ... import api
 from ... import pipeline
+from ... import style
 
 from .. import lib as tools_lib
 from ..delegates import VersionDelegate
@@ -44,7 +46,7 @@ def __init__(self, enable_grouping=True, parent=None):
  top_bar_layout.addWidget(filter)
  top_bar_layout.addWidget(groupable)
 
- view = QtWidgets.QTreeView()
+ view = SubsetTreeView()
  view.setIndentation(20)
  view.setStyleSheet("""
  QTreeView::item{
@@ -98,10 +100,15 @@ def __init__(self, enable_grouping=True, parent=None):
  self.view.setModel(self.family_proxy)
  self.view.customContextMenuRequested.connect(self.on_context_menu)
 
- header = self.view.header()
- # Enforce the columns to fit the data (purely cosmetic)
- QtCompat.setSectionResizeMode(
- header, QtWidgets.QHeaderView.ResizeToContents)
+ view.setColumnWidth(0, 240) # subset
+ view.setColumnWidth(1, 120) # family
+ view.setColumnWidth(2, 100) # version
+ view.setColumnWidth(3, 120) # time
+ view.setColumnWidth(4, 100) # author
+ view.setColumnWidth(5, 80) # frames
+ view.setColumnWidth(6, 60) # duration
+ view.setColumnWidth(7, 50) # handles
+ view.setColumnWidth(8, 50) # step
 
  selection = view.selectionModel()
  selection.selectionChanged.connect(self.active_changed)
@@ -126,6 +133,18 @@ def set_grouping(self, state):
  current_index=False):
  self.model.set_grouping(state)
 
+ def set_loading_state(self, loading, empty):
+ view = self.view
+
+ if view.is_loading != loading:
+ if loading:
+ view.spinner.repaintNeeded.connect(view.viewport().update)
+ else:
+ view.spinner.repaintNeeded.disconnect()
+
+ view.is_loading = loading
+ view.is_empty = empty
+
  def on_context_menu(self, point):
 
  point_index = self.view.indexAt(point)
@@ -309,6 +328,44 @@ def echo(self, message):
  print(message)
 
 
+class SubsetTreeView(QtWidgets.QTreeView):
+
+ def __init__(self, parent=None):
+ super(SubsetTreeView, self).__init__(parent=parent)
+ loading_gif = os.path.dirname(style.__file__) + "/svg/spinner-200.svg"
+ spinner = QtSvg.QSvgRenderer(loading_gif)
+
+ self.spinner = spinner
+ self.is_loading = False
+ self.is_empty = True
+
+ def paint_loading(self, event):
+ size = 160
+ rect = event.rect()
+ rect = QtCore.QRectF(rect.topLeft(), rect.bottomRight())
+ rect.moveTo(rect.x() + rect.width() / 2 - size / 2,
+ rect.y() + rect.height() / 2 - size / 2)
+ rect.setSize(QtCore.QSizeF(size, size))
+ painter = QtGui.QPainter(self.viewport())
+ self.spinner.render(painter, rect)
+
+ def paint_empty(self, event):
+ painter = QtGui.QPainter(self.viewport())
+ rect = event.rect()
+ rect = QtCore.QRectF(rect.topLeft(), rect.bottomRight())
+ qtext_opt = QtGui.QTextOption(QtCore.Qt.AlignHCenter |
+ QtCore.Qt.AlignVCenter)
+ painter.drawText(rect, "No Data", qtext_opt)
+
+ def paintEvent(self, event):
+ if self.is_loading:
+ self.paint_loading(event)
+ elif self.is_empty:
+ self.paint_empty(event)
+ else:
+ super(SubsetTreeView, self).paintEvent(event)
+
+
 class VersionTextEdit(QtWidgets.QTextEdit):
  """QTextEdit that displays version specific information.
 

avalon/tools/models.py

@@ -430,7 +430,6 @@ def data(self, index, role):
 
  column = index.column()
  if column == self.Name:
-
  # Allow a custom icon and custom icon color to be defined
  data = item.get("_document", {}).get("data", {})
  icon = data.get("icon", None)