doing 2.1.26 → 2.1.30

data/bin/commands/changes.rb

@@ -1,4 +1,21 @@
 # @@changelog @@changes
+
+MARKDOWN_THEME = {
+  em: %i[white dark],
+  header: %i[cyan bold],
+  hr: :yellow,
+  link: %i[bright_cyan underline],
+  list: :yellow,
+  strong: %i[yellow bold],
+  table: :yellow,
+  quote: :yellow,
+  image: :bright_black,
+  note: :yellow,
+  comment: :bright_black
+}.deep_freeze
+
+CHANGE_RX = /^(?:(?:(?:[<>=]+|p(?:rior)|b(?:efore)|o(?:lder)|s(?:ince)|a(?:fter)|n(?:ewer))? *[0-9.*?]+ *)+|(?:[\d.]+ *(?:-|to)+ *[0-9.]+))$/
+
 desc 'List recent changes in Doing'
 long_desc %(Display a formatted list of changes in recent versions.
 
@@ -10,14 +27,30 @@ command %i[changes changelog] do |c|
 
   c.desc %(Look up a specific version. Specify versions as "MAJ.MIN.PATCH", MIN
            and PATCH are optional. Use > or < to see all changes since or prior
-           to a version.)
+           to a version. Wildcards (*?) accepted unless using < or >.)
   c.arg_name 'VERSION'
-  c.flag %i[l lookup], must_match: /^(?:(?:(?:[<>=]|p(?:rior)|b(?:efore)|o(?:lder)|s(?:ince)|a(?:fter)|n(?:ewer))? *[\d.*?]+ *)+|(?:[\d.]+ *-+ *[\d.]+))$/
+  c.flag %i[l lookup], must_match: CHANGE_RX
 
   c.desc %(Show changelogs matching search terms (uses pattern-based searching).
            Add slashes to search with regular expressions, e.g. `--search "/output.*flag/"`)
   c.flag %i[s search]
 
+  c.desc 'Sort order (asc/desc)'
+  c.arg_name 'ORDER'
+  c.flag %i[sort], must_match: REGEX_SORT_ORDER, default_value: :desc, type: OrderSymbol
+
+  c.desc 'Only output changes, no version numbers, headers, or dates'
+  c.switch %i[C changes], default_value: false, negatable: false
+
+  c.desc 'Output raw Markdown'
+  c.switch %i[m md markdown], default_value: false, negatable: false
+
+  c.desc 'Force rendered output'
+  c.switch %i[render], default_value: false, negatable: false
+
+  c.desc 'Open changelog in interactive viewer'
+  c.switch %i[i interactive], default_value: false, negatable: false
+
   c.example 'doing changes', desc: 'View changes in the current version'
   c.example 'doing changes --all', desc: 'See the entire changelog'
   c.example 'doing changes --lookup 2.0.21', desc: 'See changes from version 2.0.21'
@@ -25,18 +58,26 @@ command %i[changes changelog] do |c|
   c.example 'doing changes --search "tags +bool"', desc: 'See all changes containing "tags" and "bool"'
   c.example 'doing changes -l "> 2.1" -s "pattern"', desc: 'Lookup and search can be combined'
 
+  c.action do |_global_options, options, _args|
+    cl = Doing::Changes.new(lookup: options[:lookup], search: options[:search], changes: options[:changes], sort: options[:sort])
 
-  c.action do |_global_options, options, args|
-    cl = Doing::Changes.new(lookup: options[:lookup], search: options[:search])
+    if options[:interactive]
+      cl.interactive
+    else
+      content = if options[:all] || options[:search] || options[:lookup]
+                  cl.to_s
+                else
+                  cl.latest
+                end
 
-    content = if options[:all] || options[:search] || options[:lookup]
-                cl.to_s
-              else
-                cl.latest
-              end
+      parsed = if (options[:markdown] || !$stdout.isatty) && !options[:render]
+                 content
+               else
+                 TTY::Markdown.parse(content, width: 80, theme: MARKDOWN_THEME, symbols: { override: { bullet: '•' } })
+               end
 
-    parsed = TTY::Markdown.parse(content, width: 80, symbols: {override: {bullet: "•"}})
-    Doing::Pager.paginate = true
-    Doing::Pager.page parsed
+      Doing::Pager.paginate = true
+      Doing::Pager.page parsed
+    end
   end
 end

data/bin/commands/colors.rb

