minor refactors

This commit is contained in:
alfrix 2024-01-09 01:06:23 -03:00
parent bd18924f1d
commit f3c0daef1b
3 changed files with 17 additions and 12 deletions

View File

@ -17,7 +17,7 @@ class Prompt:
def _key_press_event(self, widget, event):
keyval_name = Gdk.keyval_name(event.keyval)
if keyval_name == "Escape" or keyval_name == "BackSpace":
if keyval_name in ["Escape", "BackSpace"]:
self.close()
def decode(self, data):

View File

@ -73,11 +73,14 @@ class Panel(ScreenPanel):
def add_directory(self, directory):
parent_dir = os.path.dirname(directory)
modified = 0
for x in self._files.directories:
if x['dirname'] == os.path.split(directory)[-1]:
modified = x['modified']
break
modified = next(
(
x['modified']
for x in self._files.directories
if x['dirname'] == os.path.split(directory)[-1]
),
0,
)
if directory not in self.filelist:
self.filelist[directory] = {'directories': [], 'files': [], 'modified': modified}
self.filelist[parent_dir]['directories'].append(directory)

View File

@ -215,13 +215,15 @@ class KlipperScreen(Gtk.Window):
self.connecting = True
self.initialized = False
ind = 0
logging.info(f"Connecting to printer: {name}")
for printer in self.printers:
if name == list(printer)[0]:
ind = self.printers.index(printer)
break
ind = next(
(
self.printers.index(printer)
for printer in self.printers
if name == list(printer)[0]
),
0,
)
self.printer = self.printers[ind]["data"]
self.apiclient = KlippyRest(
self.printers[ind][name]["moonraker_host"],