diff options
Diffstat (limited to 'jt')
| -rwxr-xr-x | jt | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -51,7 +51,7 @@ class DraftsDirectory(object): def get_draft_pathname(self, draft_number): return os.path.join(self.dirname, '%s.mdwn' % draft_number) - def get_draft_attachment_dirname(self, draft_number): + def get_draft_attachments_dirname(self, draft_number): return os.path.join(self.dirname, '%s' % draft_number) def get_drafts(self): @@ -60,6 +60,14 @@ 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) + os.remove(filename) + + dirname = self.get_draft_attachments_dirname(draft_number) + if os.path.exists(dirname): + shutil.rmtree(dirname) + class Command(object): @@ -138,13 +146,7 @@ class RemoveCommand(Command): raise cliapp.AppException('Usage: journal-note remove ID') drafts_dir = DraftsDirectory(self._app.drafts_dir()) - filename = drafts_dir.get_draft_pathname(args[0]) - os.remove(filename) - - dirname, ext = os.path.splitext(filename) - assert ext == '.mdwn' - if os.path.exists(dirname): - shutil.rmtree(dirname) + drafts_dir.remove_draft(args[0]) class FinishCommand(Command): |