doing 2.1.13 → 2.1.17

data/bin/doing

@@ -70,6 +70,12 @@ if settings.dig('plugins', 'command_path')
   commands_from File.expand_path(settings.dig('plugins', 'command_path'))
 end
 
+class TagArray < Array; end
+
+accept TagArray do |value|
+  value.gsub(/[, ]+/, ' ').split(' ').map { |tag| tag.sub(/^@/, '')}.map(&:strip)
+end
+
 program_desc 'A CLI for a What Was I Doing system'
 program_long_desc %(Doing uses a TaskPaper-like formatting to keep a plain text
 record of what you've been doing, complete with tag-based time tracking. The
@@ -139,7 +145,7 @@ command %i[again resume] do |c|
 
   c.desc 'Repeat last entry matching tags. Combine multiple tags with a comma. Wildcards allowed (*, ?)'
   c.arg_name 'TAG'
-  c.flag [:tag]
+  c.flag [:tag], type: TagArray
 
   c.desc 'Repeat last entry matching search. Surround with
   slashes for regex (e.g. "/query/"), start with a single quote for exact match ("\'query").'
@@ -170,16 +176,19 @@ command %i[again resume] do |c|
   c.desc "Edit duplicated entry with #{Doing::Util.default_editor} before adding"
   c.switch %i[e editor], negatable: false, default_value: false
 
-  c.desc 'Note'
+  c.desc 'Add a note'
   c.arg_name 'TEXT'
   c.flag %i[n note]
 
+  c.desc 'Prompt for note via multi-line input'
+  c.switch %i[ask], negatable: false, default_value: false
+
   c.desc 'Select item to resume from a menu of matching entries'
   c.switch %i[i interactive], negatable: false, default_value: false
 
   c.action do |_global_options, options, _args|
     options[:fuzzy] = false
-    tags = options[:tag].nil? ? [] : options[:tag].to_tags
+    tags = options[:tag].nil? ? [] : options[:tag]
 
     options[:case] = options[:case].normalize_case
 
@@ -189,6 +198,11 @@ command %i[again resume] do |c|
       options[:search] = search
     end
 
+    note = Doing::Note.new(options[:note])
+    note.add(Doing::Prompt.read_lines(prompt: 'Add a note')) if options[:ask]
+
+    options[:note] = note
+
     opts = options.dup
 
     opts[:tag] = tags
@@ -216,7 +230,7 @@ command :cancel do |c|
 
   c.desc 'Cancel the last X entries containing TAG. Separate multiple tags with comma (--tag=tag1,tag2). Wildcards allowed (*, ?)'
   c.arg_name 'TAG'
-  c.flag [:tag]
+  c.flag [:tag], type: TagArray
 
   c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
@@ -260,7 +274,7 @@ command :cancel do |c|
     if options[:tag].nil?
       tags = []
     else
-      tags = options[:tag].to_tags
+      tags = options[:tag]
     end
 
     raise InvalidArgument, 'Only one argument allowed' if args.length > 1
@@ -324,19 +338,26 @@ command %i[done did] do |c|
   c.switch %i[a archive], negatable: false, default_value: false
 
   c.desc %(Set finish date to specific date/time (natural langauge parsed, e.g. --at=1:30pm).
-  If used, ignores --back. Used with --took, backdates start date)
+  Used with --took, backdates start date)
   c.arg_name 'DATE_STRING'
-  c.flag [:at]
+  c.flag %i[at finished]
 
   c.desc 'Backdate start date by interval or set to time [4pm|20m|2h|"yesterday noon"]'
   c.arg_name 'DATE_STRING'
   c.flag %i[b back started]
 
+  c.desc %(
+        Start and end times as a date/time range `doing done --from "1am to 8am"`.
+        Overrides other date flags.
+      )
+  c.arg_name 'TIME_RANGE'
+  c.flag [:from]
+
   c.desc %(Set completion date to start date plus interval (XX[mhd] or HH:MM).
   If used without the --back option, the start date will be moved back to allow
   the completion date to be the current time.)
   c.arg_name 'INTERVAL'
-  c.flag %i[t took]
+  c.flag %i[t took for]
 
   c.desc 'Section'
   c.arg_name 'NAME'
