Interactive delete

features/core.feature

@@ -71,4 +71,3 @@ Feature: Basic reading and writing to a journal
         Given we use the config "basic.yaml"
         When we run "jrnl -on 2013-06-10 -s"
         Then the output should be "2013-06-10 15:40 Life is good."
-

features/data/configs/deletion.yaml

@@ -0,0 +1,12 @@
+default_hour: 9
+default_minute: 0
+editor: ""
+encrypt: false
+highlight: true
+journals:
+  default: features/journals/deletion.journal
+linewrap: 80
+tagsymbols: "@"
+template: false
+timeformat: "%Y-%m-%d %H:%M"
+indent_character: "|"

features/data/journals/deletion.journal

@@ -0,0 +1,5 @@
+[2019-10-29 11:11] First entry.
+
+[2019-10-29 11:11] Second entry.
+
+[2019-10-29 11:13] Third entry.

features/delete.feature

@@ -0,0 +1,20 @@
+Feature: Delete entries from journal
+
+    Scenario: --delete flag allows deletion of single entry
+        Given we use the config "deletion.yaml"
+        When we run "jrnl -n 1"
+        Then the output should contain
+        """
+        2019-10-29 11:13 Third entry.
+        """
+        When we run "jrnl --delete" and enter
+        """
+        N
+        N
+        Y
+        """
+        When we run "jrnl -n 1"
+        Then the output should contain
+        """
+        2019-10-29 11:11 Second entry.
+        """

jrnl/Journal.py

@@ -1,13 +1,15 @@
 #!/usr/bin/env python
 
-from . import Entry
-from . import util
-from . import time
+import logging
 import os
 import sys
 import re
+
 from datetime import datetime
-import logging
+from itertools import filterfalse
+from jrnl import Entry
+from jrnl import util
+from jrnl import time
 
 log = logging.getLogger(__name__)
 
@@ -111,7 +113,8 @@ def _to_text(self):
     def _load(self, filename):
         raise NotImplementedError
 
-    def _store(self, filename, text):
+    @classmethod
+    def _store(filename, text):
         raise NotImplementedError
 
     def _parse(self, journal_txt):
@@ -247,12 +250,28 @@ def filter(
 
         self.entries = result
 
+    def prompt_delete_entries(self):
+        """Prompts for deletion of entries in a journal."""
+
+        to_delete = []
+
+        def ask_delete(entry):
+            return util.yesno(
+                f"Delete entry '{entry.pprint(short=True)}'?", default=False,
+            )
+
+        for entry in self.entries:
+            if ask_delete(entry):
+                to_delete.append(entry)
+
+        self.entries = [entry for entry in self.entries if entry not in to_delete]
+        self.write()
+
     def new_entry(self, raw, date=None, sort=True):
         """Constructs a new entry from some raw text input.
         If a date is given, it will parse and use this, otherwise scan for a date in the input first."""
 
         raw = raw.replace("\\n ", "\n").replace("\\n", "\n")
-        starred = False
         # Split raw text into title and body
         sep = re.search(r"\n|[?!.]+ +\n?", raw)
         first_line = raw[: sep.end()].strip() if sep else raw

jrnl/cli.py

@@ -173,6 +173,12 @@ def parse_args(args=None):
         action="store_true",
     )
 
+    exporting.add_argument(
+        "--delete",
+        dest="delete",
+        action="store_true",
+        help="Opens an interactive interface for deleting entries.",
+    )
     return parser.parse_args(args)
 
 
@@ -189,7 +195,7 @@ def guess_mode(args, config):
         args.decrypt is not False
         or args.encrypt is not False
         or args.export is not False
-        or any((args.short, args.tags, args.edit))
+        or any((args.short, args.tags, args.edit, args.delete))
     ):
         compose = False
         export = True
@@ -459,3 +465,7 @@ def run(manual_args=None):
         journal.entries += other_entries
         journal.sort()
         journal.write()
+
+    elif args.delete:
+        journal.prompt_delete_entries()
+        journal.write()

jrnl/util.py

@@ -112,7 +112,7 @@ def set_keychain(journal_name, password):
 def yesno(prompt, default=True):
     prompt = f"{prompt.strip()} {'[Y/n]' if default else '[y/N]'} "
     response = input(prompt)
-    return {"y": True, "n": False}.get(response.lower(), default)
+    return {"y": True, "n": False}.get(response.lower().strip(), default)
 
 
 def load_config(config_path):