Merge pull request #100 from pypeclub/feature/PYPE-603_show_date_workfile

[PYPE-603] #close show date workfile

Author: mkolar

avalon/tools/models.py

@@ -14,10 +14,17 @@ class TreeModel(QtCore.QAbstractItemModel):
 
     Columns = list()
     ItemRole = QtCore.Qt.UserRole + 1
+    item_class = None
 
     def __init__(self, parent=None):
         super(TreeModel, self).__init__(parent)
-        self._root_item = Item()
+        self._root_item = self.ItemClass()
+
+    @property
+    def ItemClass(self):
+        if self.item_class is not None:
+            return self.item_class
+        return Item
 
     def rowCount(self, parent):
         if parent.isValid():
@@ -129,7 +136,7 @@ def column_name(self, column):
 
     def clear(self):
         self.beginResetModel()
-        self._root_item = Item()
+        self._root_item = self.ItemClass()
         self.endResetModel()
 
 

avalon/tools/workfiles/app.py

@@ -3,10 +3,13 @@
 import getpass
 import re
 import shutil
+from datetime import datetime
 
 from ...vendor.Qt import QtWidgets, QtCore
 from ... import style, io, api
 
+from .model import WorkFileModel
+
 from .. import lib as tools_lib
 
 module = sys.modules[__name__]
@@ -260,8 +263,19 @@ def __init__(self, root=None, parent=None):
         separator.setFrameShadow(QtWidgets.QFrame.Plain)
         self.layout.addWidget(separator)
 
-        self.list = QtWidgets.QListWidget()
-        self.layout.addWidget(self.list)
+        # View
+        view = QtWidgets.QTreeView()
+        view.setTextElideMode(QtCore.Qt.ElideLeft)
+        view.setSortingEnabled(True)
+        view.setRootIsDecorated(False)
+        view.setAlternatingRowColors(True)
+
+        model = WorkFileModel(view)
+        view.setModel(model)
+
+        self.layout.addWidget(view)
+        self.view = view
+        self.model = model
 
         buttons_layout = QtWidgets.QHBoxLayout()
         self.duplicate_button = QtWidgets.QPushButton("Duplicate")
@@ -292,7 +306,7 @@ def __init__(self, root=None, parent=None):
 
         self.duplicate_button.pressed.connect(self.on_duplicate_pressed)
         self.open_button.pressed.connect(self.on_open_pressed)
-        self.list.doubleClicked.connect(self.on_open_pressed)
+        self.view.doubleClicked.connect(self.on_open_pressed)
         self.browse_button.pressed.connect(self.on_browse_pressed)
         self.save_as_button.pressed.connect(self.on_save_as_pressed)
 
@@ -302,7 +316,7 @@ def __init__(self, root=None, parent=None):
         self.open_button.setFocus()
 
         self.refresh()
-        self.resize(400, 550)
+        self.resize(550, 550)
 
     def get_name(self):
 
@@ -313,9 +327,11 @@ def get_name(self):
         return self._name_window.get_result()
 
     def refresh(self):
-        self.list.clear()
+        self.model.clear()
 
-        modified = []
+        last_modified = None
+        last_modified_idx = None
+        parent_idx = QtCore.QModelIndex()
         extensions = set(self.host.file_extensions())
         for f in reversed(os.listdir(self.root)):
             path = os.path.join(self.root, f)
@@ -325,23 +341,42 @@ def refresh(self):
             if extensions and os.path.splitext(f)[1] not in extensions:
                 continue
 
-            self.list.addItem(f)
-            modified.append(os.path.getmtime(path))
+            _modified = os.path.getmtime(path)
+            if not last_modified or last_modified < _modified:
+                last_modified = _modified
+                last_modified_idx = self.model.rowCount(parent_idx)
 
-        # Select last modified file
-        if self.list.count():
-            item = self.list.item(modified.index(max(modified)))
-            item.setSelected(True)
+            modified = (
+                datetime.fromtimestamp(_modified)
+                .strftime("%Y/%m/%d %H:%M:%S")
+            )
+            self.model.add_file(f, modified)
 
+        self.view.header().resizeSection(
+            0, self.view.sizeHintForColumn(0) + 40
+        )
+        self.view.sortByColumn(0, QtCore.Qt.DescendingOrder)
+
+        # Select last modified file
+        if self.model.rowCount(parent_idx):
+            index = self.model.index(last_modified_idx, 0, parent_idx)
+            self.view.selectionModel().select(
+                index,
+                (
+                    QtCore.QItemSelectionModel.SelectCurrent |
+                    QtCore.QItemSelectionModel.Rows
+                )
+            )
             # Scroll list so item is visible
