print: fix directory dates fixes #1199

ks_includes/KlippyWebsocket.py

@@ -211,6 +211,15 @@ class MoonrakerApi:
             *args
         )
 
+    def get_dir_info(self, callback=None, directory='gcodes', *args):
+        logging.debug("Sending server.files.get_directory")
+        return self._ws.send_method(
+            "server.files.get_directory",
+            {"path": directory},
+            callback,
+            *args
+        )
+
     def get_file_metadata(self, filename, callback=None, *args):
         return self._ws.send_method(
             "server.files.metadata",

ks_includes/files.py

@@ -13,6 +13,7 @@ class KlippyFiles:
         self.callbacks = []
         self.files = {}
         self.filelist = []
+        self.directories = []
         self.gcodes_path = None
 
     def initialize(self):
@@ -27,6 +28,7 @@ class KlippyFiles:
         self.callbacks = None
         self.files = None
         self.filelist = None
+        self.directories = None
         self.gcodes_path = None
 
     def _callback(self, result, method, params):
@@ -85,6 +87,13 @@ class KlippyFiles:
                         fdir = os.path.dirname(params['filename'])
                         thumbnail['path'] = os.path.join(fdir, thumbnail['relative_path'])
             self.run_callbacks(mods=[params['filename']])
+        elif method == "server.files.get_directory":
+            if 'result' not in result or 'dirs' not in result['result']:
+                return
+            for x in result['result']['dirs']:
+                if x not in self.directories:
+                    self.directories.append(x)
+                    self.get_dir_info(x['dirname'])
 
     def add_file(self, item, notify=True):
         if 'filename' not in item and 'path' not in item:
@@ -166,6 +175,7 @@ class KlippyFiles:
 
     def refresh_files(self):
         self._screen._ws.klippy.get_file_list(self._callback)
+        self._screen._ws.klippy.get_dir_info(self._callback)
         return False
 
     def remove_file(self, filename, notify=True):
@@ -199,3 +209,6 @@ class KlippyFiles:
         if filename not in self.files:
             return {"path": None, "modified": 0, "size": 0}
         return self.files[filename]
+
+    def get_dir_info(self, directory):
+        self._screen._ws.klippy.get_dir_info(self._callback, directory=directory)

panels/print.py

@@ -82,8 +82,13 @@ class Panel(ScreenPanel):
 
     def add_directory(self, directory, show=True):
         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
         if directory not in self.filelist:
-            self.filelist[directory] = {'directories': [], 'files': [], 'modified': 0}
+            self.filelist[directory] = {'directories': [], 'files': [], 'modified': modified}
             self.filelist[parent_dir]['directories'].append(directory)
 
         if directory not in self.labels['directories']:
@@ -114,22 +119,22 @@ class Panel(ScreenPanel):
             curdir = os.path.join(*d[:i])
             newdir = os.path.join(*d[:i + 1])
             if newdir not in self.filelist[curdir]['directories']:
-                if d[i].startswith("."):
+                if newdir.startswith("."):
                     return
                 self.add_directory(newdir)
 
         if filename not in self.filelist[directory]['files']:
             for i in range(1, len(d)):
                 curdir = os.path.join(*d[:i + 1])
-                if curdir != "gcodes" and fileinfo['modified'] > self.filelist[curdir]['modified']:
-                    self.filelist[curdir]['modified'] = fileinfo['modified']
-                    if self.time_24:
-                        time = f':<b>{self.space}{datetime.fromtimestamp(fileinfo["modified"]):%Y/%m/%d %H:%M}</b>'
-                    else:
-                        time = f':<b>{self.space}{datetime.fromtimestamp(fileinfo["modified"]):%Y/%m/%d %I:%M %p}</b>'
-                    info = _("Modified") + time
-                    info += "\n" + _("Size") + f':<b>{self.space}{self.format_size(fileinfo["size"])}</b>'
-                    self.labels['directories'][curdir]['info'].set_markup(info)
+                if self.time_24:
+                    time = f":<b>{self.space}" \
+                           f"{datetime.fromtimestamp(self.filelist[curdir]['modified']):%Y/%m/%d %H:%M}</b>"
+                else:
+                    time = f":<b>{self.space}" \
+                           f"{datetime.fromtimestamp(self.filelist[curdir]['modified']):%Y/%m/%d %I:%M %p}</b>"
+                info = _("Modified") + time
+                info += "\n" + _("Size") + f':<b>{self.space}{self.format_size(fileinfo["size"])}</b>'
+                self.labels['directories'][curdir]['info'].set_markup(info)
             self.filelist[directory]['files'].append(filename)
 
         if filepath not in self.files:
@@ -394,21 +399,17 @@ class Panel(ScreenPanel):
             logging.debug(f"Cannot update file, file not in labels: {filename}")
             return
 
-        logging.info(f"Updating file {filename}")
         self.labels['files'][filename]['info'].set_markup(self.get_file_info_str(filename))
 
         # Update icon
         GLib.idle_add(self.image_load, filename)
 
     def _callback(self, newfiles, deletedfiles, updatedfiles=None):
-        logging.debug(f"newfiles: {newfiles}")
         for file in newfiles:
             self.add_file(file)
-        logging.debug(f"deletedfiles: {deletedfiles}")
         for file in deletedfiles:
             self.delete_file(file)
         if updatedfiles is not None:
-            logging.debug(f"updatefiles: {updatedfiles}")
             for file in updatedfiles:
                 self.update_file(file)
         return False