diff options
Diffstat (limited to 'release/scripts/io/netrender/master.py')
| -rw-r--r-- | release/scripts/io/netrender/master.py | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/release/scripts/io/netrender/master.py b/release/scripts/io/netrender/master.py index f95627135ba..0e3602563b4 100644 --- a/release/scripts/io/netrender/master.py +++ b/release/scripts/io/netrender/master.py @@ -75,9 +75,9 @@ class MRenderJob(netrender.model.RenderJob): self.last_update = 0 self.save_path = "" self.files = [MRenderFile(rfile.filepath, rfile.index, rfile.start, rfile.end) for rfile in job_info.files] - + self.resolution = None - + def initInfo(self): if not self.resolution: self.resolution = tuple(getFileInfo(self.files[0].filepath, ["bpy.context.scene.render_data.resolution_x", "bpy.context.scene.render_data.resolution_y", "bpy.context.scene.render_data.resolution_percentage"])) @@ -113,11 +113,11 @@ class MRenderJob(netrender.model.RenderJob): break else: self.status = JOB_FINISHED - + def pause(self, status = None): if self.status not in {JOB_PAUSED, JOB_QUEUED}: - return - + return + if status == None: self.status = JOB_PAUSED if self.status == JOB_QUEUED else JOB_QUEUED elif status: @@ -238,7 +238,7 @@ class RenderHandler(http.server.BaseHTTPRequestHandler): if match: job_id = match.groups()[0] frame_number = int(match.groups()[1]) - + job = self.server.getJobID(job_id) if job: @@ -249,9 +249,9 @@ class RenderHandler(http.server.BaseHTTPRequestHandler): self.send_head(http.client.ACCEPTED) elif frame.status == DONE: self.server.stats("", "Sending result to client") - + filename = job.save_path + "%04d" % frame_number + ".exr" - + f = open(filename, 'rb') self.send_head(content = "image/x-exr") shutil.copyfileobj(f, self.wfile) @@ -285,7 +285,7 @@ class RenderHandler(http.server.BaseHTTPRequestHandler): self.send_head(http.client.ACCEPTED) elif frame.status == DONE: filename = job.save_path + "%04d" % frame_number + ".exr" - + thumbname = thumbnail(filename) if thumbname: @@ -527,7 +527,7 @@ class RenderHandler(http.server.BaseHTTPRequestHandler): rule.setLimit(limit) except: pass # invalid type - + self.send_head() # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- elif self.path == "/balance_enable": @@ -537,7 +537,7 @@ class RenderHandler(http.server.BaseHTTPRequestHandler): rule = self.server.balancer.ruleByID(rule_id) if rule: rule.enabled = enabled - + self.send_head() # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- elif self.path.startswith("/cancel"): @@ -545,13 +545,13 @@ class RenderHandler(http.server.BaseHTTPRequestHandler): if match: length = int(self.headers['content-length']) - + if length > 0: info_map = eval(str(self.rfile.read(length), encoding='utf8')) clear = info_map.get("clear", False) else: clear = False - + job_id = match.groups()[0] job = self.server.getJobID(job_id) @@ -572,13 +572,13 @@ class RenderHandler(http.server.BaseHTTPRequestHandler): if match: length = int(self.headers['content-length']) - + if length > 0: info_map = eval(str(self.rfile.read(length), encoding='utf8')) status = info_map.get("status", None) else: status = None - + job_id = match.groups()[0] job = self.server.getJobID(job_id) @@ -597,7 +597,7 @@ class RenderHandler(http.server.BaseHTTPRequestHandler): elif self.path == "/clear": # cancel all jobs length = int(self.headers['content-length']) - + if length > 0: info_map = eval(str(self.rfile.read(length), encoding='utf8')) clear = info_map.get("clear", False) @@ -963,10 +963,10 @@ class RenderMasterServer(http.server.HTTPServer): def removeJob(self, job, clear_files = False): self.jobs.remove(job) self.jobs_map.pop(job.id) - + if clear_files: shutil.rmtree(job.save_path) - + for slave in self.slaves: if slave.job == job: slave.job = None |