From fedf9d9c725e4a5daa90a417bb20bd576bdd1bf2 Mon Sep 17 00:00:00 2001 From: Antoni Boucher Date: Fri, 7 Aug 2015 22:45:54 -0400 Subject: [PATCH] Replaced tuple by dict. --- qutebrowser/browser/dirbrowser.py | 10 ++++++---- qutebrowser/html/dirbrowser.html | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/qutebrowser/browser/dirbrowser.py b/qutebrowser/browser/dirbrowser.py index c079a5cfb..1b7a2bd92 100644 --- a/qutebrowser/browser/dirbrowser.py +++ b/qutebrowser/browser/dirbrowser.py @@ -49,10 +49,12 @@ def dirbrowser(url): else: parent = os.path.dirname(url) all_files = os.listdir(url) - files = sorted([(file, os.path.join(url, file)) for file in all_files if - is_file(file)]) - directories = sorted([(file, os.path.join(url, file)) for file in - all_files if is_dir(file)]) + files = sorted([{'name': file, 'absname': os.path.join(url, file)} + for file in all_files if is_file(file)], + key=lambda v: v['name'].lower()) + directories = sorted([{'name': file, 'absname': os.path.join(url, file)} + for file in all_files if is_dir(file)], + key=lambda v: v['name'].lower()) html = template.render(title=title, url=url, icon='', parent=parent, files=files, directories=directories) return html diff --git a/qutebrowser/html/dirbrowser.html b/qutebrowser/html/dirbrowser.html index 19659caf5..d5fefc489 100644 --- a/qutebrowser/html/dirbrowser.html +++ b/qutebrowser/html/dirbrowser.html @@ -31,11 +31,11 @@ {% endif %} {% for item in directories %} -
  • {{item.0}}
  • +
  • {{item.name}}
  • {% endfor %} {% for item in files %} -
  • {{item.0}}
  • +
  • {{item.name}}
  • {% endfor %}