@@ -349,6 +370,9 @@ command %i[done did] do |c|
   c.arg_name 'TEXT'
   c.flag %i[n note]
 
+  c.desc 'Prompt for note via multi-line input'
+  c.switch %i[ask], negatable: false, default_value: false
+
   c.desc 'Finish last entry not already marked @done'
   c.switch %i[u unfinished], negatable: false, default_value: false
 
@@ -360,30 +384,41 @@ command %i[done did] do |c|
     took = 0
     donedate = nil
 
-    if options[:took]
-      took = options[:took].chronify_qty
-      raise InvalidTimeExpression, 'Unable to parse date string for --took' if took.nil?
-    end
-
-    if options[:back]
-      date = options[:back].chronify(guess: :begin)
-      raise InvalidTimeExpression, 'Unable to parse date string for --back' if date.nil?
+    if options[:from]
+      date, finish_date = options[:from].split_date_range
+      finish_date ||= Time.now
     else
-      date = options[:took] ? Time.now - took : Time.now
-    end
+      if options[:took]
+        took = options[:took].chronify_qty
+        raise InvalidTimeExpression, 'Unable to parse date string for --took' if took.nil?
+      end
 
-    if options[:at]
-      finish_date = options[:at].chronify(guess: :begin)
-      raise InvalidTimeExpression, 'Unable to parse date string for --at' if finish_date.nil?
+      if options[:back]
+        date = options[:back].chronify(guess: :begin)
+        raise InvalidTimeExpression, 'Unable to parse date string for --back' if date.nil?
+      else
+        date = options[:took] ? Time.now - took : Time.now
+      end
 
-      date = options[:took] ? finish_date - took : finish_date
-    elsif options[:took]
-      finish_date = date + took
-    else
-      finish_date = Time.now
+      if options[:at]
+        finish_date = options[:at].chronify(guess: :begin)
+        raise InvalidTimeExpression, 'Unable to parse date string for --at' if finish_date.nil?
+
+        if options[:took]
+          date = finish_date - took
+        else
+          date ||= finish_date
+        end
+      elsif options[:took]
+        finish_date = date + took
+      else
+        finish_date = Time.now
+      end
     end
 
     if options[:date]
+      finish_date = wwid.verify_duration(date, finish_date) unless options[:took] || options[:from]
+
       donedate = finish_date.strftime('%F %R')
     end
 
@@ -393,9 +428,14 @@ command %i[done did] do |c|
       section = settings['current_section']
     end
 
+
     note = Doing::Note.new
     note.add(options[:note]) if options[:note]
 
+    if options[:ask] && !options[:editor]
+      note.add(Doing::Prompt.read_lines(prompt: 'Add a note'))
+    end
+
     if options[:editor]
       raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
       is_new = false
@@ -420,6 +460,12 @@ command %i[done did] do |c|
       raise EmptyInput, 'No content' unless input && !input.empty?
 
       d, title, note = wwid.format_input(input)
+
+      if options[:ask]
+        ask_note = Doing::Prompt.read_lines(prompt: 'Add a note')
+        note.add(ask_note) unless ask_note.empty?
+      end
+
       date = d.nil? ? date : d
       new_entry = Doing::Item.new(date, title, section, note)
       if new_entry.should_finish?
@@ -449,7 +495,6 @@ command %i[done did] do |c|
       if options[:remove]
         wwid.tag_last({ tags: ['done'], count: 1, section: section, remove: true })
       else
