CreatBot/GeneralKlipperScreen
6
0
Fork 0
forked from CreatBot/CreatBotKlipperScreen
Code Pull Requests Activity

job_status: Fix error with non-existent metadata

Browse Source
This commit is contained in:
Jordan Ruthe 2021-03-03 18:32:28 -05:00
parent b264719cd9
commit 5f931fa09d
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
panels/job_status.py
View File

@ -322,7 +322,7 @@ class JobStatusPanel(ScreenPanel):
self.labels[arg].set_sensitive(False) self.labels[arg].set_sensitive(False)
def _callback_metadata(self, newfiles, deletedfiles, modifiedfiles): def _callback_metadata(self, newfiles, deletedfiles, modifiedfiles):
if self.file_metadata == None and self.filename in modifiedfiles: if bool(self.file_metadata) == False and self.filename in modifiedfiles:
self.update_file_metadata() self.update_file_metadata()
self._files.remove_file_callback(self._callback_metadata) self._files.remove_file_callback(self._callback_metadata)
@ -412,20 +412,20 @@ class JobStatusPanel(ScreenPanel):
file = "Unknown" file = "Unknown"
self.update_text("file", "Unknown file") self.update_text("file", "Unknown file")
if self.file_metadata != None:
if "gcode_start_byte" in self.file_metadata:
progress = (max(vsd['file_position'] - self.file_metadata['gcode_start_byte'],0) /
(self.file_metadata['gcode_end_byte'] - self.file_metadata['gcode_start_byte']))
else:
progress = 0 if self._printer.get_stat('virtual_sdcard','progress') == 0 else (ps['print_duration']/
self._printer.get_stat('virtual_sdcard','progress') - ps['print_duration'])
progress = round(progress,2)
if progress != self.progress: if "gcode_start_byte" in self.file_metadata:
self.progress = progress progress = (max(vsd['file_position'] - self.file_metadata['gcode_start_byte'],0) /
self.labels['darea'].queue_draw() (self.file_metadata['gcode_end_byte'] - self.file_metadata['gcode_start_byte']))
else:
progress = 0 if self._printer.get_stat('virtual_sdcard','progress') == 0 else (ps['print_duration']/
self._printer.get_stat('virtual_sdcard','progress') - ps['print_duration'])
progress = round(progress,2)
self.update_text("duration", str(self._gtk.formatTimeString(ps['print_duration']))) if progress != self.progress:
self.progress = progress
self.labels['darea'].queue_draw()
self.update_text("duration", str(self._gtk.formatTimeString(ps['print_duration'])))
timeleft_type = self._config.get_config()['main'].get('print_estimate_method','file') timeleft_type = self._config.get_config()['main'].get('print_estimate_method','file')
@ -518,7 +518,7 @@ class JobStatusPanel(ScreenPanel):
logging.debug("Thumbnails: %s" % list(tmp)) logging.debug("Thumbnails: %s" % list(tmp))
self.show_file_thumbnail() self.show_file_thumbnail()
else: else:
self.file_metadata = None self.file_metadata = {}
logging.debug("Cannot find file metadata. Listening for updated metadata") logging.debug("Cannot find file metadata. Listening for updated metadata")
self._screen.files.add_file_callback(self._callback_metadata) self._screen.files.add_file_callback(self._callback_metadata)