Move published_basename into FinishCommand

1 files changed, 15 insertions, 15 deletions

diff --git a/jt b/jt
index 0b12ff9..951a3f6 100755
--- a/jt
+++ b/jt
@@ -131,7 +131,7 @@ class FinishCommand(Command):
         assert ext == '.mdwn'
 
         pub_attch = os.path.join(
-            self.published_dir(), self._app.published_basename(draft_mdwn))
+            self.published_dir(), self.published_basename(draft_mdwn))
         pub_mdwn = pub_attch + '.mdwn'
 
         if os.path.exists(pub_mdwn):
@@ -166,6 +166,20 @@ class FinishCommand(Command):
         subdir = subdirs[self._app.settings['layout']]
         return os.path.join(self._app.settings['source'], subdir)
 
+    def published_basename(self, 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 = self._app.get_draft_title(draft_mdwn)
+            if not title:
+                raise Exception("%s has no title" % draft_mdwn)
+            basename = self._app.summarise_title(title)
+        else:
+            raise Exception(
+                'Setting --layout=%s is unknown' % self._app.settings['layout'])
+
+        return basename
+
 
 class NewPersonCommand(Command):
 
@@ -314,20 +328,6 @@ class JournalTool(cliapp.Application):
         '''Publish a draft journal entry.'''
         FinishCommand(self).run(args)
 
-    def published_basename(self, draft_mdwn):
-        if self.settings['layout'] in ('liw', 'ct'):
-            basename = time.strftime('%Y-%m-%d-%H:%M:%S')
-        elif self.settings['layout'] == 'pkb':
-            title = self.get_draft_title(draft_mdwn)
-            if not title:
-                raise Exception("%s has no title" % draft_mdwn)
-            basename = self.summarise_title(title)
-        else:
-            raise Exception(
-                'Setting --layout=%s is unknown' % self.settings['layout'])
-
-        return basename
-
     def summarise_title(self, title):
         basename = ''
         acceptable = set(string.ascii_letters + string.digits + '-_')