@@ -5,10 +5,12 @@ command :colors do |c|
     bgs = []
     fgs = []
     @colors::attributes.each do |color|
+      colname = color.to_s
+      colname << " (#{color.to_s.sub(/bold/, 'bright')})" if colname =~ /bold/
       if color.to_s =~ /bg/
-        bgs.push("#{@colors.send(color, "    ")}#{@colors.default} <-- #{color.to_s}")
+        bgs.push("#{@colors.send(color, "    ")}#{@colors.default} <-- #{colname}")
       else
-        fgs.push("#{@colors.send(color, "XXXX")}#{@colors.default} <-- #{color.to_s}")
+        fgs.push("#{@colors.send(color, "XXXX")}#{@colors.default} <-- #{colname}")
       end
     end
     out = []

data/bin/commands/commands.rb

@@ -27,9 +27,11 @@ command :commands do |c|
                     Doing::Prompt.choose_from(available,
                                               prompt: 'Select commands to enable',
                                               multiple: true,
-                                              sorted: true).strip.split("\n")
+                                              sorted: true)
                   end
-      to_enable.each do |cmd|
+      raise UserCancelled unless to_enable
+
+      to_enable.strip.split("\n").each do |cmd|
         default_command = File.join(File.dirname(__FILE__), "#{cmd}.rb")
         custom_command = File.join(File.expand_path(custom_dir), "#{cmd}.rb")
         unless File.exist?(default_command) || File.exist?(custom_command)

data/bin/commands/commands_accepting.rb

@@ -1,25 +1,76 @@
+# frozen_string_literal: true
+
 # @@commands_accepting
 arg_name 'OPTION'
 command :commands_accepting do |c|
   c.desc 'Output in single column for completion'
   c.switch %i[c column]
 
+  c.desc 'Join multiple arguments using boolean (AND|OR|NOT)'
+  c.flag [:bool], must_match: REGEX_BOOL,
+                  default_value: :and,
+                  type: BooleanSymbol
+
   c.action do |g, o, a|
-    a.each do |option|
-      cmds = []
-      commands.each do |cmd, v|
-        v.flags.merge(v.switches).each do |n, flag|
-          if flag.name == option.to_sym || flag.aliases&.include?(option.to_sym)
-            cmds.push(cmd)
-          end
+    cmds = []
+    commands.each { |cmd, v| cmds.push(cmd) if has_flags?(v, a, o[:bool]) }
+
+    if o[:column]
+      puts cmds.sort
+    else
+      description = "Commands "
+      description += "not " if o[:bool] == :not
+      description += "accepting "
+      description += a.map { |arg| "--#{arg}" }.join(o[:bool] == :and ? ' and ' : ' or ')
+      puts "#{description}: #{cmds.sort.join(', ')}"
+    end
+  end
+
+  def has_flags?(options, args, bool)
+    case bool
+    when :and
+      all_flags?(options, args)
+    when :not
+      no_flags?(options, args)
+    else
+      any_flags?(options, args)
+    end
+  end
+
+  def all_flags?(options, args)
+    args.each do |arg|
+      has_flag = false
+      options.flags.merge(options.switches).each do |_, flag|
+        if flag.name == arg.to_sym || flag.aliases&.include?(arg.to_sym)
+          has_flag = true
+          break
         end
       end
+      return false unless has_flag
+    end
+
+    true
+  end
+
+  def any_flags?(options, args)
+    args.each do |option|
+      options.flags.merge(options.switches).each do |_, flag|
+        return true if flag.name == option.to_sym || flag.aliases&.include?(option.to_sym)
+      end
+    end
 
-      if o[:column]
-        puts cmds.sort
-      else
-        puts "Commands accepting --#{option}: #{cmds.sort.join(', ')}"
+    false
+  end
+
+  def no_flags?(options, args)
+    args.each do |option|
+      options.flags.merge(options.switches).each do |_, flag|
+        return false if flag.name == option.to_sym || flag.aliases&.include?(option.to_sym)
       end
     end
+
+    true
   end
 end
+
+

data/bin/commands/completion.rb

@@ -1,12 +1,17 @@
+# frozen_string_literal: true
+
 # @@completion
 desc 'Generate shell completion scripts'