-            QtCore.QTimer.singleShot(100, lambda: self.list.scrollToItem(item))
+            self.view.scrollTo(
+                index,
+                QtWidgets.QAbstractItemView.EnsureVisible
+            )
 
             self.duplicate_button.setEnabled(True)
         else:
             self.duplicate_button.setEnabled(False)
 
-        self.list.setMinimumWidth(self.list.sizeHintForColumn(0) + 30)
-
     def save_changes_prompt(self):
         self._messagebox = QtWidgets.QMessageBox()
         self._messagebox.setWindowFlags(QtCore.Qt.FramelessWindowHint)
@@ -389,24 +424,35 @@ def on_duplicate_pressed(self):
         if not work_file:
             return
 
-        src = os.path.join(
-            self.root, self.list.selectedItems()[0].text()
-        )
-        dst = os.path.join(
-            self.root, work_file
-        )
-        shutil.copy(src, dst)
+        selection = self.view.selectionModel()
+        rows = selection.selectedRows(column=0)
+        for row_index in rows:
+            filename = row_index.data(self.model.FilenameRole)
+
+            src = os.path.join(
+                self.root, filename
+            )
+            dst = os.path.join(
+                self.root, work_file
+            )
+            shutil.copy(src, dst)
 
         self.refresh()
 
     def on_open_pressed(self):
+        selection = self.view.selectionModel()
+        rows = selection.selectedRows(column=0)
 
-        selection = self.list.selectedItems()
-        if not selection:
+        if len(rows) == 0:
             print("No file selected to open..")
             return
 
-        work_file = os.path.join(self.root, selection[0].text())
+        elif len(rows) > 1:
+            print("More than one file selected to open..")
+            return
+
+        filename = rows[0].data(self.model.FilenameRole)
+        work_file = os.path.join(self.root, filename)
 
         result = self.open(work_file)
         if result:

avalon/tools/workfiles/model.py

@@ -0,0 +1,98 @@
+from ...vendor.Qt import QtCore
+
+from ..models import TreeModel, Item
+
+
+class WorkFileItem(Item):
+    def sort(self, key, order):
+        children = sorted(self.children(), key=lambda item: item[key])
+        if order == QtCore.Qt.DescendingOrder:
+            children = reversed(children)
+
+        self._children = list(children)
+        for child in self._children:
+            child.sort(key, order)
+
+
+class WorkFileModel(TreeModel):
+    """A model listing the tasks combined for a list of assets"""
+
+    Columns = ["Filename", "Modified"]
+    FilenameRole = QtCore.Qt.UserRole + 2
+    ModifiedRole = QtCore.Qt.UserRole + 3
+    item_class = WorkFileItem
+
+    def parent(self, index):
+        item = index.internalPointer()
+        if isinstance(item, int):
+            index = self.createIndex(item, 0, self._root_item)
+        return super(WorkFileModel, self).parent(index)
+
+    def sort(self, column, order):
+        # Use super of QAbstractItemModel because in PySide `parent` method
+        # does not return parent QObject but tries to find Item parent
+        parent = super(QtCore.QAbstractItemModel, self).parent()
+        selection = []
+        if parent and hasattr(parent, "selectionModel"):
+            selection_model = parent.selectionModel()
+            for row in selection_model.selectedRows():
+                selection.append(row.data(self.ItemRole))
+
+        self.beginResetModel()
+
+        key = self.Columns[column]
+        self._root_item.sort(key, order)
+
+        self.endResetModel()
+
+        if not parent or not selection:
+            return
+
+        item_selection = QtCore.QItemSelection()
+        for idx, item in enumerate(self._root_item.children()):
+            if item not in selection:
+                continue
+
+            index = self.createIndex(idx, 0, idx)
+            item_selection.append(QtCore.QItemSelectionRange(index))
+
+        selection_model.select(
+            item_selection,
+            (
+                QtCore.QItemSelectionModel.SelectCurrent |
+                QtCore.QItemSelectionModel.Rows
+            )
+        )
+
+    def add_file(self, filename, modified=None):
+        self.beginResetModel()
+
+        if not modified:
+            modified = "< unknown >"
+
+        item = self.ItemClass({
+            "Filename": filename,
+            "Modified": modified
+        })
+        self.add_child(item)
+
+        self.endResetModel()
+
+    def data(self, index, role):
+        if role in [QtCore.Qt.DisplayRole, QtCore.Qt.EditRole]:
+            if index.column() == 0:
+                role = self.FilenameRole
+            elif index.column() == 1:
+                role = self.ModifiedRole
+
+        item = super(WorkFileModel, self).data(index, self.ItemRole)
+        if role == self.ItemRole:
+            return item
+
+        elif role == self.FilenameRole:
+            return item["Filename"]
+
+        elif role == self.ModifiedRole:
+            return item["Modified"]
+
+        return super(WorkFileModel, self).data(index, role)