doing 2.1.26 → 2.1.30

data/bin/commands/show.rb

@@ -18,69 +18,20 @@ command :show do |c|
   c.example 'doing show Ideas @doing --from "mon to fri"', desc: 'Show entries tagged @doing from the Ideas section added between monday and friday of the current week.'
   c.example 'doing show --interactive Later @doing', desc: 'Create a menu from entries from the Later section tagged @doing to perform batch actions'
 
-  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], 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'
-  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
-
-  c.desc 'Tag boolean (AND,OR,NOT). Use PATTERN to parse + and - as booleans'
-  c.arg_name 'BOOLEAN'
-  c.flag %i[b bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
-
   c.desc 'Max count to show'
   c.arg_name 'MAX'
   c.flag %i[c count], default_value: 0, must_match: /^\d+$/, type: Integer
 
   c.desc 'Age (oldest|newest)'
   c.arg_name 'AGE'
-  c.flag %i[a age], default_value: 'newest'
-
-  c.desc 'Show 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 'Show 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 show --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 'Search filter, surround with slashes for regex (/query/), start with single quote for exact match ("\'query")'
-  c.arg_name 'QUERY'
-  c.flag [:search]
+  c.flag %i[a age], default_value: :newest, type: AgeSymbol
 
   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
-
-  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 'Show 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 'Sort order (asc/desc)'
   c.arg_name 'ORDER'
-  c.flag %i[s sort], must_match: REGEX_SORT_ORDER, default_value: 'asc'
+  c.flag %i[s sort], must_match: REGEX_SORT_ORDER, default_value: :asc, type: OrderSymbol
 
   c.desc 'Show time intervals on @done tasks'
   c.switch %i[t times], default_value: true, negatable: true
@@ -92,14 +43,13 @@ command :show 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 'Tag sort direction (asc|desc)'
   c.arg_name 'DIRECTION'
-  c.flag [:tag_order], must_match: REGEX_SORT_ORDER, default_value: 'asc'
+  c.flag [:tag_order], must_match: REGEX_SORT_ORDER, default_value: :asc, type: OrderSymbol
 
   c.desc 'Only show items with recorded time intervals'
   c.switch [:only_timed], default_value: false, negatable: false
@@ -121,9 +71,17 @@ command :show do |c|
   c.desc "Output to export format (#{Doing::Plugins.plugin_names(type: :export)})"
   c.arg_name 'FORMAT'
   c.flag %i[o output]
+
+  add_options(:search, c)
+  add_options(:tag_filter, c)
+  add_options(:date_filter, c)
+
   c.action do |global_options, options, args|
     options[:fuzzy] = false
-    raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
+    if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
+      raise DoingRuntimeError, %(Invalid output type "#{options[:output]}")
+
+    end
 
     tag_filter = false
     tags = []
@@ -142,7 +100,7 @@ command :show do |c|
       else
         begin
           section = @wwid.guess_section(args[0])
-        rescue WrongCommand => exception
+        rescue WrongCommand
           cmd = commands[:view]
           action = cmd.send(:get_action, nil)
           return action.call(global_options, options, args)
@@ -155,8 +113,8 @@ command :show do |c|
       if args.length.positive?
         args.each do |arg|
           arg.split(/,/).each do |tag|
-                        tags.push(tag.strip.sub(/^@/, ''))
-                      end
+            tags.push(tag.strip.sub(/^@/, ''))
+          end
         end
       end
     else
@@ -169,13 +127,11 @@ command :show do |c|
     options[:times] = true if options[:totals]
 
     template = @settings['templates'][options[:config_template]].deep_merge({
-        'wrap_width' => @settings['wrap_width'] || 0,
-        'date_format' => @settings['default_date_format'],
-        'order' => @settings['order'] || 'asc',
-        'tags_color' => @settings['tags_color']
-      })
-
-    options[:case] = options[:case].normalize_case
+                                                    'wrap_width' => @settings['wrap_width'] || 0,
+                                                    'date_format' => @settings['default_date_format'],
+                                                    'order' => @settings['order']&.normalize_order || :asc,
+                                                    'tags_color' => @settings['tags_color']
+                                                  })
 
     if options[:search]
       search = options[:search]