-        note = options[:note] ? Doing::Note.new(options[:note]) : nil
         opt = {
           archive: options[:archive],
           back: finish_date,
@@ -464,12 +509,13 @@ command %i[done did] do |c|
         wwid.tag_last(opt)
       end
     elsif !args.empty?
-      note = Doing::Note.new(options[:note])
       d, title, new_note = wwid.format_input([args.join(' '), note.strip_lines.join("\n")].join("\n"))
       date = d.nil? ? date : d
+      new_note.add(options[:note])
       title.chomp!
       section = 'Archive' if options[:archive]
       new_entry = Doing::Item.new(date, title, section, new_note)
+
       if new_entry.should_finish?
         if new_entry.should_time?
           new_entry.tag('done', value: donedate)
@@ -477,12 +523,14 @@ command %i[done did] do |c|
           new_entry.tag('done')
         end
       end
+
       Doing::Hooks.trigger :pre_entry_add, wwid, new_entry
       wwid.content.push(new_entry)
       Doing::Hooks.trigger :post_entry_added, wwid, new_entry.dup
       wwid.write(wwid.doing_file)
       Doing.logger.info('Entry Added:', new_entry.title)
     elsif $stdin.stat.size.positive?
+      note = Doing::Note.new(options[:note])
       d, title, note = wwid.format_input($stdin.read.strip)
       unless d.nil?
         Doing.logger.debug('Parser:', 'Date detected in input, overriding command line values')
@@ -530,7 +578,7 @@ command :finish do |c|
 
   c.desc 'Set the completed date to the start date plus XX[hmd]'
   c.arg_name 'INTERVAL'
-  c.flag %i[t took]
+  c.flag %i[t took for]
 
   c.desc %(Set finish date to specific date/time (natural langauge parsed, e.g. --at=1:30pm). If used, ignores --back.)
   c.arg_name 'DATE_STRING'
@@ -539,7 +587,7 @@ command :finish do |c|
   c.desc 'Finish the last X entries containing TAG.
   Separate multiple tags with comma (--tag=tag1,tag2), combine with --bool. Wildcards allowed (*, ?).'
   c.arg_name 'TAG'
-  c.flag [:tag]
+  c.flag [:tag], type: TagArray
 
   c.desc 'Finish the last X entries matching search filter, surround with slashes for regex (e.g. "/query.*/"), start with single quote for exact match ("\'query")'
   c.arg_name 'QUERY'
@@ -618,7 +666,7 @@ command :finish do |c|
     if options[:tag].nil?
       tags = []
     else
-      tags = options[:tag].to_tags
+      tags = options[:tag]
     end
 
     raise InvalidArgument, 'Only one argument allowed' if args.length > 1
@@ -681,6 +729,9 @@ command :later do |c|
   c.arg_name 'TEXT'
   c.flag %i[n note]
 
+  c.desc 'Prompt for note via multi-line input'
+  c.switch %i[ask], negatable: false, default_value: false
+
   c.action do |_global_options, options, args|
     if options[:back]
       date = options[:back].chronify(guess: :begin)
@@ -689,23 +740,36 @@ command :later do |c|
       date = Time.now
     end
 
-    if options[:editor] || (args.empty? && $stdin.stat.size.zero?)
+    ask_note = options[:ask] && !options[:editor] && args.count.positive? ? Doing::Prompt.read_lines(prompt: 'Add a note') : ''
+
+    if options[:editor]
       raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
 
+      input = ''
       input += date.strftime('%F %R | ')
       input += args.empty? ? '' : args.join(' ')
+      input += "\n#{options[:note]}" if options[:note]
+      input += "\n#{ask_note}" unless ask_note.empty?
+
       input = wwid.fork_editor(input).strip
-      raise EmptyInput, 'No content' unless input && !input.empty?
 
       d, title, note = wwid.format_input(input)
-      date = d.nil? ? date : d
+      raise EmptyInput, 'No content' if title.empty?
+
       note.add(options[:note]) if options[:note]
+      if ask_note.empty? && options[:ask]
+        ask_note = Doing::Prompt.read_lines(prompt: 'Add a note')
+        note.add(ask_note) unless ask_note.empty?
+      end
+
+      date = d.nil? ? date : d
       wwid.add_item(title.cap_first, 'Later', { note: note, back: date })
       wwid.write(wwid.doing_file)
     elsif !args.empty?
       d, title, note = wwid.format_input(args.join(' '))
       date = d.nil? ? date : d
       note.add(options[:note]) if options[:note]
+      note.add(ask_note) unless ask_note.empty?
       wwid.add_item(title.cap_first, 'Later', { note: note, back: date })
       wwid.write(wwid.doing_file)
     elsif $stdin.stat.size.positive?
@@ -715,10 +779,20 @@ command :later do |c|
         date = d
       end
       note.add(options[:note]) if options[:note]
+      note.add(ask_note) unless ask_note.empty?
       wwid.add_item(title.cap_first, 'Later', { note: note, back: date })
       wwid.write(wwid.doing_file)
     else
-      raise EmptyInput, 'You must provide content when creating a new entry'
+      title = Doing::Prompt.read_line(prompt: 'Entry content')
+      raise EmptyInput, 'You must provide content when creating a new entry' if title.strip.empty?
+
+      note = Doing::Note.new
+      res = Doing::Prompt.yn('Add a note', default_response: false)
+      ask_note = res ? Doing::Prompt.read_lines(prompt: 'Enter note') : []
+      note.add(ask_note)
+
+      wwid.add_item(title.cap_first, 'Later', { note: note, back: date })
+      wwid.write(wwid.doing_file)
     end
   end
 end
@@ -754,7 +828,7 @@ command %i[mark flag] do |c|
   c.desc 'Flag the last entry containing TAG.
   Separate multiple tags with comma (--tag=tag1,tag2), combine with --bool. Wildcards allowed (*, ?).'
   c.arg_name 'TAG'
-  c.flag [:tag]
+  c.flag [:tag], type: TagArray
 
   c.desc 'Flag the last entry matching search filter, surround with slashes for regex (e.g. "/query.*/"), start with single quote for exact match ("\'query")'
   c.arg_name 'QUERY'
@@ -799,7 +873,7 @@ command %i[mark flag] do |c|
     if options[:tag].nil?
       search_tags = []
     else
-      search_tags = options[:tag].to_tags
+      search_tags = options[:tag]
     end
 
     if options[:interactive]
@@ -881,6 +955,9 @@ command :meanwhile do |c|
   c.arg_name 'TEXT'
   c.flag %i[n note]
 
+  c.desc 'Prompt for note via multi-line input'
+  c.switch %i[ask], negatable: false, default_value: false
+
   c.action do |_global_options, options, args|
     if options[:back]
       date = options[:back].chronify(guess: :begin)
@@ -897,10 +974,15 @@ command :meanwhile do |c|
     end
     input = ''
 
+    ask_note = options[:ask] ? Doing::Prompt.read_lines(prompt: 'Add a note') : []
+
     if options[:editor]
       raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
       input += date.strftime('%F %R | ')
       input += args.join(' ') unless args.empty?
+      input += "\n#{options[:note]}" if options[:note]
+      input += "\n#{ask_note}" unless ask_note.empty?
+
       input = wwid.fork_editor(input).strip
     elsif !args.empty?
       input = args.join(' ')
@@ -919,10 +1001,9 @@ command :meanwhile do |c|
       note = []
     end
 
-    if options[:note]
-      note.push(options[:note])
-    elsif note.empty?
-      note = nil
+    unless options[:editor]
+      note.add(options[:note]) if options[:note]
+      note.add(ask_note) unless ask_note.empty?
     end
 
     wwid.stop_start('meanwhile', { new_item: input, back: date, section: section, archive: options[:archive], note: note })
@@ -958,7 +1039,7 @@ command :note do |c|
 
   c.desc 'Add/remove note from last entry matching tag. Wildcards allowed (*, ?)'
   c.arg_name 'TAG'
-  c.flag [:tag]
+  c.flag [:tag], type: TagArray
 
   c.desc 'Add/remove note from last entry matching search filter, surround with slashes for regex (e.g. "/query.*/"), start with single quote for exact match ("\'query")'
   c.arg_name 'QUERY'
@@ -988,6 +1069,9 @@ command :note do |c|
   c.desc 'Select item for new note from a menu of matching entries'
   c.switch %i[i interactive], negatable: false, default_value: false
 
+  c.desc 'Prompt for note via multi-line input'
+  c.switch %i[ask], negatable: false, default_value: false
+
   c.action do |_global_options, options, args|
     options[:fuzzy] = false
     if options[:section]
@@ -1014,8 +1098,9 @@ command :note do |c|
 
     last_note = last_entry.note || Doing::Note.new
     new_note = Doing::Note.new
+    ask_note = options[:ask] ? Doing::Prompt.read_lines(prompt: 'Add a note') : ''
 
-    if options[:editor] || (args.empty? && $stdin.stat.size.zero? && !options[:remove])
+    if options[:editor] || (args.empty? && $stdin.stat.size.zero? && !options[:remove] && !options[:ask])
       raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
 
       input = !args.empty? ? args.join(' ') : ''
@@ -1026,7 +1111,9 @@ command :note do |c|
         prev_input = last_entry.note || Doing::Note.new
       end
 
+
       input = prev_input.add(input)
+      input.add(ask_note) unless ask_note.empty?
 
       input = wwid.fork_editor(prev_input.strip_lines.join("\n"), message: nil).strip
       note = input
@@ -1037,9 +1124,12 @@ command :note do |c|
     elsif $stdin.stat.size.positive?
       new_note.add($stdin.read.strip)
     else
-      raise EmptyInput, 'You must provide content when adding a note' unless options[:remove]
+      raise EmptyInput, 'You must provide content when adding a note' unless options[:remove] || !ask_note.empty?
+
     end
 
+    new_note.add(ask_note) unless ask_note.empty?
+
     if last_note.equal?(new_note)
       Doing.logger.debug('Skipped:', 'No note change')
     else
@@ -1058,10 +1148,13 @@ long_desc %(Record what you're starting now, or backdate the start time using na
 
 A parenthetical at the end of the entry will be converted to a note.
 
-Run with no argument to create a new entry using #{Doing::Util.default_editor}.)
+Run without arguments to create a new entry interactively.
+
+Run with --editor to create a new entry using #{Doing::Util.default_editor}.)
 arg_name 'ENTRY'
 command %i[now next] do |c|
-  c.example 'doing now', desc: "Open #{Doing::Util.default_editor} to input an entry and optional note."
+  c.example 'doing now', desc: 'Create a new entry with interactive prompts'
+  c.example 'doing now -e', desc: "Open #{Doing::Util.default_editor} to input an entry and optional note"
   c.example 'doing now working on a new project', desc: 'Add a new entry at the current time'
   c.example 'doing now debugging @project2', desc: 'Add an entry with a tag'
   c.example 'doing now adding an entry (with a note)', desc: 'Parenthetical at end is converted to note'
@@ -1085,6 +1178,9 @@ command %i[now next] do |c|
   c.arg_name 'TEXT'
   c.flag %i[n note]
 
+  c.desc 'Prompt for note via multi-line input'
+  c.switch %i[ask], negatable: false, default_value: false
+
   # c.desc "Edit entry with specified app"
   # c.arg_name 'editor_app'
   # # c.flag [:a, :app]
@@ -1104,23 +1200,32 @@ command %i[now next] do |c|
       options[:section] = settings['current_section']
     end
 
-    if options[:editor] || (args.empty? && $stdin.stat.size.zero?)
+    ask_note = options[:ask] && !options[:editor] && args.count.positive? ? Doing::Prompt.read_lines(prompt: 'Add a note') : ''
+
+    if options[:editor]
       raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
 
       input = date.strftime('%F %R | ')
       input += args.join(' ') unless args.empty?
+      input += "\n#{options[:note]}" if options[:note]
+      input += "\n#{ask_note}" unless ask_note.empty?
       input = wwid.fork_editor(input).strip
 
-      raise EmptyInput, 'No content' if input.empty?
-
       date, title, note = wwid.format_input(input)
-      note.add(options[:note]) if options[:note]
+      raise EmptyInput, 'No content' if title.strip.empty?
+
+      if ask_note.empty? && options[:ask]
+        ask_note = Doing::Prompt.read_lines(prompt: 'Add a note')
+        note.add(ask_note) unless ask_note.empty?
+      end
+
       wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:finish_last] })
       wwid.write(wwid.doing_file)
     elsif args.length.positive?
       d, title, note = wwid.format_input(args.join(' '))
       date = d.nil? ? date : d
       note.add(options[:note]) if options[:note]
