doing 2.1.55 → 2.1.58

data/docs/doc/top-level-namespace.html

@@ -216,7 +216,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu May 26 07:14:02 2022 by
+  Generated on Wed Jun  1 10:40:46 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/doing.rdoc

@@ -5,7 +5,7 @@ record of what you've been doing, complete with tag-based time tracking. The
 command line tool allows you to add entries, annotate with tags and notes, and
 view your entries with myriad options, with a focus on a "natural" language syntax.
 
-v2.1.55
+v2.1.58
 
 === Global Options
 === --config_file arg
@@ -531,14 +531,14 @@ Deprecated, specify shell as argument to subcommand
 ====== Command: <tt>generate  [zsh|bash|fish|all]</tt>
 Generate completion scripts, including custom plugins and command options
 
-Argument specifies which shell to install for: zsh, bash, fish, all
+Argument specifies which shell to generate for: zsh, bash, fish, all
 ======= Options
 ======= -f|--file PATH
 
 Alternative file to write output to
 
 [Default Value] None
-Argument specifies which shell to install for: zsh, bash, fish, all
+Argument specifies which shell to generate for: zsh, bash, fish, all
 
 ======= --stdout
 Output result to STDOUT only
@@ -2333,12 +2333,11 @@ Output to export format (csv|dayone|dayone-days|dayone-entries|doing|html|json|m
 [Default Value] None
 
 
-===== -s|--sort ORDER
+===== -s|--section NAME
 
-Sort order (asc/desc)
+Only show entries within section
 
-[Default Value] asc
-[Must Match] (?i-mx:^(?:a(?:sc)?|d(?:esc)?)$)
+[Default Value] None
 
 
 ===== --save VIEW_NAME
@@ -2356,6 +2355,14 @@ Filter entries using a search query, surround with slashes for regex (e.g. "/que
 [Default Value] None
 
 
+===== --sort ORDER
+
+Sort order (asc/desc)
+
+[Default Value] asc
+[Must Match] (?i-mx:^(?:a(?:sc)?|d(?:esc)?)$)
+
+
 ===== --tag TAG
 
 Filter entries by tag. Combine multiple tags with a comma. Wildcards allowed (*, ?)
@@ -2721,7 +2728,7 @@ Force exact search string matching (case sensitive)
 Set the default tags for the current directory
 
 Adds default_tags to a .doingrc file in the current directory. Any entry created in this directory or its
-subdirectories will be tagged with the default tags. You can modify these any time using the `config set` commnand or
+subdirectories will be tagged with the default tags. You can modify these any time using the `config set` command or
 manually editing the .doingrc file.
 ===== Options
 ===== --clear

data/lib/completion/_doing.zsh

@@ -174,7 +174,7 @@ function _doing() {
                 args=( {'(--archive)-a','(-a)--archive'}"[Archive selected items]" "--after[Select entries newer than date]:DATE_STRING:" "--resume[Copy selection as a new entry with current time and no @done tag]" "--before[Select entries older than date]:DATE_STRING:" {'(--cancel)-c','(-c)--cancel'}"[Cancel selected items]" "--case[Case sensitivity for search string matching [(c)ase-sensitive]:TYPE:" {'(--delete)-d','(-d)--delete'}"[Delete selected items]" {'(--editor)-e','(-e)--editor'}"[Edit selected item(s)]" {'(--finish)-f','(-f)--finish'}"[Add @done with current time to selected item(s)]" "--flag[Add flag to selected item(s)]" "--force[Perform action without confirmation]" "--from[Date range]:DATE_OR_RANGE:" {'(--move)-m','(-m)--move'}"[Move selected items to section]:SECTION:" "--menu[Use --no-menu to skip the interactive menu]" "--not[Select items that *don't* match search/tag filters]" {'(--output)-o','(-o)--output'}"[Output entries to format]:FORMAT:" {'(--query)-q','(-q)--query'}"[Initial search query for filtering]:QUERY:" {'(--remove)-r','(-r)--remove'}"[Reverse -c]" {'(--section)-s','(-s)--section'}"[Select from a specific section]:SECTION:" "--save_to[Save selected entries to file using --output format]:FILE:" "--search[Filter entries using a search query]:QUERY:" {'(--tag)-t','(-t)--tag'}"[Tag selected entries]:TAG:" "--val[Perform a tag value query]:QUERY:" {'(--exact)-x','(-x)--exact'}"[Force exact search string matching]" )
             ;;
             show) 
-                args=( {'(--age)-a','(-a)--age'}"[Age]:AGE:" "--after[Show entries newer than date]:DATE_STRING:" "--before[Show entries older than date]:DATE_STRING:" "--bool[Boolean used to combine multiple tags]:BOOLEAN:" {'(--count)-c','(-c)--count'}"[Max count to show]:MAX:" "--case[Case sensitivity for search string matching [(c)ase-sensitive]:TYPE:" "--config_template[Output using a template from configuration]:TEMPLATE_KEY:" "--duration[Show elapsed time on entries without @done tag]" {'(--editor)-e','(-e)--editor'}"[Edit matching entries with vim]" "--from[Date range]:DATE_OR_RANGE:" {'(--hilite)-h','(-h)--hilite'}"[Highlight search matches in output]" {'(--interactive)-i','(-i)--interactive'}"[Select from a menu of matching entries to perform additional operations]" {'(--menu)-m','(-m)--menu'}"[Select section or tag to display from a menu]" "--not[Show items that *don't* match search/tag filters]" {'(--output)-o','(-o)--output'}"[Output to export format]:FORMAT:" "--only_timed[Only show items with recorded time intervals]" {'(--sort)-s','(-s)--sort'}"[Sort order]:ORDER:" "--save[Save all current command line options as a new view]:VIEW_NAME:" "--search[Filter entries using a search query]:QUERY:" {'(--times)-t','(-t)--times'}"[Show time intervals on @done tasks]" "--tag[Filter entries by tag]:TAG:" "--tag_order[Tag sort direction]:DIRECTION:" "--tag_sort[Sort tags by]:KEY:" "--template[Override output format with a template string containing %placeholders]:TEMPLATE_STRING:" "--title[Title string to be used for output formats that require it]:TITLE:" "--totals[Show time totals at the end of output]" "--val[Perform a tag value query]:QUERY:" {'(--exact)-x','(-x)--exact'}"[Force exact search string matching]" )
+                args=( {'(--age)-a','(-a)--age'}"[Age]:AGE:" "--after[Show entries newer than date]:DATE_STRING:" "--before[Show entries older than date]:DATE_STRING:" "--bool[Boolean used to combine multiple tags]:BOOLEAN:" {'(--count)-c','(-c)--count'}"[Max count to show]:MAX:" "--case[Case sensitivity for search string matching [(c)ase-sensitive]:TYPE:" "--config_template[Output using a template from configuration]:TEMPLATE_KEY:" "--duration[Show elapsed time on entries without @done tag]" {'(--editor)-e','(-e)--editor'}"[Edit matching entries with vim]" "--from[Date range]:DATE_OR_RANGE:" {'(--hilite)-h','(-h)--hilite'}"[Highlight search matches in output]" {'(--interactive)-i','(-i)--interactive'}"[Select from a menu of matching entries to perform additional operations]" {'(--menu)-m','(-m)--menu'}"[Select section or tag to display from a menu]" "--not[Show items that *don't* match search/tag filters]" {'(--output)-o','(-o)--output'}"[Output to export format]:FORMAT:" "--only_timed[Only show items with recorded time intervals]" {'(--section)-s','(-s)--section'}"[Only show entries within section]:NAME:" "--save[Save all current command line options as a new view]:VIEW_NAME:" "--search[Filter entries using a search query]:QUERY:" "--sort[Sort order]:ORDER:" {'(--times)-t','(-t)--times'}"[Show time intervals on @done tasks]" "--tag[Filter entries by tag]:TAG:" "--tag_order[Tag sort direction]:DIRECTION:" "--tag_sort[Sort tags by]:KEY:" "--template[Override output format with a template string containing %placeholders]:TEMPLATE_STRING:" "--title[Title string to be used for output formats that require it]:TITLE:" "--totals[Show time totals at the end of output]" "--val[Perform a tag value query]:QUERY:" {'(--exact)-x','(-x)--exact'}"[Force exact search string matching]" )
             ;;
             since) 
                 args=( "--bool[Boolean used to combine multiple tags]:BOOLEAN:" "--case[Case sensitivity for search string matching [(c)ase-sensitive]:TYPE:" "--config_template[Output using a template from configuration]:TEMPLATE_KEY:" "--duration[Show elapsed time on entries without @done tag]" "--not[Since items that *don't* match search/tag filters]" {'(--output)-o','(-o)--output'}"[Output to export format]:FORMAT:" "--only_timed[Only show items with recorded time intervals]" {'(--section)-s','(-s)--section'}"[Section]:NAME:" "--save[Save all current command line options as a new view]:VIEW_NAME:" "--search[Filter entries using a search query]:QUERY:" {'(--times)-t','(-t)--times'}"[Show time intervals on @done tasks]" "--tag[Filter entries by tag]:TAG:" "--tag_order[Tag sort direction]:DIRECTION:" "--tag_sort[Sort tags by]:KEY:" "--template[Override output format with a template string containing %placeholders]:TEMPLATE_STRING:" "--title[Title string to be used for output formats that require it]:TITLE:" "--totals[Show time totals at the end of output]" "--val[Perform a tag value query]:QUERY:" {'(--exact)-x','(-x)--exact'}"[Force exact search string matching]" )

data/lib/completion/doing.bash

@@ -276,9 +276,9 @@ local words=$(doing sections)
 IFS="$OLD_IFS"
 
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--age --after --before --bool --count --case --config_template --duration --editor --from --hilite --interactive --menu --not --output --only_timed --sort --save --search --times --tag --tag_order --tag_sort --template --title --totals --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--age --after --before --bool --count --case --config_template --duration --editor --from --hilite --interactive --menu --not --output --only_timed --section --save --search --sort --times --tag --tag_order --tag_sort --template --title --totals --val --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -c -e -h -i -m -o -s -t -x --age --after --before --bool --count --case --config_template --duration --editor --from --hilite --interactive --menu --not --output --only_timed --sort --save --search --times --tag --tag_order --tag_sort --template --title --totals --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -c -e -h -i -m -o -s -t -x --age --after --before --bool --count --case --config_template --duration --editor --from --hilite --interactive --menu --not --output --only_timed --section --save --search --sort --times --tag --tag_order --tag_sort --template --title --totals --val --exact' -- $token ) )
   else
   local nocasematchWasOff=0
   shopt nocasematch >/dev/null || nocasematchWasOff=1

data/lib/completion/doing.fish

@@ -470,9 +470,10 @@ complete -c doing -l menu -s m -f  -n '__fish_doing_using_command show' -d Selec
 complete -c doing -l not  -f  -n '__fish_doing_using_command show' -d Show\ items\ that\ \*don\'t\*\ match\ search/tag\ filters
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command show' -d Output\ to\ export\ format
 complete -c doing -l only_timed  -f  -n '__fish_doing_using_command show' -d Only\ show\ items\ with\ recorded\ time\ intervals
-complete -c doing -l sort -s s -f -r -n '__fish_doing_using_command show' -d Sort\ order
+complete -c doing -l section -s s -f -r -n '__fish_doing_using_command show' -d Only\ show\ entries\ within\ section
 complete -c doing -l save  -f -r -n '__fish_doing_using_command show' -d Save\ all\ current\ command\ line\ options\ as\ a\ new\ view
 complete -c doing -l search  -f -r -n '__fish_doing_using_command show' -d Filter\ entries\ using\ a\ search\ query
+complete -c doing -l sort  -f -r -n '__fish_doing_using_command show' -d Sort\ order
 complete -c doing -l times -s t -f  -n '__fish_doing_using_command show' -d Show\ time\ intervals\ on\ @done\ tasks
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command show' -d Filter\ entries\ by\ tag
 complete -c doing -l tag_order  -f -r -n '__fish_doing_using_command show' -d Tag\ sort\ direction
@@ -617,4 +618,4 @@ complete -f -c doing -l sort -x -n '__fish_doing_using_command changes changelog
 complete -f -c doing -l tag_sort -x -n '__fish_doing_using_command grep search on recent show since today view yesterday' -a 'name time'
 complete -f -c doing -l tag_order -x -n '__fish_doing_using_command grep search on recent show since today view yesterday' -a 'asc desc'
 complete -f -c doing -s a -l age -x -n '__fish_doing_using_command show view' -a 'oldest newest'
-complete -f -c doing -s s -l section -x -n '__fish_doing_using_command again resume autotag cancel done did finish grep search import last mark flag meanwhile note now next on recent reset begin rotate select since tag tags today view wiki yesterday' -a '(__fish_doing_complete_sections)'
+complete -f -c doing -s s -l section -x -n '__fish_doing_using_command again resume autotag cancel done did finish grep search import last mark flag meanwhile note now next on recent reset begin rotate select show since tag tags today view wiki yesterday' -a '(__fish_doing_complete_sections)'

data/lib/completion/doing.ts

@@ -3648,11 +3648,11 @@ const completionSpec: Fig.Spec = {
           },
 
           {
-            name: ["-s", "--sort"],
-            description: "Sort order",
+            name: ["-s", "--section"],
+            description: "Only show entries within section",
             args: {
-                  name: "ORDER",
-                  description: "ORDER",
+                  name: "NAME",
+                  description: "NAME",
             },
 
           },
@@ -3677,6 +3677,16 @@ const completionSpec: Fig.Spec = {
 
           },
 
+          {
+            name: ["--sort"],
+            description: "Sort order",
+            args: {
+                  name: "ORDER",
+                  description: "ORDER",
+            },
+
+          },
+
           {
             name: ["-t", "--times"],
             description: "Show time intervals on @done tasks",

data/lib/doing/colors.rb

@@ -109,7 +109,7 @@ module Doing
         compiled = ''
         normalize_color.split('').each do |char|
           compiled += char
-          valid_color = compiled if Color.attributes.include?(compiled.to_sym)
+          valid_color = compiled if Color.attributes.include?(compiled.to_sym) || compiled =~ /^([fb]g?)?#([a-f0-9]{6})$/i
         end
 
         valid_color
@@ -225,6 +225,19 @@ module Doing
       module_eval(new_method)
     end
 
+    def rgb(hex)
+      is_bg = hex.match(/^bg?#/) ? true : false
+      hex_string = hex.sub(/^([fb]g?)?#/, '')
+
+      parts = hex_string.match(/(?<r>..)(?<g>..)(?<b>..)/)
+      t = []
+      %w[r g b].each do |e|
+        t << parts[e].hex
+      end
+      color =
+      "\e[#{is_bg ? '48' : '38'};2;#{t.join(';')}m"
+    end
+
     # Regular expression that is used to scan for ANSI-sequences while
     # uncoloring strings.
     COLORED_REGEXP = /\e\[(?:(?:[349]|10)[0-7]|[0-9])?m/.freeze

data/lib/doing/hash.rb

@@ -70,6 +70,12 @@ module Doing
       end
     end
 
+    ##
+    ## Turn all non-numeric values into strings
+    ##
+    ## @return     [Hash] a copy of the hash where all
+    ##             non-numeric values are strings
+    ##
     def stringify_values
       transform_values do |v|
         if v.is_a?(Hash)

data/lib/doing/item/query.rb

@@ -152,6 +152,133 @@ module Doing
       negate ? !matches : matches
     end
 
+    ##
+    ## Used by filter_items determine whether an item matches a set of criteria
+    ##
+    ## @param      opt   [Hash] filter parameters
+    ##
+    ## @return     [Boolean] whether the item matches all filter criteria
+    ##
+    def keep_item?(opt)
+      item = dup
+      time_rx = /^(\d{1,2}+(:\d{1,2}+)?( *(am|pm))?|midnight|noon)$/i
+
+      keep = true
+      if opt[:unfinished]
+        finished = item.tags?('done', :and)
+        finished = opt[:not] ? !finished : finished
+        keep = false if finished
+      end
+
+      if keep && opt[:val]&.count&.positive?
+        bool = opt[:bool].normalize_bool if opt[:bool]
+        bool ||= :and
+        bool = :and if bool == :pattern
+
+        val_match = opt[:val].nil? || opt[:val].empty? ? true : item.tag_values?(opt[:val], bool)
+        keep = false unless val_match
+        keep = opt[:not] ? !keep : keep
+      end
+
+      if keep && opt[:tag]
+        opt[:tag_bool] = opt[:bool].normalize_bool if opt[:bool]
+        opt[:tag_bool] ||= :and
+        tag_match = opt[:tag].nil? || opt[:tag].empty? ? true : item.tags?(opt[:tag], opt[:tag_bool])
+        keep = false unless tag_match
+        keep = opt[:not] ? !keep : keep
+      end
+
+      if keep && opt[:search]
+        search_match = if opt[:search].nil? || opt[:search].empty?
+                         true
+                       else
+                         item.search(opt[:search], case_type: opt[:case].normalize_case)
+                       end
+
+        keep = false unless search_match
+        keep = opt[:not] ? !keep : keep
+      end
+
+      if keep && opt[:date_filter]&.length == 2
+        start_date = opt[:date_filter][0]
+        end_date = opt[:date_filter][1]
+
+        in_date_range = if end_date
+                          item.date >= start_date && item.date <= end_date
+                        else
+                          item.date.strftime('%F') == start_date.strftime('%F')
+                        end
+        keep = false unless in_date_range
+        keep = opt[:not] ? !keep : keep
+      end
+
+      if keep && opt[:time_filter][0] || opt[:time_filter][1]
+        opt[:time_filter].map! { |v| v =~ /(12 *am|midnight)/i ? '00:00' : v }
+
+        start_string = if opt[:time_filter][0].nil?
+                         "#{item.date.strftime('%Y-%m-%d')} 00:00"
+                       else
+                         "#{item.date.strftime('%Y-%m-%d')} #{opt[:time_filter][0]}"
+                       end
+        start_time = start_string.chronify(guess: :begin)
+
+        end_string = if opt[:time_filter][1].nil?
+                       "#{item.date.to_datetime.next_day.strftime('%Y-%m-%d')} 00:00"
+                     else
+                       "#{item.date.strftime('%Y-%m-%d')} #{opt[:time_filter][1]}"
+                     end
+        end_time = end_string.chronify(guess: :end) || Time.now
+
+        in_time_range = item.date >= start_time && item.date <= end_time
+
+        keep = false unless in_time_range
+        keep = opt[:not] ? !keep : keep
+      end
+
+      keep = false if keep && opt[:only_timed] && !item.interval
+
+      if keep && opt[:tag_filter]
+        keep = item.tags?(opt[:tag_filter]['tags'], opt[:tag_filter]['bool'])
+        keep = opt[:not] ? !keep : keep
+      end
+
+      if keep && opt[:before]
+        before = opt[:before]
+        cutoff = if before =~ time_rx
+                   "#{item.date.strftime('%Y-%m-%d')} #{before}".chronify(guess: :begin)
+                 elsif before.is_a?(String)
+                   before.chronify(guess: :begin)
+                 else
+                   before
+                 end
+        keep = cutoff && item.date <= cutoff
+        keep = opt[:not] ? !keep : keep
+      end
+
+      if keep && opt[:after]
+        after = opt[:after]
+        cutoff = if after =~ time_rx
+                   "#{item.date.strftime('%Y-%m-%d')} #{after}".chronify(guess: :end)
+                 elsif after.is_a?(String)
+                   after.chronify(guess: :end)
+                 else
+                   after
+                 end
+        keep = cutoff && item.date >= cutoff
+        keep = opt[:not] ? !keep : keep
+      end
+
+      if keep && opt[:today]
+        keep = item.date >= Date.today.to_time && item.date < Date.today.next_day.to_time
+        keep = opt[:not] ? !keep : keep
+      elsif keep && opt[:yesterday]
+        keep = item.date >= Date.today.prev_day.to_time && item.date < Date.today.to_time
+        keep = opt[:not] ? !keep : keep
+      end
+
+      keep
+    end
+
     private
 
     def all_searches?(searches, case_type: :smart)
@@ -191,11 +318,9 @@ module Doing
       return true unless tags.good?
 
       tags.each do |tag|
-        if tag =~ /done/ && !should_finish?
-          next
-        else
-          return false unless @title =~ /@#{tag.wildcard_to_rx}(?= |\(|\Z)/i
-        end
+        next if tag =~ /done/ && !should_finish?
+
+        return false unless @title =~ /@#{tag.wildcard_to_rx}(?= |\(|\Z)/i
       end
       true
     end
@@ -204,11 +329,9 @@ module Doing
       return true unless tags.good?
 
       tags.each do |tag|
-        if tag =~ /done/ && !should_finish?
-          return false
-        else
-          return false if @title =~ /@#{tag.wildcard_to_rx}(?= |\(|\Z)/i
-        end
+        return false if tag =~ /done/ && !should_finish?
+
+        return false if @title =~ /@#{tag.wildcard_to_rx}(?= |\(|\Z)/i
       end
       true
     end
@@ -217,11 +340,9 @@ module Doing
       return true unless tags.good?
 
       tags.each do |tag|
-        if tag =~ /done/ && !should_finish?
-          return true
-        else
-          return true if @title =~ /@#{tag.wildcard_to_rx}(?= |\(|\Z)/i
-        end
+        return true if tag =~ /done/ && !should_finish?
+
+        return true if @title =~ /@#{tag.wildcard_to_rx}(?= |\(|\Z)/i
       end
       false
     end
@@ -393,7 +514,7 @@ module Doing
           return false if val.nil? || tag_val.nil?
 
           # Fail unless both values are of the same class (float or date)
-          return false unless val.class == tag_val.class
+          return false unless val.instance_of?(tag_val.class)
 
           is_match = value_number_matches?(tag_val, comp, val)
 

data/lib/doing/logger.rb

@@ -258,7 +258,7 @@ module Doing
       results = @results.select { |msg| write_message?(msg[:level]) }.uniq
 
       if @logdev == $stdout
-        $stdout.print results.map {|res| res[:message].uncolor }.join("\n")
+        $stdout.print results.map { |res| res[:message].uncolor }.join("\n")
         $stdout.puts
       else
         results.each do |msg|
@@ -324,7 +324,6 @@ module Doing
       end
     end
 
-
     def log_change(tags_added: [], tags_removed: [], count: 1, item: nil, single: false)
       if tags_added.empty? && tags_removed.empty?
         count(:skipped, level: :debug, message: '%count %items with no change', count: count)
@@ -348,9 +347,9 @@ module Doing
         if tags_removed.empty?
           count(:skipped, level: :debug, message: 'no tags removed from %count %items')
         elsif single && item
-          added = tags_added.log_tags
+          removed = tags_removed.log_tags
           info('Untagged:',
-               %(removed #{tags_removed.count == 1 ? 'tag' : 'tags'} #{added} from #{item.title}))
+               %(removed #{tags_removed.count == 1 ? 'tag' : 'tags'} #{removed} from #{item.title}))
         else
           count(:removed_tags, level: :info, tag: tags_removed, message: '%tags removed from %count %items')
         end

data/lib/doing/plugins/export/markdown_export.rb

@@ -55,12 +55,15 @@ module Doing
         interval = wwid.get_interval(i, record: true) if i.title =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
         interval ||= false
 
-        done = i.title =~ /(?<= |^)@done/ ? 'x' : ' '
+        finished = i.title =~ /(?<= |^)@done/ ? true : false
+        done = finished ? 'x' : ' '
 
         all_items << {
           date: i.date.strftime('%a %-I:%M%p'),
           shortdate: i.date.relative_date,
+          flagged: i.title =~ /(?<= |^)@#{Doing.setting('marker_tag')}/,
           done: done,
+          finished: finished,
           note: note,
           section: i.section,
           time: interval,

data/lib/doing/template_string.rb

@@ -65,12 +65,13 @@ module Doing
       working = dup
       color_array = []
 
-      scan(/(?<!\\)(%([a-z]+))/).each do |color|
+      scan(/(?<!\\)(%((?:[fb]g?)?#[a-fA-F0-9]{6}|[a-z]+))/).each do |color|
         valid_color = color[1].validate_color
         next unless valid_color
 
         idx = working.match(/(?<!\\)%#{valid_color}/).begin(0)
-        color_array.push({ name: valid_color, color: Color.send(valid_color), index: idx })
+        color = Color.attributes.include?(valid_color.to_sym) ? Color.send(valid_color) : Color.rgb(valid_color)
+        color_array.push({ name: valid_color, color: color, index: idx })
         working.sub!(/(?<!\\)%#{valid_color}/, '')
       end
 

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.55'
+  VERSION = '2.1.58'
 end

data/lib/doing/wwid/display.rb

@@ -212,7 +212,7 @@ module Doing
     ##
     def recent(count = 10, section = nil, opt)
       opt ||= {}
-      times = opt[:t] || true
+      opt[:times] ||= false
       opt[:totals] ||= false
       opt[:sort_tags] ||= false
 
@@ -236,7 +236,6 @@ module Doing
       opt[:format] = cfg['date_format']
       opt[:template] = opt[:template] || cfg['template']
       opt[:order] = :asc
-      opt[:times] = times
 
       list_section(opt)
     end

data/lib/doing/wwid/filter.rb

@@ -13,15 +13,19 @@ module Doing
     # @return     [Items] Filtered Items array
     #
     def fuzzy_filter_items(items, query, case_type: :smart)
-      scannable = items.map.with_index { |item, idx| "#{item.title} #{item.note.join(' ')}".gsub(/[|*?!]/, '') + "|#{idx}"  }.join("\n")
+      scannable = items.map.with_index { |item, idx| "#{item.title} #{item.note.join(' ')}".gsub(/[|*?!]/, '') + "|#{idx}" }.join("\n")
 
-      fzf_args = [
-        '--multi',
-        %(--filter="#{query.sub(/^'?/, "'")}"),
-        '--no-sort',
-        '-d "\|"',
-        '--nth=1'
-      ]
+      res = `echo #{Shellwords.escape(scannable)}|#{Prompt.fzf} #{fuzzy_filter_args(query, case_type).join(' ')}`
+      selected = Items.new
+      res.split(/\n/).each do |item|
+        idx = item.match(/\|(\d+)$/)[1].to_i
+        selected.push(items[idx])
+      end
+      selected
+    end
+
+    def fuzzy_filter_args(query, case_type)
+      fzf_args = ['--multi', %(--filter="#{query.sub(/^'?/, "'")}"), '--no-sort', '-d "\|"', '--nth=1']
       fzf_args << case case_type.normalize_case
                   when :smart
                     query =~ /[A-Z]/ ? '+i' : '-i'
@@ -30,16 +34,7 @@ module Doing
                   when :ignore
                     '-i'
                   end
-
-      # fzf_args << '-e' if opt[:exact]
-      # puts fzf_args.join(' ')
-      res = `echo #{Shellwords.escape(scannable)}|#{Prompt.fzf} #{fzf_args.join(' ')}`
-      selected = Items.new
-      res.split(/\n/).each do |item|
-        idx = item.match(/\|(\d+)$/)[1].to_i
-        selected.push(items[idx])
-      end
-      selected
+      fzf_args
     end
 
     ##
@@ -95,122 +90,8 @@ module Doing
 
       items.sort_by! { |item| [item.date, item.title.downcase] }.reverse
 
-      filtered_items = items.select do |item|
-        keep = true
-        if opt[:unfinished]
-          finished = item.tags?('done', :and)
-          finished = opt[:not] ? !finished : finished
-          keep = false if finished
-        end
-
-        if keep && opt[:val]&.count&.positive?
-          bool = opt[:bool].normalize_bool if opt[:bool]
-          bool ||= :and
-          bool = :and if bool == :pattern
-
-          val_match = opt[:val].nil? || opt[:val].empty? ? true : item.tag_values?(opt[:val], bool)
-          keep = false unless val_match
-          keep = opt[:not] ? !keep : keep
-        end
-
-        if keep && opt[:tag]
-          opt[:tag_bool] = opt[:bool].normalize_bool if opt[:bool]
-          opt[:tag_bool] ||= :and
-          tag_match = opt[:tag].nil? || opt[:tag].empty? ? true : item.tags?(opt[:tag], opt[:tag_bool])
-          keep = false unless tag_match
-          keep = opt[:not] ? !keep : keep
-        end
-
-        if keep && opt[:search]
-          search_match = if opt[:search].nil? || opt[:search].empty?
-                           true
-                         else
-                           item.search(opt[:search], case_type: opt[:case].normalize_case)
-                         end
+      filtered_items = items.select { |item| item.keep_item?(opt) }
 
-          keep = false unless search_match
-          keep = opt[:not] ? !keep : keep
-        end
-
-        if keep && opt[:date_filter]&.length == 2
-          start_date = opt[:date_filter][0]
-          end_date = opt[:date_filter][1]
-
-          in_date_range = if end_date
-                            item.date >= start_date && item.date <= end_date
-                          else
-                            item.date.strftime('%F') == start_date.strftime('%F')
-                          end
-          keep = false unless in_date_range
-          keep = opt[:not] ? !keep : keep
-        end
-
-        if keep && opt[:time_filter][0] || opt[:time_filter][1]
-          opt[:time_filter].map! { |v| v =~ /(12 *am|midnight)/i ? '00:00' : v }
-
-          start_string = if opt[:time_filter][0].nil?
-                           "#{item.date.strftime('%Y-%m-%d')} 00:00"
-                         else
-                           "#{item.date.strftime('%Y-%m-%d')} #{opt[:time_filter][0]}"
-                         end
-          start_time = start_string.chronify(guess: :begin)
-
-          end_string = if opt[:time_filter][1].nil?
-                         "#{item.date.to_datetime.next_day.strftime('%Y-%m-%d')} 00:00"
-                       else
-                         "#{item.date.strftime('%Y-%m-%d')} #{opt[:time_filter][1]}"
-                       end
-          end_time = end_string.chronify(guess: :end) || Time.now
-
-          in_time_range = item.date >= start_time && item.date <= end_time
-
-          keep = false unless in_time_range
-          keep = opt[:not] ? !keep : keep
-        end
-
-        keep = false if keep && opt[:only_timed] && !item.interval
-
-        if keep && opt[:tag_filter]
-          keep = item.tags?(opt[:tag_filter]['tags'], opt[:tag_filter]['bool'])
-          keep = opt[:not] ? !keep : keep
-        end
-
-        if keep && opt[:before]
-          before = opt[:before]
-          cutoff = if before =~ time_rx
-                     "#{item.date.strftime('%Y-%m-%d')} #{before}".chronify(guess: :begin)
-                   elsif before.is_a?(String)
-                     before.chronify(guess: :begin)
-                   else
-                     before
-                   end
-          keep = cutoff && item.date <= cutoff
-          keep = opt[:not] ? !keep : keep
-        end
-
-        if keep && opt[:after]
-          after = opt[:after]
-          cutoff = if after =~ time_rx
-                     "#{item.date.strftime('%Y-%m-%d')} #{after}".chronify(guess: :end)
-                   elsif after.is_a?(String)
-                     after.chronify(guess: :end)
-                   else
-                     after
-                   end
-          keep = cutoff && item.date >= cutoff
-          keep = opt[:not] ? !keep : keep
-        end
-
-        if keep && opt[:today]
-          keep = item.date >= Date.today.to_time && item.date < Date.today.next_day.to_time
-          keep = opt[:not] ? !keep : keep
-        elsif keep && opt[:yesterday]
-          keep = item.date >= Date.today.prev_day.to_time && item.date < Date.today.to_time
-          keep = opt[:not] ? !keep : keep
-        end
-
-        keep
-      end
       count = opt[:count].to_i&.positive? ? opt[:count].to_i : filtered_items.count
 
       output = Items.new

data/lib/doing/wwid/modify.rb

@@ -281,6 +281,7 @@ module Doing
 
             if opt[:remove] || opt[:rename] || opt[:value]
               rename_to = nil
+
               if opt[:value]
                 rename_to = tag
               elsif opt[:rename]