-long_desc 'Generates the necessary scripts to add command line completion to various shells, so typing \'doing\' and hitting
-tab will offer completions of subcommands and their options.'
+long_desc 'Generates the necessary scripts to add command line completion to various shells,
+so typing \'doing\' and hitting tab will offer completions of subcommands and their options.'
 command :completion do |c|
   c.example 'doing completion', desc: 'Output zsh (default) to STDOUT'
-  c.example 'doing completion --type zsh --file ~/.zsh-completions/_doing.zsh', desc: 'Output zsh completions to file'
-  c.example 'doing completion --type fish --file ~/.config/fish/completions/doing.fish', desc: 'Output fish completions to file'
-  c.example 'doing completion --type bash --file ~/.bash_it/completion/enabled/doing.bash', desc: 'Output bash completions to file'
+  c.example 'doing completion --type zsh --file ~/.zsh-completions/_doing.zsh',
+            desc: 'Output zsh completions to file'
+  c.example 'doing completion --type fish --file ~/.config/fish/completions/doing.fish',
+            desc: 'Output fish completions to file'
+  c.example 'doing completion --type bash --file ~/.bash_it/completion/enabled/doing.bash',
+            desc: 'Output bash completions to file'
 
   c.desc 'Shell to generate for (bash, zsh, fish)'
   c.arg_name 'SHELL'
@@ -17,8 +22,6 @@ command :completion do |c|
   c.flag %i[f file], default_value: 'STDOUT'
 
   c.action do |_global_options, options, _args|
-    script_dir = File.join(File.dirname(__FILE__), '..', 'scripts')
-
     Doing::Completion.generate_completion(type: options[:type], file: options[:file])
   end
 end

data/bin/commands/config.rb

@@ -45,7 +45,7 @@ command :config do |c|
     edit.arg_name 'EDITOR'
     edit.flag %i[e editor], default_value: nil
 
-    if `uname` =~ /Darwin/
+    if Sys::Platform.mac?
       edit.desc 'Application to use'
       edit.arg_name 'APP_NAME'
       edit.flag %i[a app]
@@ -76,7 +76,7 @@ command :config do |c|
 
       config_file = @config.choose_config
 
-      if `uname` =~ /Darwin/
+      if Sys::Platform.mac?
         if options[:default]
           editor = Doing::Util.find_default_editor('config')
           if editor
@@ -139,7 +139,7 @@ command :config do |c|
     dump.example 'doing config get', desc: 'Output the entire configuration'
     dump.example 'doing config get timer_format --output raw', desc: 'Output the value of timer_format as a plain string'
     dump.example 'doing config get doing_file', desc: 'Output the value of the doing_file setting, respecting local configurations'
-    dump.example 'doing config get -o json plug.plugpath', desc: 'Key path is fuzzy matched: output the value of plugins->plugin_path as JSON'
+    dump.example 'doing config get -o json plug.plugpath', desc: 'Key path is fuzzy matched: output the value of plugins.plugin_path as JSON'
 
     dump.desc 'Format for output (json|yaml|raw)'
     dump.arg_name 'FORMAT'
@@ -188,7 +188,7 @@ command :config do |c|
   c.arg 'KEY VALUE'
   c.command :set do |set|
     set.example 'doing config set timer_format human', desc: 'Set the value of timer_format to "human"'
-    set.example 'doing config set plug.plugpath ~/my_plugins', desc: 'Key path is fuzzy matched: set the value of plugins->plugin_path'
+    set.example 'doing config set plug.plugpath ~/my_plugins', desc: 'Key path is fuzzy matched: set the value of plugins.plugin_path'
 
     set.desc 'Delete specified key'
     set.switch %i[r remove], default_value: false, negatable: false
@@ -206,7 +206,7 @@ command :config do |c|
       old_type = old_value&.class.to_s || nil
 
       if old_value.is_a?(Hash) && !options[:remove]
-        Doing.logger.log_now(:warn, 'Config:', "Config key must point to a single value, #{real_path.join('->').boldwhite} is a mapping")
+        Doing.logger.log_now(:warn, 'Config:', "Config key must point to a single value, #{real_path.join('.').boldwhite} is a mapping")
         didyou = 'Did you mean:'
         old_value.keys.each do |k|
           Doing.logger.log_now(:warn, "#{didyou}", "#{keypath}.#{k}?")
@@ -218,17 +218,17 @@ command :config do |c|
 
       config_file = @config.choose_config(create: true)
 
