From 46f3f80c8afeaf195268a81ab469746e6d0cd04b Mon Sep 17 00:00:00 2001
From: alfrix <alfredomonclus@gmail.com>
Date: Wed, 13 Mar 2024 17:47:36 -0300
Subject: [PATCH] print: fix print time not showing in subfolders fixes #1294

---
 ks_includes/files.py | 9 +++++----
 panels/print.py      | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ks_includes/files.py b/ks_includes/files.py
index 84259d89..c1ceb4eb 100644
--- a/ks_includes/files.py
+++ b/ks_includes/files.py
@@ -113,10 +113,11 @@ class KlippyFiles:
         for cb in self.callbacks:
             cb(action, item)
 
-    def get_file_info(self, filename):
-        if filename not in self.files:
-            return {"path": None, "modified": 0, "size": 0}
-        return self.files[filename]
+    def get_file_info(self, path):
+        if path not in self.files:
+            logging.info(f"Metadata not found {path}")
+            return {}
+        return self.files[path]
 
     def get_dir_info(self, directory):
         self._screen._ws.klippy.get_dir_info(self._callback, directory=directory)
diff --git a/panels/print.py b/panels/print.py
index d4345a9a..664e3ec6 100644
--- a/panels/print.py
+++ b/panels/print.py
@@ -144,7 +144,7 @@ class Panel(ScreenPanel):
             format_label(label)
             info = Gtk.Label(hexpand=True, halign=Gtk.Align.START, wrap=True, wrap_mode=Pango.WrapMode.WORD_CHAR)
             info.get_style_context().add_class("print-info")
-            info.set_markup(self.get_info_str(item))
+            info.set_markup(self.get_info_str(item, path))
             delete = Gtk.Button(hexpand=False, vexpand=False, can_focus=False, always_show_image=True)
             delete.get_style_context().add_class("color1")
             delete.set_image(self._gtk.Image("delete", self.list_button_size, self.list_button_size))
@@ -331,7 +331,7 @@ class Panel(ScreenPanel):
             logging.info(f"Starting print: {filename}")
             self._screen._ws.klippy.print_start(filename)
 
-    def get_info_str(self, item):
+    def get_info_str(self, item, path):
         info = ""
         if "modified" in item:
             info += _("Modified") if 'dirname' in item else _("Uploaded")
@@ -342,7 +342,7 @@ class Panel(ScreenPanel):
         if "size" in item:
             info += _("Size") + f': <b>{self.format_size(item["size"])}</b>\n'
         if 'filename' in item:
-            fileinfo = self._screen.files.get_file_info(item['filename'])
+            fileinfo = self._screen.files.get_file_info(path)
             if "estimated_time" in fileinfo:
                 info += _("Print Time") + f': <b>{self.format_time(fileinfo["estimated_time"])}</b>'
         return info