Use draft_id instead of draft_number

1 files changed, 17 insertions, 17 deletions

diff --git a/jt b/jt
index 34f2bee..73815f2 100755
--- a/jt
+++ b/jt
@@ -48,20 +48,20 @@ class DraftsDirectory(object):
         if not os.path.exists(self.dirname):
             os.mkdir(self.dirname)
 
-    def get_draft_pathname(self, draft_number):
-        return os.path.join(self.dirname, '%s.mdwn' % draft_number)
+    def get_draft_pathname(self, draft_id):
+        return os.path.join(self.dirname, '%s.mdwn' % draft_id)
 
-    def get_draft_attachments_dirname(self, draft_number):
-        return os.path.join(self.dirname, '%s' % draft_number)
+    def get_draft_attachments_dirname(self, draft_id):
+        return os.path.join(self.dirname, '%s' % draft_id)
 
     def create_draft(self, content):
-        draft_number = self._pick_available_draft_number()
-        pathname = self.get_draft_pathname(draft_number)
+        draft_id = self._pick_available_draft_id()
+        pathname = self.get_draft_pathname(draft_id)
         with open(pathname, 'w') as f:
             f.write(content)
-        return draft_number
+        return draft_id
 
-    def _pick_available_draft_number(self):
+    def _pick_available_draft_id(self):
         for i in range(1000):
             pathname = self.get_draft_pathname(i)
             if not os.path.exists(pathname):
@@ -75,11 +75,11 @@ class DraftsDirectory(object):
             if basename.endswith('.mdwn') and not basename.startswith('.#'):
                 yield basename[:-len('.mdwn')], os.path.join(self.dirname, basename)
 
-    def remove_draft(self, draft_number):
-        filename = self.get_draft_pathname(draft_number)
+    def remove_draft(self, draft_id):
+        filename = self.get_draft_pathname(draft_id)
         os.remove(filename)
 
-        dirname = self.get_draft_attachments_dirname(draft_number)
+        dirname = self.get_draft_attachments_dirname(draft_id)
         if os.path.exists(dirname):
             shutil.rmtree(dirname)
 
@@ -109,8 +109,8 @@ class NewCommand(Command):
 
         drafts_dir = DraftsDirectory(self._app.drafts_dir())
         drafts_dir.create_if_missing()
-        draft_number = drafts_dir.create_draft(template % values)
-        self._app.edit_file(drafts_dir.get_draft_pathname(draft_number))
+        draft_id = drafts_dir.create_draft(template % values)
+        self._app.edit_file(drafts_dir.get_draft_pathname(draft_id))
 
 
 class ListCommand(Command):
@@ -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())
-        draft_number, pathname = self._app.choose_draft(drafts_dir, args)
+        draft_id, 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_number, draft_mdwn = self._app.choose_draft(drafts_dir, args)
+        draft_id, 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_number, filename = drafts[0]
-                return draft_number, filename
+                draft_id, filename = drafts[0]
+                return draft_id, filename
             elif len(drafts) == 0:
                 raise cliapp.AppException('No drafts to choose from')
             else: