diff --git a/docs/Config_Reference.md b/docs/Config_Reference.md index c0d0c3eafb90..27ced9687a1e 100644 --- a/docs/Config_Reference.md +++ b/docs/Config_Reference.md @@ -4535,7 +4535,7 @@ information on menu attributes available during template rendering. # Reverse order of sorting. # When sort_by_date is True, files will be sorted from new to old. # When sort_by_date is False, files will be sorted in alphabetical -# descending order, else they will be sorted in alphabetical +# descending order, else they will be sorted in alphabetical # ascending order. #[menu some_list] diff --git a/klippy/extras/display/menu.py b/klippy/extras/display/menu.py index 25689847579c..a1c2810ca7b2 100644 --- a/klippy/extras/display/menu.py +++ b/klippy/extras/display/menu.py @@ -665,12 +665,14 @@ def __init__(self, manager, config, **kwargs): self._sort_by_date = kwargs.get('sort_by_date', False) super(MenuVSDList, self).__init__(manager, config, **kwargs) try: - self._sort_reverse = config.getboolean('sort_reverse', self._sort_reverse) + self._sort_reverse = config.getboolean('sort_reverse', + self._sort_reverse) except config.error: logging.debug("Failed to get sort_reverse from config file") pass try: - self._sort_by_date = config.getboolean('sort_by_date', self._sort_by_date) + self._sort_by_date = config.getboolean('sort_by_date', + self._sort_by_date) except config.error: logging.debug("Failed to get sort_by_date from config file") pass @@ -679,7 +681,8 @@ def _populate(self): super(MenuVSDList, self)._populate() sdcard = self.manager.printer.lookup_object('virtual_sdcard', None) if sdcard is not None: - files = sdcard.get_file_list(sortByDate=self._sort_by_date, sortReverse=self._sort_reverse) + files = sdcard.get_file_list(sortByDate=self._sort_by_date, + sortReverse=self._sort_reverse) for fname, fsize in files: self.insert_item(self.manager.menuitem_from( 'command', name=repr(fname), gcode='M23 /%s' % str(fname))) diff --git a/klippy/extras/virtual_sdcard.py b/klippy/extras/virtual_sdcard.py index 70c3500e6f3b..f2972700d6a7 100644 --- a/klippy/extras/virtual_sdcard.py +++ b/klippy/extras/virtual_sdcard.py @@ -64,7 +64,8 @@ def stats(self, eventtime): if self.work_timer is None: return False, "" return True, "sd_pos=%d" % (self.file_position,) - def get_file_list(self, check_subdirs=False, sortByDate=False, sortReverse=False): + def get_file_list(self, check_subdirs=False, + sortByDate=False, sortReverse=False): if check_subdirs: flist = [] for root, dirs, files in os.walk( @@ -79,7 +80,9 @@ def get_file_list(self, check_subdirs=False, sortByDate=False, sortReverse=False flist.append((r_path, size)) if sortByDate: if sortReverse: - return sorted(flist, key=lambda f: os.path.getmtime(f[0], reverse=True)) + return sorted(flist, + key=lambda f: os.path.getmtime(f[0], + reverse=True)) return sorted(flist, key=lambda f: os.path.getmtime(f[0])) if sortReverse: return sorted(flist, key=lambda f: f[0].lower(), reverse=True) @@ -90,17 +93,24 @@ def get_file_list(self, check_subdirs=False, sortByDate=False, sortReverse=False filenames = os.listdir(self.sdcard_dirname) if sortByDate: if sortReverse: - return [(fname, os.path.getsize(os.path.join(dname, fname))) - for fname in sorted(filenames, key=lambda f: os.path.getmtime(os.path.join(dname, f)), reverse=True) + return [(fname, + os.path.getsize(os.path.join(dname, fname))) + for fname in sorted(filenames, + key=lambda f: os.path.getmtime( + os.path.join(dname, f)), + reverse=True) if not fname.startswith('.') and os.path.isfile((os.path.join(dname, fname)))] return [(fname, os.path.getsize(os.path.join(dname, fname))) - for fname in sorted(filenames, key=lambda f: os.path.getmtime(os.path.join(dname, f))) + for fname in sorted(filenames, + key=lambda f: os.path.getmtime( + os.path.join(dname, f))) if not fname.startswith('.') and os.path.isfile((os.path.join(dname, fname)))] if sortReverse: return [(fname, os.path.getsize(os.path.join(dname, fname))) - for fname in sorted(filenames, key=str.lower, reverse=True) + for fname in sorted(filenames, key=str.lower, + reverse=True) if not fname.startswith('.') and os.path.isfile((os.path.join(dname, fname)))] return [(fname, os.path.getsize(os.path.join(dname, fname)))