diff options
Diffstat (limited to 'netrender/model.py')
| -rw-r--r-- | netrender/model.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/netrender/model.py b/netrender/model.py index c5ee54f0..ec91587b 100644 --- a/netrender/model.py +++ b/netrender/model.py @@ -278,7 +278,7 @@ class RenderJob: def __len__(self): return len(self.frames) - def countFrames(self, status=QUEUED): + def countFrames(self, status=FRAME_QUEUED): total = 0 for f in self.frames: if f.status == status: @@ -287,17 +287,17 @@ class RenderJob: return total def countSlaves(self): - return len(set((frame.slave for frame in self.frames if frame.status == DISPATCHED))) + return len(set((frame.slave for frame in self.frames if frame.status == FRAME_DISPATCHED))) def statusText(self): return JOB_STATUS_TEXT[self.status] def framesStatus(self): results = { - QUEUED: 0, - DISPATCHED: 0, - DONE: 0, - ERROR: 0 + FRAME_QUEUED: 0, + FRAME_DISPATCHED: 0, + FRAME_DONE: 0, + FRAME_ERROR: 0 } for frame in self.frames: @@ -375,9 +375,10 @@ class RenderFrame: def __init__(self, number = 0, command = ""): self.number = number self.time = 0 - self.status = QUEUED + self.status = FRAME_QUEUED self.slave = None self.command = command + self.results = [] # List of filename of result files associated with this frame def statusText(self): return FRAME_STATUS_TEXT[self.status] @@ -388,7 +389,8 @@ class RenderFrame: "time": self.time, "status": self.status, "slave": None if not self.slave else self.slave.serialize(), - "command": self.command + "command": self.command, + "results": self.results } @staticmethod @@ -402,5 +404,6 @@ class RenderFrame: frame.status = data["status"] frame.slave = RenderSlave.materialize(data["slave"]) frame.command = data["command"] + frame.results = data["results"] return frame |