From dedb09a52aec341265cd77c760d51a6ac32a2442 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 22 Nov 2014 19:15:00 +0200 Subject: Make choose_draft return draft number as well --- jt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jt b/jt index 16108c9..34f2bee 100755 --- a/jt +++ b/jt @@ -127,7 +127,7 @@ class EditCommand(Command): if len(args) > 1: raise cliapp.AppException('Must be given at most one draft ID') drafts_dir = DraftsDirectory(self._app.drafts_dir()) - pathmame = self._app.choose_draft(drafts_dir, args) + draft_number, pathname = self._app.choose_draft(drafts_dir, args) self._app.edit_file(pathname) @@ -159,7 +159,7 @@ class FinishCommand(Command): def run(self, args): drafts_dir = DraftsDirectory(self._app.drafts_dir()) - draft_mdwn = self._app.choose_draft(drafts_dir, args) + draft_number, draft_mdwn = self._app.choose_draft(drafts_dir, args) draft_attch, ext = os.path.splitext(draft_mdwn) assert ext == '.mdwn' @@ -327,8 +327,8 @@ class JournalTool(cliapp.Application): if len(args) == 0: drafts = list(drafts_dir.get_drafts()) if len(drafts) == 1: - draft_id, filename = drafts[0] - return filename + draft_number, filename = drafts[0] + return draft_number, filename elif len(drafts) == 0: raise cliapp.AppException('No drafts to choose from') else: @@ -337,7 +337,7 @@ class JournalTool(cliapp.Application): pathname = drafts_dir.get_draft_pathname(args[0]) if not os.path.exists(pathname): raise cliapp.AppException('draft %s does not exist' % args[0]) - return pathname + return args[0], pathname elif len(args) > 1: raise cliapp.AppException('Must give at most one draft number') -- cgit v1.2.1