+      note.add(ask_note) unless ask_note.empty?
       wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:finish_last] })
       wwid.write(wwid.doing_file)
     elsif $stdin.stat.size.positive?
@@ -1131,10 +1236,26 @@ command %i[now next] do |c|
         date = d
       end
       note.add(options[:note]) if options[:note]
+      if ask_note.empty? && options[:ask]
+        ask_note = Doing::Prompt.read_lines(prompt: 'Add a note')
+        note.add(ask_note) unless ask_note.empty?
+      end
       wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:finish_last] })
       wwid.write(wwid.doing_file)
     else
-      raise EmptyInput, 'You must provide content when creating a new entry'
+      tags = wwid.all_tags(wwid.content)
+      $stderr.puts Doing::Color.boldgreen("Add a new entry. Tab will autocomplete known tags. Ctrl-c to cancel.")
+      title = Doing::Prompt.read_line(prompt: 'Entry content', completions: tags)
+      raise EmptyInput, 'You must provide content when creating a new entry' if title.strip.empty?
+
+      note = Doing::Note.new
+      note.add(options[:note]) if options[:note]
+      res = Doing::Prompt.yn('Add a note', default_response: false)
+      ask_note = res ? Doing::Prompt.read_lines(prompt: 'Enter note') : []
+      note.add(ask_note)
+
+      wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:finish_last] })
+      wwid.write(wwid.doing_file)
     end
   end
 end
