From a94a0fb1e26b926cffec54ddfa84dc8f71720b80 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 22 Nov 2014 18:24:32 +0200 Subject: Move published_dir into FinishCommand --- jt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/jt b/jt index 74673be..0b12ff9 100755 --- a/jt +++ b/jt @@ -131,14 +131,14 @@ class FinishCommand(Command): assert ext == '.mdwn' pub_attch = os.path.join( - self._app.published_dir(), self._app.published_basename(draft_mdwn)) + self.published_dir(), self._app.published_basename(draft_mdwn)) pub_mdwn = pub_attch + '.mdwn' if os.path.exists(pub_mdwn): raise cliapp.AppException('%s already exists' % pub_mdwn) - if not os.path.exists(self._app.published_dir()): - os.makedirs(self._app.published_dir()) + if not os.path.exists(self.published_dir()): + os.makedirs(self.published_dir()) os.rename(draft_mdwn, pub_mdwn) if os.path.exists(draft_attch): os.rename(draft_attch, pub_attch) @@ -156,6 +156,16 @@ class FinishCommand(Command): ['git', 'push', 'origin', 'HEAD'], cwd=self._app.settings['source']) + def published_dir(self): + subdirs = { + 'liw': 'notes', + 'ct': 'log/%d' % time.localtime().tm_year, + 'pkb': time.strftime('notes/%Y/%m/%d'), + } + + subdir = subdirs[self._app.settings['layout']] + return os.path.join(self._app.settings['source'], subdir) + class NewPersonCommand(Command): @@ -304,16 +314,6 @@ class JournalTool(cliapp.Application): '''Publish a draft journal entry.''' FinishCommand(self).run(args) - def published_dir(self): - subdirs = { - 'liw': 'notes', - 'ct': 'log/%d' % time.localtime().tm_year, - 'pkb': time.strftime('notes/%Y/%m/%d'), - } - - subdir = subdirs[self.settings['layout']] - return os.path.join(self.settings['source'], subdir) - def published_basename(self, draft_mdwn): if self.settings['layout'] in ('liw', 'ct'): basename = time.strftime('%Y-%m-%d-%H:%M:%S') -- cgit v1.2.1