Job_status: Fix thumbnail and metadata not updating after a cancel and re-upload
This commit is contained in:
@@ -359,6 +359,8 @@ class JobStatusPanel(ScreenPanel):
|
|||||||
self.set_state("cancelling")
|
self.set_state("cancelling")
|
||||||
elif "action:paused" in data:
|
elif "action:paused" in data:
|
||||||
self.set_state("paused")
|
self.set_state("paused")
|
||||||
|
elif "action:resumed" in data:
|
||||||
|
self.set_state("printing")
|
||||||
return
|
return
|
||||||
elif action != "notify_status_update":
|
elif action != "notify_status_update":
|
||||||
return
|
return
|
||||||
@@ -446,6 +448,7 @@ class JobStatusPanel(ScreenPanel):
|
|||||||
|
|
||||||
def state_check(self):
|
def state_check(self):
|
||||||
ps = self._printer.get_stat("print_stats")
|
ps = self._printer.get_stat("print_stats")
|
||||||
|
|
||||||
if ps['state'] == self.state:
|
if ps['state'] == self.state:
|
||||||
return True
|
return True
|
||||||
_ = self.lang.gettext
|
_ = self.lang.gettext
|
||||||
@@ -454,6 +457,7 @@ class JobStatusPanel(ScreenPanel):
|
|||||||
if self.state == "cancelling":
|
if self.state == "cancelling":
|
||||||
return True
|
return True
|
||||||
self.set_state("printing")
|
self.set_state("printing")
|
||||||
|
self.update_filename()
|
||||||
elif ps['state'] == "complete":
|
elif ps['state'] == "complete":
|
||||||
self.progress = 1
|
self.progress = 1
|
||||||
self.update_progress()
|
self.update_progress()
|
||||||
@@ -482,17 +486,6 @@ class JobStatusPanel(ScreenPanel):
|
|||||||
return False
|
return False
|
||||||
elif ps['state'] == "paused":
|
elif ps['state'] == "paused":
|
||||||
self.set_state("paused")
|
self.set_state("paused")
|
||||||
|
|
||||||
# TODO: Remove this in the future
|
|
||||||
if self.filename != ps['filename']:
|
|
||||||
if ps['filename'] != "":
|
|
||||||
self.filename = ps['filename']
|
|
||||||
self.file_metadata = {}
|
|
||||||
self.update_text("file", self.filename.split("/")[-1])
|
|
||||||
else:
|
|
||||||
file = "Unknown"
|
|
||||||
self.update_text("file", "Unknown file")
|
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def set_state(self, state):
|
def set_state(self, state):
|
||||||
|
Reference in New Issue
Block a user