@@ -1283,7 +1404,11 @@ command :select do |c|
 
   c.desc 'Initial search query for filtering. Matching is fuzzy. For exact matching, start query with a single quote, e.g. `--query "\'search"'
   c.arg_name 'QUERY'
-  c.flag %i[q query search]
+  c.flag %i[q query]
+
+  c.desc 'Select from entries matching search filter, surround with slashes for regex (e.g. "/query.*/"), start with single quote for exact match ("\'query")'
+  c.arg_name 'QUERY'
+  c.flag [:search]
 
   c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
   c.arg_name 'QUERY'
@@ -1421,7 +1546,7 @@ command :tag do |c|
   c.desc 'Tag the last X entries containing TAG.
   Separate multiple tags with comma (--tag=tag1,tag2), combine with --bool. Wildcards allowed (*, ?).'
   c.arg_name 'TAG'
-  c.flag [:tag]
+  c.flag [:tag], type: TagArray
 
   c.desc 'Tag entries matching search filter, surround with slashes for regex (e.g. "/query.*/"), start with single quote for exact match ("\'query")'
   c.arg_name 'QUERY'
@@ -1453,7 +1578,7 @@ command :tag do |c|
 
   c.action do |_global_options, options, args|
     options[:fuzzy] = false
-    raise MissingArgument, 'You must specify at least one tag' if args.empty? && !options[:autotag]
+    # raise MissingArgument, 'You must specify at least one tag' if args.empty? && !options[:autotag]
 
     raise InvalidArgument, '--search and --tag can not be used together' if options[:search] && options[:tag]
 