@@ -188,7 +144,7 @@ command :show do |c|
     if tags.good?
       tag_filter = {
         'tags' => tags,
-        'bool' => options[:bool].normalize_bool
+        'bool' => options[:bool]
       }
     end
 
@@ -198,32 +154,30 @@ command :show do |c|
     items = @wwid.filter_items([], opt: options)
 
     if options[:menu]
+      Doing.logger.benchmark(:menu, :start)
       tag = @wwid.choose_tag(section, items: items, include_all: true)
       raise UserCancelled unless tag
 
-      # options[:bool] = :and unless tags.empty?
-
       tags = tag.split(/ +/).map { |t| t.strip.sub(/^@?/, '') } if tag =~ /^@/
       if tags.good?
         tag_filter = {
           'tags' => tags,
-          'bool' => options[:bool].normalize_bool
+          'bool' => options[:bool]
         }
         options[:tag_filter] = tag_filter
       end
+      Doing.logger.benchmark(:menu, :finish)
     end
 
     options[:age] ||= :newest
 
     opt = options.clone
-    opt[:age] = options[:age].normalize_age(:newest) if options[:age]
-    opt[:sort_tags] = options[:tag_sort] =~ /^n/i
+    opt[:sort_tags] = options[:tag_sort]
     opt[:count] = options[:count].to_i
     opt[:highlight] = true
     opt[:hilite] = options[:hilite]
-    opt[:order] = options[:sort].normalize_order
+    opt[:order] = options[:sort]
     opt[:tag] = nil
-    opt[:tag_order] = options[:tag_order].normalize_order
     opt[:tags_color] = template['tags_color']
 
     Doing::Pager.page @wwid.list_section(opt, items: items)

data/bin/commands/since.rb

@@ -21,10 +21,9 @@ command :since 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 "Output to export format (#{Doing::Plugins.plugin_names(type: :export)})"
   c.arg_name 'FORMAT'
@@ -56,7 +55,7 @@ command :since do |c|
     Doing.logger.debug('Interpreter:', "date interpreted as #{start} through the current time")
 
     options[:times] = true if options[:totals]
-    options[:sort_tags] = options[:tag_sort] =~ /^n/i
+    options[:sort_tags] = options[:tag_sort]
 
     Doing::Pager.page @wwid.list_date([start, finish], options[:section], options[:times], options[:output],
                         { template: options[:template], config_template: options[:config_template], duration: options[:duration], totals: options[:totals], sort_tags: options[:sort_tags] }).chomp

data/bin/commands/tag.rb

@@ -55,39 +55,12 @@ command :tag do |c|
   c.desc 'Autotag entries based on autotag configuration in ~/.config/doing/config.yml'
   c.switch %i[a autotag], negatable: false, default_value: false
 
-  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], 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'
-  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 'Tag 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 'Select item(s) to tag 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
     # raise MissingArgument, 'You must specify at least one tag' if args.empty? && !options[:autotag]
@@ -130,9 +103,6 @@ command :tag do |c|
       count = options[:count].to_i
     end
 
