From 94422b14718f6bc77d06885830441bf237700278 Mon Sep 17 00:00:00 2001
From: Greg Denton <gdenton@google.com>
Date: Thu, 24 Jan 2019 08:15:58 -0800
Subject: [PATCH] Fixing frame updates in FrameMonitorTree (#169)

* fixing frame updates in FrameMonitorTree
---
 cuegui/cuegui/FrameMonitorTree.py | 37 +++++++++++++++++--------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/cuegui/cuegui/FrameMonitorTree.py b/cuegui/cuegui/FrameMonitorTree.py
index 2b10f81c6..1aba43462 100644
--- a/cuegui/cuegui/FrameMonitorTree.py
+++ b/cuegui/cuegui/FrameMonitorTree.py
@@ -407,17 +407,12 @@ def _getUpdateChanged(self):
             logger.warning("no job or job is finished, bailing")
             return []
         logger.info(" + Nth update = %s" % self.__class__)
-        updatedFrames = job_pb2.UpdatedFrameSeq()
+        updatedFrames = []
         try:
             updated_data = self.__job.getUpdatedFrames(self.__lastUpdateTime)
-            # Once the updatedFrames include the proxy instead of the id, this can be removed
-            for frame in updated_data.updated_frames.updated_frames:
-                frame = opencue.util.proxy(frame.id, "Frame")
-            logger.info("Frame Updates: %s" % len(updated_data.updated_frames.updated_frames))
             self.__lastUpdateTime = updated_data.server_time
             self.__jobState = updated_data.state
-
-            updatedFrames = updated_data.updated_frames
+            updatedFrames = updated_data.updated_frames.updated_frames
 
         except opencue.EntityNotFoundException, e:
             self.setJobObj(None)
@@ -467,14 +462,9 @@ def _processUpdateChanged(self, work, rpcObjects):
             else:
                 self._itemsLock.lockForWrite()
                 try:
-                    for updatedFrame in rpcObjects.updated_frames:
+                    for updatedFrame in rpcObjects:
                         # If id already exists, update it
-                        if updatedFrame.id in self._items:
-                            frame = self._items[updatedFrame.id].rpcObject
-
-                            for item in dir(updatedFrame.id):
-                                if not item.startswith("__") and item != "id":
-                                    setattr(frame.data, item, getattr(updatedFrame, item))
+                        self._updateFrame(updatedFrame)
                 finally:
                     self._itemsLock.unlock()
 
@@ -484,6 +474,16 @@ def _processUpdateChanged(self, work, rpcObjects):
         except Exception, e:
             map(logger.warning, Utils.exceptionOutput(e))
 
+    def _updateFrame(self, updatedFrame):
+        """Update the frame object on a WidgetItem with the values from a UpdatedFrame object.
+        @type updatedFrame: job_pb2.UpdatedFrame
+        @param updatedFrame: UpdatedFrame to copy values from."""
+        logger.info("_updateFrame")
+        frameWidget = self._items.get('Frame.{}'.format(updatedFrame.id))
+        if frameWidget:
+            for field in job_pb2.UpdatedFrame.DESCRIPTOR.fields_by_name.keys():
+                if field != "id":
+                    setattr(frameWidget.rpcObject.data, field, getattr(updatedFrame, field))
 
     def contextMenuEvent(self, e):
         """When right clicking on an item, this raises a context menu"""
@@ -696,9 +696,12 @@ def __doWork(self):
         try:
             if self.__queue:
                 (proxy, path) = self.__queue.popitem()
-                return (proxy,
-                        Utils.getLastLine(path),
-                        Utils.secondsToHHMMSS(time.time() - os.stat(path).st_mtime))
+                if os.path.exists(path):
+                    return (proxy,
+                            Utils.getLastLine(path),
+                            Utils.secondsToHHMMSS(time.time() - os.stat(path).st_mtime))
+                else:
+                    return None
         except Exception, e:
             map(logger.warning, Utils.exceptionOutput(e))