-      cfg = YAML.safe_load_file(config_file) || {}
+      cfg = Doing::Util.safe_load_file(config_file) || {}
 
       $stderr.puts "Updating #{config_file}".yellow
 
       if options[:remove]
         cfg.deep_set(real_path, nil)
-        $stderr.puts "#{'Deleting key:'.yellow} #{real_path.join('->').boldwhite}"
+        $stderr.puts "#{'Deleting key:'.yellow} #{real_path.join('.').boldwhite}"
       else
         current_value = cfg.dig(*real_path)
         cfg.deep_set(real_path, value.set_type(old_type))
-        $stderr.puts "#{' Key path:'.yellow} #{real_path.join('->').boldwhite}"
+        $stderr.puts "#{' Key path:'.yellow} #{real_path.join('.').boldwhite}"
         $stderr.puts "#{'Inherited:'.yellow} #{(old_value ? old_value.to_s : 'empty').boldwhite}"
         $stderr.puts "#{'  Current:'.yellow} #{ (current_value ? current_value.to_s : 'empty').boldwhite }"
         $stderr.puts "#{'      New:'.yellow} #{value.set_type(old_type).to_s.boldwhite}"

data/bin/commands/done.rb

@@ -24,10 +24,6 @@ command %i[done did] do |c|
   c.arg_name 'DATE_STRING'
   c.flag %i[at finished], type: DateEndString
 
-  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], type: DateBeginString
-
   c.desc %(
         Start and end times as a date/time range `doing done --from "1am to 8am"`.
         Overrides other date flags.
@@ -45,24 +41,14 @@ command %i[done did] do |c|
   c.arg_name 'NAME'
   c.flag %i[s section]
 
-  c.desc "Edit entry with #{Doing::Util.default_editor} (with no arguments, edits the last entry)"
-  c.switch %i[e editor], negatable: false, default_value: false
-
-  c.desc 'Include 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 'Finish last entry not already marked @done'
   c.switch %i[u unfinished], negatable: false, default_value: false
 
-  # c.desc "Edit entry with specified app"
-  # c.arg_name 'editor_app'
-  # # c.flag [:a, :app]
+  add_options(:add_entry, c)
 
   c.action do |_global_options, options, args|
+    @wwid.auto_tag = !options[:noauto]
+
     took = 0
     donedate = nil
 

data/bin/commands/finish.rb

@@ -22,37 +22,10 @@ command :finish do |c|
   c.arg_name 'DATE_STRING'
   c.flag %i[at finished], type: DateEndString
 
-  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], type: TagArray
+  c.desc 'Overwrite existing @done tag with new date'
+  c.switch %i[update], negatable: false, default_value: false
 
-  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'
-  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'
-  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
-
-  # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
-  # c.switch [:fuzzy], default_value: false, negatable: false
-
-  c.desc 'Force exact search string matching (case sensitive)'
-  c.switch %i[x exact], default_value: @config.exact_match?, negatable: @config.exact_match?
-
-  c.desc 'Finish items that *don\'t* match search/tag filters'
-  c.switch [:not], default_value: false, negatable: false
-
-  c.desc 'Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]'
-  c.arg_name 'TYPE'
-  c.flag [:case], must_match: /^[csi]/, default_value: @settings.dig('search', 'case')
-
-  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans'
-  c.arg_name 'BOOLEAN'
-  c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
-
-  c.desc 'Remove done tag'
+  c.desc 'Remove @done tag'
   c.switch %i[r remove], negatable: false, default_value: false
 
   c.desc 'Finish last entry (or entries) not already marked @done'
@@ -73,6 +46,9 @@ command :finish do |c|
   c.desc 'Select item(s) to finish from a menu of matching entries'
   c.switch %i[i interactive], negatable: false, default_value: false
 
+  add_options(:search, c)
+  add_options(:tag_filter, c)
+
   c.action do |_global_options, options, args|
     options[:fuzzy] = false
     unless options[:auto]
@@ -141,6 +117,7 @@ command :finish do |c|
       tags: ['done'],
       took: options[:took],
       unfinished: options[:unfinished],
+      update: options[:update],
       val: options[:val]
     }
 

data/bin/commands/flag.rb

@@ -26,39 +26,12 @@ command %i[mark flag] do |c|
   c.desc 'Flag last entry (or entries) not marked @done'
   c.switch %i[u unfinished], negatable: false, default_value: false
 