@@ -1467,17 +1592,21 @@ command :tag do |c|
     if options[:tag].nil?
       search_tags = []
     else
-      search_tags = options[:tag].to_tags
+      search_tags = options[:tag]
     end
 
     if options[:autotag]
       tags = []
     else
-      tags = if args.join('') =~ /,/
-               args.join('').split(/,/)
-             else
-               args.join(' ').split(' ') # in case tags are quoted as one arg
-             end
+      if args.empty?
+        tags = []
+      else
+        tags = if args.join('') =~ /,/
+                 args.join('').split(/ *, */)
+               else
+                 args.join(' ').split(' ') # in case tags are quoted as one arg
+               end
+      end
 
       tags.map! { |tag| tag.sub(/^@/, '').strip }
     end
@@ -1621,6 +1750,9 @@ command %i[grep search] do |c|
   c.arg_name 'TYPE'
   c.flag [:case], must_match: /^[csi]/, default_value: settings.dig('search', 'case')
 
+  c.desc "Highlight search matches in output. Only affects command line output"
+  c.switch %i[h hilite], default_value: settings.dig('search', 'highlight')
+
   c.desc "Edit matching entries with #{Doing::Util.default_editor}"
   c.switch %i[e editor], negatable: false, default_value: false
 
@@ -1688,7 +1820,7 @@ command :last do |c|
 
   c.desc 'Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?)'
   c.arg_name 'TAG'
-  c.flag [:tag]
+  c.flag [:tag], type: TagArray
 
   c.desc 'Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
@@ -1698,6 +1830,9 @@ command :last do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc "Highlight search matches in output. Only affects command line output"
+  c.switch %i[h hilite], default_value: settings.dig('search', 'highlight')
+
   c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
   c.arg_name 'QUERY'
   c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
