From a7f0cd87d9a03b97751207dd7079309e92bc2bf7 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 22 Nov 2014 19:43:38 +0200 Subject: Simplify how published basename is computed --- jt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jt b/jt index 57d7f6a..12db5b9 100755 --- a/jt +++ b/jt @@ -177,9 +177,10 @@ class FinishCommand(Command): draft_id, draft_mdwn = self._app.choose_draft(drafts_dir, args) draft_attch = drafts_dir.get_draft_attachments_dirname(draft_id) + title = drafts_dir.get_draft_title(draft_id) pub_attch = os.path.join( self._published_dir(), - self._published_basename(drafts_dir, draft_id, draft_mdwn)) + self._published_basename(title, draft_mdwn)) pub_mdwn = pub_attch + '.mdwn' if os.path.exists(pub_mdwn): @@ -205,11 +206,10 @@ class FinishCommand(Command): subdir = subdirs[self._app.settings['layout']] return os.path.join(self._app.settings['source'], subdir) - def _published_basename(self, drafts_dir, draft_id, draft_mdwn): + def _published_basename(self, title, draft_mdwn): if self._app.settings['layout'] in ('liw', 'ct'): basename = time.strftime('%Y-%m-%d-%H:%M:%S') elif self._app.settings['layout'] == 'pkb': - title = drafts_dir.get_draft_title(draft_id) if not title: raise Exception("%s has no title" % draft_mdwn) basename = self._summarise_title(title) -- cgit v1.2.1