-  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], 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'
-  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'
-  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
-
-  # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
-  # c.switch [:fuzzy], default_value: false, negatable: false
-
-  c.desc 'Force exact search string matching (case sensitive)'
-  c.switch %i[x exact], default_value: @config.exact_match?, negatable: @config.exact_match?
-
-  c.desc 'Flag items that *don\'t* match search/tag/date filters'
-  c.switch [:not], default_value: false, negatable: false
-
-  c.desc 'Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]'
-  c.arg_name 'TYPE'
-  c.flag [:case], must_match: /^[csi]/, default_value: @settings.dig('search', 'case')
-
-  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans'
-  c.arg_name 'BOOLEAN'
-  c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
-
   c.desc 'Select item(s) to flag from a menu of matching entries'
   c.switch %i[i interactive], negatable: false, default_value: false
 
+  add_options(:search, c)
+  add_options(:tag_filter, c)
+
   c.action do |_global_options, options, _args|
     options[:fuzzy] = false
     mark = @settings['marker_tag'] || 'flagged'
@@ -67,15 +40,9 @@ command %i[mark flag] do |c|
 
     section = 'All'
 
-    if options[:section]
-      section = @wwid.guess_section(options[:section]) || options[:section].cap_first
-    end
+    section = @wwid.guess_section(options[:section]) || options[:section].cap_first if options[:section]
 
-    if options[:tag].nil?
-      search_tags = []
-    else
-      search_tags = options[:tag]
-    end
+    search_tags = options[:tag].nil? ? [] : options[:tag]
 
     if options[:interactive]
       count = 0
@@ -84,8 +51,6 @@ command %i[mark flag] do |c|
       count = options[:count].to_i
     end
 