@@ -1725,7 +1860,7 @@ command :last do |c|
     if options[:tag].nil?
       options[:tag] = []
     else
-      options[:tag] = options[:tag].to_tags
+      options[:tag] = options[:tag]
       options[:bool] = options[:bool].normalize_bool
     end
 
@@ -1752,6 +1887,7 @@ command :last do |c|
                         search: options[:search],
                         fuzzy: options[:fuzzy],
                         case: options[:case],
+                        hilite: options[:hilite],
                         negate: options[:not],
                         tag: options[:tag],
                         tag_bool: options[:bool],
@@ -1855,7 +1991,7 @@ command :show do |c|
 
   c.desc 'Tag filter, combine multiple tags with a comma. Use `--tag pick` for a menu of available tags. Wildcards allowed (*, ?). Added for compatibility with other commands'
   c.arg_name 'TAG'
-  c.flag [:tag]
+  c.flag [:tag], type: TagArray
 
   c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
   c.arg_name 'QUERY'
@@ -1897,6 +2033,9 @@ command :show do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc "Highlight search matches in output. Only affects command line output"
+  c.switch %i[h hilite], default_value: settings.dig('search', 'highlight')
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -1988,7 +2127,7 @@ command :show do |c|
       section ||= 'All'
     end
 
-    tags.concat(options[:tag].to_tags) if options[:tag]
+    tags.concat(options[:tag]) if options[:tag]
 
     options[:times] = true if options[:totals]
 
@@ -2044,6 +2183,7 @@ command :show do |c|
     opt[:sort_tags] = options[:tag_sort] =~ /^n/i
     opt[:count] = options[:count].to_i
     opt[:highlight] = true
+    opt[:hilite] = options[:hilite]
     opt[:order] = options[:sort].normalize_order
     opt[:tag] = nil
     opt[:tag_order] = options[:tag_order].normalize_order
@@ -2370,6 +2510,9 @@ command :view do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc "Highlight search matches in output. Only affects command line output"
+  c.switch %i[h hilite], default_value: settings.dig('search', 'highlight')
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -2530,6 +2673,7 @@ command :view do |c|
       opts[:count] = count
       opts[:format] = date_format
       opts[:highlight] = options[:color]
+      opts[:hilite] = options[:hilite]
       opts[:only_timed] = only_timed
       opts[:order] = order
       opts[:output] = options[:interactive] ? nil : options[:output]
@@ -3004,7 +3148,7 @@ command %i[archive move] do |c|
 
   c.desc 'Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?). Added for compatibility with other commands'
   c.arg_name 'TAG'
-  c.flag [:tag]
+  c.flag [:tag], type: TagArray
 
   c.desc 'Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
@@ -3053,7 +3197,7 @@ command %i[archive move] do |c|
 
     raise InvalidArgument, '--keep and --count can not be used together' if options[:keep] && options[:count]
 
-    tags.concat(options[:tag].to_tags) if options[:tag]
+    tags.concat(options[:tag]) if options[:tag]
 
     search = nil
 
@@ -3113,7 +3257,7 @@ command :import do |c|
 
   c.desc 'Tag all imported entries'
   c.arg_name 'TAGS'
-  c.flag :tag
+  c.flag %i[t tag]
 
   c.desc 'Autotag entries'
   c.switch :autotag, negatable: true, default_value: true
@@ -3148,6 +3292,12 @@ command :import do |c|
       options[:section] = wwid.guess_section(options[:section]) || options[:section].cap_first
     end
 
+    if options[:search]
+      search = options[:search]
+      search.sub!(/^'?/, "'") if options[:exact]
+      options[:search] = search
+    end
+
     if options[:from]
       date_string = options[:from]
       if date_string =~ / (to|through|thru|(un)?til|-+) /
@@ -3156,7 +3306,7 @@ command :import do |c|
         finish = dates[2].chronify(guess: :end)
       else
         start = date_string.chronify(guess: :begin)
-        finish = false
+        finish = date_string.chronify(guess: :end)
       end
       raise InvalidTimeExpression, 'Unrecognized date string' unless start
       dates = [start, finish]