From 951d8805aaf7fd81e223896c67869fd34769396b Mon Sep 17 00:00:00 2001 From: Elena ``of Valhalla'' Grandi Date: Mon, 2 Jan 2017 19:06:27 +0100 Subject: Improve showing of entries in the command line --- lesana/collection.py | 5 ++++- lesana/command.py | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lesana/collection.py b/lesana/collection.py index f850a47..1965bc4 100644 --- a/lesana/collection.py +++ b/lesana/collection.py @@ -32,7 +32,10 @@ class Entry(object): label = self.collection.settings.get('entry_label', None) if label: t = jinja2.Template(label) - return t.render(uid=self.uid, **self.data) + return t.render( + uid=self.uid, + fname=self.fname, + **self.data) else: return self.uid diff --git a/lesana/command.py b/lesana/command.py index 4937ccf..0662d93 100644 --- a/lesana/command.py +++ b/lesana/command.py @@ -81,7 +81,7 @@ class New(gadona.Command): ) if edit_file_in_external_editor(filepath): collection.update_cache([filepath]) - print(new_entry.fname) + print(new_entry) class Edit(gadona.Command): @@ -98,13 +98,13 @@ class Edit(gadona.Command): def main(self): collection = Collection(self.settings.collection) entry = collection.entry_from_uid(self.settings.uid) - print(collection.itemdir,entry.fname) filepath = os.path.join( collection.itemdir, entry.fname ) if edit_file_in_external_editor(filepath): collection.update_cache([filepath]) + print(entry) class Index(gadona.Command): @@ -169,7 +169,7 @@ class Search(gadona.Command): ' '.join(self.settings.query), offset, pagesize): - print(entry.fname) + print(entry) class Init(gadona.Command): -- cgit v1.2.3