From a6d89f8ea1f007a49c0d38c1556b67bf9f2b7541 Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Fri, 24 Jun 2016 07:42:50 +0200 Subject: [PATCH] [enh] journal list correctly list available journals --- src/yunohost/journals.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/yunohost/journals.py b/src/yunohost/journals.py index ab245a78f..0be01853f 100644 --- a/src/yunohost/journals.py +++ b/src/yunohost/journals.py @@ -50,7 +50,23 @@ def journals_list(): if not os.path.exists(JOURNALS_PATH): return {} - return {} + result = {} + + for category in os.listdir(JOURNALS_PATH): + result[category] = [] + for journal in filter(lambda x: x.endswith(".journal"), os.listdir(os.path.join(JOURNALS_PATH, category))): + + journal = journal[:-len(".journal")] + journal = journal.split("_") + journal_datetime = datetime.strptime(" ".join(journal[-2:]), "%Y-%m-%d %H-%M-%S") + result[category].append({ + "started_at": journal_datetime, + "name": " ".join(journal[:-2]), + }) + + result[category] = list(reversed(sorted(result[category], key=lambda x: x["started_at"]))) + + return result class Journal(object):