-    options[:case] ||= :smart
-    options[:case] = options[:case].normalize_case
-
     if options[:search]
       search = options[:search]
       search.sub!(/^'?/, "'") if options[:exact]
@@ -143,7 +113,7 @@ command :tag do |c|
     options[:section] = section
     options[:tag] = search_tags
     options[:tags] = tags
-    options[:tag_bool] = options[:bool].normalize_bool
+    options[:tag_bool] = options[:bool]
 
     if count.zero? && !options[:force]
       matches = @wwid.filter_items([], opt: options).count

data/bin/commands/tags.rb

@@ -18,41 +18,14 @@ command :tags do |c|
 
   c.desc 'Sort order (asc/desc)'
   c.arg_name 'ORDER'
-  c.flag %i[o order], must_match: REGEX_SORT_ORDER, default_value: 'asc'
-
-  c.desc 'Get tags for entries matching tags. Combine multiple tags with a comma. Wildcards allowed (*, ?)'
-  c.arg_name 'TAG'
-  c.flag [:tag]
-
-  c.desc 'Get tags for items matching search. Surround with
-  slashes for regex (e.g. "/query/"), start with a 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 'Get tags from 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 used to combine multiple tags. Use PATTERN to parse + and - as booleans'
-  c.arg_name 'BOOLEAN'
-  c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
+  c.flag %i[o order], must_match: REGEX_SORT_ORDER, default_value: :asc, type: OrderSymbol
 
   c.desc 'Select items to scan 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, args|
     section = @wwid.guess_section(options[:section]) || options[:section].cap_first
     options[:count] = args.count.positive? ? args[0].to_i : 0
@@ -78,7 +51,7 @@ command :tags do |c|
       tags = tags.sort_by { |tag, count| count }
     end
 
-    tags.reverse! if options[:order].normalize_order == 'desc'
+    tags.reverse! if options[:order] == :desc
 
     if options[:counts]
       tags.each { |t, c| puts "#{t} (#{c})" }

data/bin/commands/today.rb

@@ -22,10 +22,9 @@ command :today 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 "Output to export format (#{Doing::Plugins.plugin_names(type: :export)})"
   c.arg_name 'FORMAT'
@@ -57,7 +56,7 @@ command :today do |c|
     raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
 
     options[:times] = true if options[:totals]
-    options[:sort_tags] = options[:tag_sort] =~ /^n/i
+    options[:sort_tags] = options[:tag_sort]
     filter_options = %i[after before duration from section sort_tags totals template config_template].each_with_object({}) { |k, hsh| hsh[k] = options[k] }
 
     Doing::Pager.page @wwid.today(options[:times], options[:output], filter_options).chomp

data/bin/commands/view.rb

@@ -21,7 +21,7 @@ command :view do |c|
 
   c.desc 'Age (oldest|newest)'
   c.arg_name 'AGE'
-  c.flag %i[age], default_value: 'newest'
+  c.flag %i[age], default_value: :newest, type: AgeSymbol
 
   c.desc 'Show time intervals on @done tasks'
   c.switch %i[t times], default_value: true, negatable: true
@@ -35,64 +35,16 @@ command :view do |c|
   c.desc 'Include colors in output'
   c.switch [:color], default_value: true, negatable: true
 
-  c.desc 'Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?)'
-  c.arg_name 'TAG'
-  c.flag [:tag]
-
-  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 'Tag boolean (AND,OR,NOT). Use PATTERN to parse + and - as booleans'
-  c.arg_name 'BOOLEAN'
-  c.flag %i[b bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
-
-  c.desc 'Search filter, surround with slashes for regex (/query/), start with single quote for exact match ("\'query")'
-  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
-
-  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 'Show items that *don\'t* match search string'
-  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 'Sort tags by (name|time)'
   c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: /^(?:name|time)$/i
+  c.flag [:tag_sort], must_match: REGEX_TAG_SORT, type: TagSortSymbol
 
   c.desc 'Tag sort direction (asc|desc)'
   c.arg_name 'DIRECTION'
-  c.flag [:tag_order], must_match: REGEX_SORT_ORDER
-
-  c.desc 'View 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 'View 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 view --from "monday 8am to friday 5pm" view_name`.
-
-      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.flag [:tag_order], must_match: REGEX_SORT_ORDER, type: OrderSymbol
 
   c.desc 'Only show items with recorded time intervals (override view settings)'
   c.switch [:only_timed], default_value: false, negatable: false
@@ -100,9 +52,16 @@ command :view do |c|
   c.desc 'Select from a menu of matching entries to perform additional operations'
   c.switch %i[i interactive], negatable: false, default_value: false
 
+  add_options(:search, c)
+  add_options(:tag_filter, c)
+  add_options(:date_filter, c)
+
   c.action do |global_options, options, args|
     options[:fuzzy] = false
-    raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
+    if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
+      raise DoingRuntimeError, %(Invalid output type "#{options[:output]}")
+
+    end
 
     raise InvalidArgument, '--tag and --search can not be used together' if options[:tag] && options[:search]
 
@@ -111,20 +70,20 @@ command :view do |c|
             else
               begin
                 @wwid.guess_view(args[0])
-              rescue WrongCommand => exception
+              rescue WrongCommand
                 cmd = commands[:show]
-                options[:sort] = 'asc'
-                options[:tag_order] = 'asc'
+                options[:sort] = :asc
+                options[:tag_order] = :asc
                 action = cmd.send(:get_action, nil)
                 return action.call(global_options, options, args)
               end
             end
 
-    if options[:section]
-      section = @wwid.guess_section(options[:section]) || options[:section].cap_first
-    else
-      section = @settings['current_section']
-    end
+    section = if options[:section]
+                @wwid.guess_section(options[:section]) || options[:section].cap_first
+              else
+                @settings['current_section']
+              end
 
     view = @wwid.get_view(title)
 
@@ -143,7 +102,7 @@ command :view do |c|
       tag_filter = false
       if options[:tag]
         tag_filter = { 'tags' => [], 'bool' => 'OR' }
-        bool = options[:bool].normalize_bool
+        bool = options[:bool]
         tag_filter['bool'] = bool
         tag_filter['tags'] = if bool == :pattern
                                options[:tag]
@@ -164,41 +123,45 @@ command :view do |c|
       # If the -o/--output flag was specified, override any default in the view template
       options[:output] ||= view.key?('output_format') ? view['output_format'] : 'template'
 
-      count = options[:count] ? options[:count] : view.key?('count') ? view['count'] : 10
+      count = if options[:count]
+                options[:count]
+              elsif view.key?('count')
+                view['count']
+              else
+                10
+              end
 
       section = if options[:section]
                   section
                 else
                   view['section'] || @settings['current_section']
                 end
-      order = view['order']&.normalize_order || 'asc'
+      order = if view.key?('order')
+                view['order'].normalize_order
+              else
+                :asc
+              end
 
       totals = if options[:totals]
                  true
                else
                  view['totals'] || false
                end
-      tag_order = if options[:tag_order]
-                    options[:tag_order].normalize_order
-                  else
-                    view['tag_order']&.normalize_order || 'asc'
-                  end
+      tag_order = options[:tag_order] || view['tag_order']&.normalize_order || :asc
 
       options[:times] = true if totals
       output_format = options[:output]&.downcase || 'template'
 
       options[:sort_tags] = if options[:tag_sort]
-                              options[:tag_sort] =~ /^n/i ? true : false
+                              options[:tag_sort]
                             elsif view.key?('tag_sort')
-                              view['tag_sort'] =~ /^n/i ? true : false
+                              view['tag_sort'].normalize_tag_sort
                             else
                               false
                             end
 
       %w[before after from duration].each { |k| options[k.to_sym] = view[k] if view.key?(k) && !options[k.to_sym] }
 
-      options[:case] = options[:case].normalize_case
-
       search = nil
 
       if options[:search]
@@ -209,7 +172,7 @@ command :view do |c|
       options[:age] ||= :newest
 
       opts = options.clone
-      opts[:age] = options[:age].normalize_age(:newest)
+      opts[:age] = options[:age]
       opts[:count] = count
       opts[:format] = date_format
       opts[:highlight] = options[:color]

data/bin/commands/yesterday.rb

@@ -33,9 +33,9 @@ command :yesterday do |c|
   c.switch [:totals], default_value: false, negatable: false
 
   c.desc 'Sort tags by (name|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 'View entries before specified time (e.g. 8am, 12:30pm, 15:00)'
   c.arg_name 'TIME_STRING'
@@ -51,12 +51,12 @@ command :yesterday do |c|
 
   c.desc 'Tag sort direction (asc|desc)'
   c.arg_name 'DIRECTION'
-  c.flag [:tag_order], must_match: REGEX_SORT_ORDER, default_value: 'asc'
+  c.flag [:tag_order], must_match: REGEX_SORT_ORDER, default_value: :asc, type: OrderSymbol
 
   c.action do |_global_options, options, _args|
     raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
 
-    options[:sort_tags] = options[:tag_sort] =~ /^n/i
+    options[:sort_tags] = options[:tag_sort]
 
     if options[:from]
       options[:from] = options[:from].split(/#{REGEX_RANGE_INDICATOR}/).map do |time|
@@ -65,7 +65,6 @@ command :yesterday do |c|
     end
 
     opt = options.clone
-    opt[:tag_order] = options[:tag_order].normalize_order
     opt[:order] = @settings.dig('templates', options[:config_template], 'order')
 
     Doing::Pager.page @wwid.yesterday(options[:section], options[:times], options[:output], opt).chomp