-    options[:case] = options[:case].normalize_case
-
     if options[:search]
       search = options[:search]
       search.sub!(/^'?/, "'") if options[:exact]
@@ -93,16 +58,15 @@ command %i[mark flag] do |c|
     end
 
     if count.zero? && !options[:force]
-      if options[:search]
-        section_q = ' matching your search terms'
-      elsif options[:tag]
-        section_q = ' matching your tag search'
-      elsif section == 'All'
-        section_q = ''
-      else
-        section_q = " in section #{section}"
-      end
-
+      section_q = if options[:search]
+                    ' matching your search terms'
+                  elsif options[:tag]
+                    ' matching your tag search'
+                  elsif section == 'All'
+                    ''
+                  else
+                    " in section #{section}"
+                  end
 
       question = if options[:remove]
                    "Are you sure you want to unflag all entries#{section_q}"
@@ -119,7 +83,7 @@ command %i[mark flag] do |c|
     options[:section] = section
     options[:tag] = search_tags
     options[:tags] = [mark]
-    options[:tag_bool] = options[:bool].normalize_bool
+    options[:tag_bool] = options[:bool]
 
     @wwid.tag_last(options)
   end

data/bin/commands/grep.rb

@@ -16,25 +16,6 @@ command %i[grep search] do |c|
   c.arg_name 'NAME'
   c.flag %i[s section], default_value: 'All'
 
-  c.desc 'Search entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day'
-  c.arg_name 'DATE_STRING'
-  c.flag [:before], type: DateBeginString
-
-  c.desc 'Search entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day'
-  c.arg_name 'DATE_STRING'
-  c.flag [:after], type: DateEndString
-
-  c.desc %(
-      Date range to show, or a single day to filter date on.
-      Date range argument should be quoted. Date specifications can be natural language.
-      To specify a range, use "to" or "through": `doing search --from "monday 8am to friday 5pm"`.
-
-      If values are only time(s) (6am to noon) all dates will be included, but entries will be filtered
-      by time of day.
-    )
-  c.arg_name 'DATE_OR_RANGE'
-  c.flag [:from], type: DateRangeString
-
   c.desc "Output to export format (#{Doing::Plugins.plugin_names(type: :export)})"
   c.arg_name 'FORMAT'
   c.flag %i[o output]
@@ -57,10 +38,9 @@ command %i[grep search] do |c|
   c.switch [:totals], default_value: false, negatable: false
 
   c.desc 'Sort tags by (name|time)'
-  default = 'time'
-  default = @settings['tag_sort'] || 'name'
+  default = @settings['tag_sort'].normalize_tag_sort || :name
   c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
+  c.flag [:tag_sort], must_match: REGEX_TAG_SORT, default_value: default, type: TagSortSymbol
 
   c.desc 'Only show items with recorded time intervals'
   c.switch [:only_timed], default_value: false, negatable: false
@@ -76,7 +56,9 @@ command %i[grep search] do |c|
 
   c.desc 'Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]'
   c.arg_name 'TYPE'
-  c.flag [:case], must_match: /^[csi]/, default_value: @settings.dig('search', 'case')
+  c.flag [:case], must_match: REGEX_CASE,
+                  default_value: @settings.dig('search', 'case').normalize_case,
+                  type: CaseSymbol
 
   c.desc "Highlight search matches in output. Only affects command line output"
   c.switch %i[h hilite], default_value: @settings.dig('search', 'highlight')
@@ -95,7 +77,12 @@ command %i[grep search] do |c|
   c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
 
   c.desc 'Combine multiple tags or value queries using AND, OR, or NOT'
-  c.flag [:bool], must_match: REGEX_BOOL, default_value: 'AND'
+  c.arg_name 'BOOLEAN'
+  c.flag [:bool], must_match: REGEX_BOOL,
+                  default_value: :pattern,
+                  type: BooleanSymbol
+
+  add_options(:date_filter, c)
 
   c.action do |_global_options, options, args|
     options[:fuzzy] = false
@@ -106,14 +93,11 @@ command %i[grep search] do |c|
 
     section = @wwid.guess_section(options[:section]) if options[:section]
 
-    options[:case] = options[:case].normalize_case
-    options[:bool] = options[:bool].normalize_bool
-
     search = args.join(' ')
     search.sub!(/^'?/, "'") if options[:exact]
 
     options[:times] = true if options[:totals]
-    options[:sort_tags] = options[:tag_sort] =~ /^n/i
+    options[:sort_tags] = options[:tag_sort]
     options[:highlight] = true
     options[:search] = search
     options[:section] = section

data/bin/commands/import.rb

@@ -11,23 +11,9 @@ command :import do |c|
   c.arg_name 'TYPE'
   c.flag :type, default_value: 'doing'
 
-  c.desc 'Only import items matching search. Surround with slashes for regex (/query/), start with single quote for exact match ("\'query")'
-  c.arg_name 'QUERY'
-  c.flag [:search]
-
-  # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
-  # c.switch [:fuzzy], default_value: false, negatable: false
-
-  c.desc 'Force exact search string matching (case sensitive)'
-  c.switch %i[x exact], default_value: @config.exact_match?, negatable: @config.exact_match?
-
   c.desc 'Import items that *don\'t* match search/tag/date filters'
   c.switch [:not], default_value: false, negatable: false
 
-  c.desc 'Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]'
-  c.arg_name 'TYPE'
-  c.flag [:case], must_match: /^[csi]/, default_value: @settings.dig('search', 'case')
-
   c.desc 'Only import items with recorded time intervals'
   c.switch [:only_timed], default_value: false, negatable: false
 
@@ -46,26 +32,12 @@ command :import do |c|
   c.arg_name 'PREFIX'
   c.flag :prefix
 
-  # TODO: Allow time range filtering
-  c.desc 'Import entries older than date'
-  c.arg_name 'DATE_STRING'
-  c.flag [:before], type: DateBeginString
-
-  c.desc 'Import entries newer than date'
-  c.arg_name 'DATE_STRING'
-  c.flag [:after], type: DateEndString
-
-  c.desc %(
-    Date range to import. Date range argument should be quoted. Date specifications can be natural language.
-    To specify a range, use "to" or "through": `--from "monday to friday"` or `--from 10/1 to 10/31`.
-    Has no effect unless the import plugin has implemented date range filtering.
-  )
-  c.arg_name 'DATE_OR_RANGE'
-  c.flag %i[f from], type: DateRangeString
-
   c.desc 'Allow entries that overlap existing times'
   c.switch [:overlap], negatable: true
 
+  add_options(:search, c)
+  add_options(:date_filter, c)
+
   c.action do |_global_options, options, args|
     options[:fuzzy] = false
     if options[:section]
@@ -88,8 +60,6 @@ command :import do |c|
       options[:date_filter][0] = options[:after] || Time.now - (1 << 64)
     end
 
-    options[:case] = options[:case].normalize_case
-
     if options[:type] =~ Doing::Plugins.plugin_regex(type: :import)
       options[:no_overlap] = !options[:overlap]
       @wwid.import(args, options)