NetRender:
- multires cache files and image .tex cache support in dependency list - Compare md5 of files before using a local copy (not one transfered by netrender). Could be changed to a simpler CRC if speed is an issue. The goal is not to have a strong crypto signature but just to detect outdated local files. - Reduce slave timeout to 5 minutes (down from 30). Slaves should report at most every 30s, there's no reason for a value to be that high. - Reorder the presentation tables on the main web page (job list is more important) - Collapse dependency list by default on job page (only show main file and headers for other files, point cache and fluid cache) - Slave option (default: True) to also output render log to the console (as well as the usual copy to the master)
This commit is contained in:
@@ -103,8 +103,9 @@ JOB_TYPES = {
|
||||
}
|
||||
|
||||
class RenderFile:
|
||||
def __init__(self, filepath = "", index = 0, start = -1, end = -1):
|
||||
def __init__(self, filepath = "", index = 0, start = -1, end = -1, signature=0):
|
||||
self.filepath = filepath
|
||||
self.signature = signature
|
||||
self.index = index
|
||||
self.start = start
|
||||
self.end = end
|
||||
@@ -114,7 +115,8 @@ class RenderFile:
|
||||
"filepath": self.filepath,
|
||||
"index": self.index,
|
||||
"start": self.start,
|
||||
"end": self.end
|
||||
"end": self.end,
|
||||
"signature": self.signature
|
||||
}
|
||||
|
||||
@staticmethod
|
||||
@@ -122,7 +124,7 @@ class RenderFile:
|
||||
if not data:
|
||||
return None
|
||||
|
||||
rfile = RenderFile(data["filepath"], data["index"], data["start"], data["end"])
|
||||
rfile = RenderFile(data["filepath"], data["index"], data["start"], data["end"], data["signature"])
|
||||
|
||||
return rfile
|
||||
|
||||
@@ -153,7 +155,8 @@ class RenderJob:
|
||||
self.blacklist = job_info.blacklist
|
||||
|
||||
def addFile(self, file_path, start=-1, end=-1):
|
||||
self.files.append(RenderFile(file_path, len(self.files), start, end))
|
||||
signature = hashFile(file_path)
|
||||
self.files.append(RenderFile(file_path, len(self.files), start, end, signature))
|
||||
|
||||
def addFrame(self, frame_number, command = ""):
|
||||
frame = RenderFrame(frame_number, command)
|
||||
|
||||
Reference in New Issue
Block a user