From c08a293f83a3a584ec30dcf065116445d51a2ae1 Mon Sep 17 00:00:00 2001 From: Jordan Ruthe Date: Tue, 29 Dec 2020 10:35:23 -0500 Subject: [PATCH] job_status: fix problem with directories in the filename --- ks_includes/files.py | 5 +++-- panels/job_status.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ks_includes/files.py b/ks_includes/files.py index 7fcf2c58..68a1d2eb 100644 --- a/ks_includes/files.py +++ b/ks_includes/files.py @@ -72,7 +72,8 @@ class KlippyFiles: self.files[params['filename']]['thumbnails'].sort(key=lambda x: x['size'], reverse=True) for thumbnail in self.files[params['filename']]['thumbnails']: - f = open("%s/%s-%s" % (self.thumbnail_dir, params['filename'], thumbnail['size']), "wb") + f = open("%s/%s-%s" % (self.thumbnail_dir, params['filename'].split('/')[-1], thumbnail['size']), + "wb") f.write(base64.b64decode(thumbnail['data'])) f.close() for cb in self.callbacks: @@ -106,7 +107,7 @@ class KlippyFiles: def get_thumbnail_location(self, filename): if not self.has_thumbnail(filename): return None - return "%s/%s-%s" % (self.thumbnail_dir, filename, self.files[filename]['thumbnails'][0]['size']) + return "%s/%s-%s" % (self.thumbnail_dir, filename.split('/')[-1], self.files[filename]['thumbnails'][0]['size']) def has_thumbnail(self, filename): if filename not in self.files: diff --git a/panels/job_status.py b/panels/job_status.py index 21c4f668..c3d43456 100644 --- a/panels/job_status.py +++ b/panels/job_status.py @@ -416,7 +416,7 @@ class JobStatusPanel(ScreenPanel): if ps['filename'] != "": self.filename = ps['filename'] self.file_metadata = None - self.update_text("file", self.filename) + self.update_text("file", self.filename.split("/")[-1]) else: file = "Unknown" self.update_text("file", "Unknown file")