LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Fix tab/spaces in observer.py

Browse Source
This commit is contained in:
Thomas Lake
2012-04-18 21:39:21 +01:00
parent c7fd50bd2d
commit 806e517e98
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
overviewer_core/observer.py
View File

@@ -172,20 +172,20 @@ class JSObserver(Observer):
def __init__(self, outputdir, minrefresh=5): def __init__(self, outputdir, minrefresh=5):
"""Initialise observer """Initialise observer
outputdir must be set to the map output directory path outputdir must be set to the map output directory path
minrefresh specifies the minimum gap between requests, in seconds minrefresh specifies the minimum gap between requests, in seconds
""" """
self.last_update = -11 self.last_update = -11
self.last_update_time = -1 self.last_update_time = -1
self._current_value = -1 self._current_value = -1
self.minrefresh = 1000*minrefresh self.minrefresh = 1000*minrefresh
self.logfile = os.path.join(outputdir, "progress.js") self.logfile = os.path.join(outputdir, "progress.js")
def start(self, max_value): def start(self, max_value):
f = open(self.logfile, "w", 0) f = open(self.logfile, "w", 0)
f.write('{"message": "Rendering %d tiles", "update": %s}' % (max_value, self.minrefresh)) f.write('{"message": "Rendering %d tiles", "update": %s}' % (max_value, self.minrefresh))
self.start_time=time.time() self.start_time=time.time()
self._set_max_value(max_value) self._set_max_value(max_value)
def is_started(self): def is_started(self):
return self.start_time is not None return self.start_time is not None
@@ -195,9 +195,9 @@ class JSObserver(Observer):
process is done. process is done.
""" """
self.end_time = time.time() self.end_time = time.time()
duration = self.end_time - self.start_time duration = self.end_time - self.start_time
f = open(self.logfile, "w", 0) f = open(self.logfile, "w", 0)
f.write('{"message": "Render completed in %dm %ds", "update": "false"}' % (duration//60, duration - duration//60)) f.write('{"message": "Render completed in %dm %ds", "update": "false"}' % (duration//60, duration - duration//60))
f.close() f.close()
def is_finished(self): def is_finished(self):
@@ -221,11 +221,11 @@ class JSObserver(Observer):
if self._need_update(): if self._need_update():
refresh = max(1500*(time.time() - self.last_update_time), self.minrefresh) refresh = max(1500*(time.time() - self.last_update_time), self.minrefresh)
f = open(self.logfile, "w", 0) f = open(self.logfile, "w", 0)
f.write('{"message": "Rendered %d of %d tiles (%d%%)", "update": %d }' % (self.get_current_value(), self.get_max_value(), self.get_percentage(), refresh)) f.write('{"message": "Rendered %d of %d tiles (%d%%)", "update": %d }' % (self.get_current_value(), self.get_max_value(), self.get_percentage(), refresh))
f.close() f.close()
self.last_update_time = time.time() self.last_update_time = time.time()
self.last_update = current_value self.last_update = current_value
return True return True
return False return False
def get_percentage(self): def get_percentage(self):