Use f-strings
Avoid unnecessary casts to str()bool()int()
Ensure file closure
Merge nested ifs
Simplify for-assigns-appends with comprehensions and internal functions
Avoid shadowing internal function names
Initialize variables
Return value directly instead of assign then return
Make some methods static
This commit is contained in:
alfrix
2022-07-04 20:50:34 -03:00
committed by Alfredo Monclus
parent 68d4f9c534
commit 6510b2ec6b
55 changed files with 1607 additions and 1798 deletions

View File

@@ -19,40 +19,37 @@ class PrintPanel(ScreenPanel):
dir_panels = {}
filelist = {'gcodes': {'directories': [], 'files': []}}
def initialize(self, panel_name):
self.labels['directories'] = {}
self.labels['files'] = {}
self.sort_items = {
"name": _("Name"),
"date": _("Date")
}
self.sort_icon = ["arrow-up", "arrow-down"]
def __init__(self, screen, title, back=True, action_bar=True, printer_name=True):
super().__init__(screen, title, back, action_bar, printer_name)
sortdir = self._config.get_main_config().get("print_sort_dir", "name_asc")
sortdir = sortdir.split('_')
if sortdir[0] not in ["name", "date"] or sortdir[1] not in ["asc", "desc"]:
sortdir = ["name", "asc"]
self.sort_current = [sortdir[0], 0 if sortdir[1] == "asc" else 1] # 0 for asc, 1 for desc
self.sort_items = {
"name": _("Name"),
"date": _("Date")
}
self.sort_icon = ["arrow-up", "arrow-down"]
self.scroll = self._gtk.ScrolledWindow()
self.files = {}
self.directories = {}
self.labels['directories'] = {}
self.labels['files'] = {}
scroll = self._gtk.ScrolledWindow()
sort = Gtk.Label()
sort.set_text(_("Sort by: "))
def initialize(self, panel_name):
sort = Gtk.Label(_("Sort by: "))
sbox = Gtk.Box(spacing=0)
sbox.set_vexpand(False)
sbox.add(sort)
i = 1
for name, val in self.sort_items.items():
s = self._gtk.ButtonImage(None, val, "color%s" % (i % 4), .66, Gtk.PositionType.RIGHT, False)
if name == sortdir[0]:
for i, (name, val) in enumerate(self.sort_items.items(), start=1):
s = self._gtk.ButtonImage(None, val, f"color{i % 4}", .66, Gtk.PositionType.RIGHT, False)
if name == self.sort_current[0]:
s.set_image(self._gtk.Image(self.sort_icon[self.sort_current[1]], .66))
s.connect("clicked", self.change_sort, name)
self.labels['sort_%s' % name] = s
self.labels[f'sort_{name}'] = s
sbox.add(s)
i += 1
refresh = self._gtk.ButtonImage("refresh", None, None, .5)
refresh = self._gtk.ButtonImage("refresh", None, None, .66)
refresh.connect('clicked', self._refresh_files)
sbox.add(refresh)
sbox.set_hexpand(True)
@@ -69,16 +66,13 @@ class PrintPanel(ScreenPanel):
box.set_vexpand(True)
box.pack_start(sbox, False, False, 0)
box.pack_start(pbox, False, False, 0)
box.pack_start(scroll, True, True, 0)
box.pack_start(self.scroll, True, True, 0)
self.dir_panels['gcodes'] = Gtk.Grid()
self.files = {}
self.directories = {}
GLib.idle_add(self.reload_files)
scroll.add(self.dir_panels['gcodes'])
self.scroll = scroll
self.scroll.add(self.dir_panels['gcodes'])
self.content.add(box)
self._screen.files.add_file_callback(self._callback)
@@ -93,58 +87,13 @@ class PrintPanel(ScreenPanel):
self.filelist[parent_dir]['directories'].append(directory)
if directory not in self.labels['directories']:
frame = Gtk.Frame()
frame.get_style_context().add_class("frame-item")
self._create_frame(directory)
reverse = self.sort_current[1] != 0
dirs = sorted(
self.filelist[parent_dir]['directories'],
reverse=reverse, key=lambda item: self.filelist[item]['modified']
) if self.sort_current[0] == "date" else sorted(self.filelist[parent_dir]['directories'], reverse=reverse)
name = Gtk.Label()
name.set_markup("<big><b>%s</b></big>" % (directory.split("/")[-1]))
name.set_hexpand(True)
name.set_halign(Gtk.Align.START)
name.set_line_wrap(True)
name.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR)
info = Gtk.Label()
info.set_halign(Gtk.Align.START)
labels = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
labels.add(name)
labels.add(info)
labels.set_vexpand(True)
labels.set_valign(Gtk.Align.CENTER)
labels.set_halign(Gtk.Align.START)
actions = self._gtk.ButtonImage("load", None, "color3")
actions.connect("clicked", self.change_dir, directory)
actions.set_hexpand(False)
actions.set_halign(Gtk.Align.END)
file = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=5)
file.set_hexpand(True)
file.set_vexpand(False)
icon = self._gtk.Image("folder", 1)
file.add(icon)
file.add(labels)
file.add(actions)
frame.add(file)
self.directories[directory] = frame
self.labels['directories'][directory] = {
"icon": icon,
"info": info,
"name": name
}
self.dir_panels[directory] = Gtk.Grid()
reverse = False if self.sort_current[1] == 0 else True
if self.sort_current[0] == "date":
dirs = sorted(self.filelist[parent_dir]['directories'], reverse=reverse,
key=lambda item: self.filelist[item]['modified'])
else:
dirs = sorted(self.filelist[parent_dir]['directories'], reverse=reverse)
pos = dirs.index(directory)
self.dir_panels[parent_dir].insert_row(pos)
@@ -158,83 +107,36 @@ class PrintPanel(ScreenPanel):
if fileinfo is None:
return
dir = ("gcodes/%s" % filepath).split('/')[:-1]
directory = '/'.join(dir)
d = f"gcodes/{filepath}".split('/')[:-1]
directory = '/'.join(d)
filename = filepath.split('/')[-1]
for i in range(1, len(dir)):
curdir = "/".join(dir[0:i])
newdir = "/".join(dir[0:i + 1])
for i in range(1, len(d)):
curdir = "/".join(d[:i])
newdir = "/".join(d[:i + 1])
if newdir not in self.filelist[curdir]['directories']:
self.add_directory(newdir)
if filename not in self.filelist[directory]['files']:
for i in range(1, len(dir)):
curdir = "/".join(dir[0:i + 1])
for i in range(1, len(d)):
curdir = "/".join(d[:i + 1])
if curdir != "gcodes" and fileinfo['modified'] > self.filelist[curdir]['modified']:
self.filelist[curdir]['modified'] = fileinfo['modified']
self.labels['directories'][curdir]['info'].set_markup(
"<small>%s: <b>%s</b></small>" %
(_("Modified"), datetime.fromtimestamp(fileinfo['modified']).strftime("%Y-%m-%d %H:%M")))
f'<small>' + _("Modified")
+ f' <b>{datetime.fromtimestamp(fileinfo["modified"]):%Y-%m-%d %H:%M}</b></small>'
)
self.filelist[directory]['files'].append(filename)
if filepath not in self.files:
frame = Gtk.Frame()
frame.get_style_context().add_class("frame-item")
self._create_frame_file(filename, filepath)
reverse = self.sort_current[1] != 0
files = sorted(
self.filelist[directory]['files'],
reverse=reverse,
key=lambda item: self._screen.files.get_file_info(f"{directory}/{item}"[7:])['modified']
) if self.sort_current[0] == "date" else sorted(self.filelist[directory]['files'], reverse=reverse)
name = Gtk.Label()
name.set_markup("<big><b>%s</b></big>" % (os.path.splitext(filename)[0].replace("_", " ")))
name.set_hexpand(True)
name.set_halign(Gtk.Align.START)
name.set_line_wrap(True)
name.set_line_wrap_mode(Pango.WrapMode.CHAR)
info = Gtk.Label()
info.set_halign(Gtk.Align.START)
info.set_markup(self.get_file_info_str(filepath))
labels = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
labels.add(name)
labels.add(info)
labels.set_vexpand(True)
labels.set_valign(Gtk.Align.CENTER)
labels.set_halign(Gtk.Align.START)
actions = self._gtk.ButtonImage("print", None, "color3")
actions.connect("clicked", self.confirm_print, filepath)
actions.set_hexpand(False)
actions.set_halign(Gtk.Align.END)
file = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=5)
file.set_hexpand(True)
file.set_vexpand(False)
icon = Gtk.Image()
pixbuf = self.get_file_image(filepath, small=True)
if pixbuf is not None:
icon.set_from_pixbuf(pixbuf)
else:
icon = self._gtk.Image("file", 1.6)
file.add(icon)
file.add(labels)
if os.path.splitext(filename)[1] in [".gcode", ".g", ".gco"]:
file.add(actions)
frame.add(file)
self.files[filepath] = frame
self.labels['files'][filepath] = {
"icon": icon,
"info": info,
"name": name
}
reverse = False if self.sort_current[1] == 0 else True
if self.sort_current[0] == "date":
files = sorted(
self.filelist[directory]['files'], reverse=reverse,
key=lambda item: self._screen.files.get_file_info(("%s/%s" % (directory, item))[7:])['modified']
)
else:
files = sorted(self.filelist[directory]['files'], reverse=reverse)
pos = files.index(filename)
pos += len(self.filelist[directory]['directories'])
@@ -243,6 +145,103 @@ class PrintPanel(ScreenPanel):
if show is True:
self.dir_panels[directory].show_all()
def _create_frame(self, directory):
frame = Gtk.Frame()
frame.get_style_context().add_class("frame-item")
name = Gtk.Label()
name.set_markup(f"<big><b>{directory.split('/')[-1]}</b></big>")
name.set_hexpand(True)
name.set_halign(Gtk.Align.START)
name.set_line_wrap(True)
name.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR)
info = Gtk.Label()
info.set_halign(Gtk.Align.START)
labels = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
labels.add(name)
labels.add(info)
labels.set_vexpand(True)
labels.set_valign(Gtk.Align.CENTER)
labels.set_halign(Gtk.Align.START)
actions = self._gtk.ButtonImage("load", None, "color3")
actions.connect("clicked", self.change_dir, directory)
actions.set_hexpand(False)
actions.set_halign(Gtk.Align.END)
file = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=5)
file.set_hexpand(True)
file.set_vexpand(False)
icon = self._gtk.Image("folder", 1)
file.add(icon)
file.add(labels)
file.add(actions)
frame.add(file)
self.directories[directory] = frame
self.labels['directories'][directory] = {
"icon": icon,
"info": info,
"name": name
}
self.dir_panels[directory] = Gtk.Grid()
def _create_frame_file(self, filename, filepath):
frame = Gtk.Frame()
frame.get_style_context().add_class("frame-item")
name = Gtk.Label()
name.set_markup(f'<big><b>{os.path.splitext(filename)[0].replace("_", " ")}</b></big>')
name.set_hexpand(True)
name.set_halign(Gtk.Align.START)
name.set_line_wrap(True)
name.set_line_wrap_mode(Pango.WrapMode.CHAR)
info = Gtk.Label()
info.set_halign(Gtk.Align.START)
info.set_markup(self.get_file_info_str(filepath))
labels = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
labels.add(name)
labels.add(info)
labels.set_vexpand(True)
labels.set_valign(Gtk.Align.CENTER)
labels.set_halign(Gtk.Align.START)
actions = self._gtk.ButtonImage("print", None, "color3")
actions.connect("clicked", self.confirm_print, filepath)
actions.set_hexpand(False)
actions.set_halign(Gtk.Align.END)
file = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=5)
file.set_hexpand(True)
file.set_vexpand(False)
icon = Gtk.Image()
pixbuf = self.get_file_image(filepath, small=True)
if pixbuf is not None:
icon.set_from_pixbuf(pixbuf)
else:
icon = self._gtk.Image("file", 1.6)
file.add(icon)
file.add(labels)
if os.path.splitext(filename)[1] in [".gcode", ".g", ".gco"]:
file.add(actions)
frame.add(file)
self.files[filepath] = frame
self.labels['files'][filepath] = {
"icon": icon,
"info": info,
"name": name
}
def back(self):
if len(self.cur_directory.split('/')) > 1:
self.change_dir(None, '/'.join(self.cur_directory.split('/')[:-1]))
@@ -252,12 +251,12 @@ class PrintPanel(ScreenPanel):
def change_dir(self, widget, directory):
if directory not in self.dir_panels:
return
logging.debug("Changing dir to %s" % directory)
logging.debug(f"Changing dir to {directory}")
for child in self.scroll.get_children():
self.scroll.remove(child)
self.cur_directory = directory
self.labels['path'].set_text(" /%s" % self.cur_directory[7:])
self.labels['path'].set_text(f" /{self.cur_directory[7:]}")
self.scroll.add(self.dir_panels[directory])
self.content.show_all()
@@ -267,15 +266,15 @@ class PrintPanel(ScreenPanel):
self.sort_current[1] = (self.sort_current[1] + 1) % 2
else:
oldkey = self.sort_current[0]
logging.info("Changing %s to %s" % ('sort_%s' % oldkey, self.sort_items[self.sort_current[0]]))
self.labels['sort_%s' % oldkey].set_image(None)
self.labels['sort_%s' % oldkey].show_all()
logging.info(f"Changing sort_{oldkey} to {self.sort_items[self.sort_current[0]]}")
self.labels[f'sort_{oldkey}'].set_image(None)
self.labels[f'sort_{oldkey}'].show_all()
self.sort_current = [key, 0]
self.labels['sort_%s' % key].set_image(self._gtk.Image(self.sort_icon[self.sort_current[1]], .66))
self.labels['sort_%s' % key].show()
self.labels[f'sort_{key}'].set_image(self._gtk.Image(self.sort_icon[self.sort_current[1]], .66))
self.labels[f'sort_{key}'].show()
GLib.idle_add(self.reload_files)
self._config.set("main", "print_sort_dir", "%s_%s" % (key, "asc" if self.sort_current[1] == 0 else "desc"))
self._config.set("main", "print_sort_dir", f'{key}_{"asc" if self.sort_current[1] == 0 else "desc"}')
self._config.save_user_config_options()
def confirm_print(self, widget, filename):
@@ -286,7 +285,7 @@ class PrintPanel(ScreenPanel):
]
label = Gtk.Label()
label.set_markup("<b>%s</b>\n" % filename)
label.set_markup(f"<b>{filename}</b>\n")
label.set_hexpand(True)
label.set_halign(Gtk.Align.CENTER)
label.set_vexpand(True)
@@ -314,16 +313,16 @@ class PrintPanel(ScreenPanel):
if response_id == Gtk.ResponseType.CANCEL:
return
logging.info("Starting print: %s" % filename)
logging.info(f"Starting print: {filename}")
self._screen._ws.klippy.print_start(filename)
def delete_file(self, filename):
dir_parts = ("gcodes/%s" % filename).split('/')[:-1]
dir_parts = f"gcodes/{filename}".split('/')[:-1]
directory = '/'.join(dir_parts)
self.filelist[directory]["files"].pop(self.filelist[directory]["files"].index(filename.split('/')[-1]))
i = len(dir_parts)
while i > 1:
cur_dir = '/'.join(dir_parts[0:i])
cur_dir = '/'.join(dir_parts[:i])
if len(self.filelist[cur_dir]['directories']) > 0 or len(self.filelist[cur_dir]['files']) > 0:
break
par_dir = '/'.join(cur_dir.split('/')[:-1])
@@ -348,47 +347,14 @@ class PrintPanel(ScreenPanel):
fileinfo = self._screen.files.get_file_info(filename)
if fileinfo is None:
return
info = '<small>' + _("Uploaded") + f': <b>{datetime.fromtimestamp(fileinfo["modified"]):%Y-%m-%d %H:%M}</b>\n'
return "<small>%s: <b>%s</b>\n%s: <b>%s</b>\n%s: <b>%s</b></small>" % (
_("Uploaded"),
datetime.fromtimestamp(fileinfo['modified']).strftime("%Y-%m-%d %H:%M"),
_("Size"),
self.formatsize(fileinfo['size']),
_("Print Time"),
self.get_print_time(filename)
)
def formatsize(self, size):
size = float(size)
suffixes = ["kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"]
for i, suffix in enumerate(suffixes, start=2):
unit = 1024 ** i
if size < unit:
return "%.1f %s" % ((1024 * size / unit), suffix)
def get_print_time(self, filename):
fileinfo = self._screen.files.get_file_info(filename)
if fileinfo is None:
return
if "size" in fileinfo:
info += _("Size") + f': <b>{self.format_size(fileinfo["size"])}</b>\n'
if "estimated_time" in fileinfo:
print_time = fileinfo['estimated_time']
print_str = ""
info += _("Print Time") + f': <b>{self.format_time(fileinfo["estimated_time"])}</b></small>'
# Figure out how many days
print_val = int(print_time / 86400)
if print_val > 0:
print_str = "%sd " % print_val
# Take remainder from days and divide by hours
print_val = int((print_time % 86400) / 3600)
if print_val > 0:
print_str = "%s%sh " % (print_str, print_val)
print_val = int(((print_time % 86400) % 3600) / 60)
print_str = "%s%sm" % (print_str, print_val)
return print_str
return "Unavailable"
return info
def reload_files(self, widget=None):
self.filelist = {'gcodes': {'directories': [], 'files': []}}
@@ -402,10 +368,10 @@ class PrintPanel(ScreenPanel):
def update_file(self, filename):
if filename not in self.labels['files']:
logging.debug("Cannot update file, file not in labels: %s" % filename)
logging.debug(f"Cannot update file, file not in labels: {filename}")
return
logging.info("Updating file %s" % filename)
logging.info(f"Updating file {filename}")
self.labels['files'][filename]['info'].set_markup(self.get_file_info_str(filename))
# Update icon
@@ -413,22 +379,22 @@ class PrintPanel(ScreenPanel):
if pixbuf is not None:
self.labels['files'][filename]['icon'].set_from_pixbuf(pixbuf)
def _callback(self, newfiles, deletedfiles, updatedfiles=[]):
logging.debug("newfiles: %s", newfiles)
def _callback(self, newfiles, deletedfiles, updatedfiles=None):
logging.debug(f"newfiles: {newfiles}")
for file in newfiles:
self.add_file(file)
logging.debug("deletedfiles: %s", deletedfiles)
logging.debug(f"deletedfiles: {deletedfiles}")
for file in deletedfiles:
self.delete_file(file)
logging.debug("updatefiles: %s", updatedfiles)
for file in updatedfiles:
self.update_file(file)
if updatedfiles is not None:
logging.debug(f"updatefiles: {updatedfiles}")
for file in updatedfiles:
self.update_file(file)
def _refresh_files(self, widget):
self._files.refresh_files()
def process_update(self, action, data):
if action == "notify_gcode_response":
if "unknown" in data.lower():
self._screen.show_popup_message("%s" % data)
if action == "notify_gcode_response" and "unknown" in data.lower():
self._screen.show_popup_message(data)
return