doing 2.1.16 → 2.1.21

data/lib/completion/doing.fish

@@ -23,28 +23,97 @@ function __fish_doing_using_command
   and return 0
 end
 
+function __fish_doing_cache_timer_expired
+  set -l timer __fish_doing_cache_timer_$argv[1]
+  if not set -q $timer
+    set -g $timer (date '+%s')
+  end
+
+  if test (math (date '+%s') - $$timer) -gt $argv[2]
+    set -g $timer (date '+%s')
+    return 1
+  end
+
+  return 0
+end
+
+function __fish_doing_subcommands
+  if not set -q __fish_doing_subcommands_cache
+    or __fish_doing_cache_timer_expired subcommands 86400
+    set -g -a __fish_doing_subcommands_cache (doing help -c)
+  end
+  printf '%s
+' $__fish_doing_subcommands_cache
+end
+
 function __fish_doing_complete_sections
-  doing sections -c
+  if not set -q __fish_doing_sections_cache
+    or __fish_doing_cache_timer_expired sections 3600
+    set -g -a __fish_doing_sections_cache (doing sections -c)
+  end
+  printf '%s
+' $__fish_doing_sections_cache
+  __fish_doing_complete_show_tag
 end
 
 function __fish_doing_complete_views
-  doing views -c
+  if not set -q __fish_doing_views_cache
+    or __fish_doing_cache_timer_expired views 3600
+    set -g -a __fish_doing_views_cache (doing views -c)
+  end
+  printf '%s
+' $__fish_doing_views_cache
 end
 
-function __fish_doing_subcommands
-  doing help -c
+function __fish_doing_export_plugin
+  if not set -q __fish_doing_export_plugin_cache
+    or __fish_doing_cache_timer_expired export_plugins 3600
+    set -g -a __fish_doing_export_plugin_cache (doing plugins --type export -c)
+  end
+  printf '%s
+' $__fish_doing_export_plugin_cache
+end
+
+function __fish_doing_import_plugin
+  if not set -q __fish_doing_import_plugin_cache
+    or __fish_doing_cache_timer_expired import_plugins 3600
+    set -g -a __fish_doing_import_plugin_cache (doing plugins --type import -c)
+  end
+  printf '%s
+' $__fish_doing_import_plugin_cache
+end
+
+function __fish_doing_complete_template
+  if not set -q __fish_doing_template_cache
+    or __fish_doing_cache_timer_expired template 3600
+    set -g -a __fish_doing_template_cache (doing template -c)
+  end
+  printf '%s
+' $__fish_doing_template_cache
 end
 
-function __fish_doing_export_plugins
-  doing plugins --type export -c
+function __fish_doing_complete_tag
+  if not set -q __fish_doing_tag_cache
+    or __fish_doing_cache_timer_expired tags 60
+    set -g -a __fish_doing_tag_cache (doing tags)
+  end
+  printf '%s
+' $__fish_doing_tag_cache
 end
 
-function __fish_doing_import_plugins
-  doing plugins --type import -c
+function __fish_doing_complete_show_tag
+  if not set -q __fish_doing_tag_cache
+    or __fish_doing_cache_timer_expired tags 60
+    set -g -a __fish_doing_tag_cache (doing tags)
+  end
+  printf '@%s
+' $__fish_doing_tag_cache
 end
 
-function __fish_doing_complete_templates
-  doing template -c
+function __fish_doing_complete_args
+  for cmd in (doing commands_accepting -c $argv[1])
+    complete -x -c doing -l $argv[1] -n "__fish_doing_using_command $cmd" -a "(__fish_doing_complete_$argv[1])"
+  end
 end
 
 complete -c doing -f
@@ -57,6 +126,14 @@ complete -f -c doing -s t -l type -x -n '__fish_doing_using_command import' -a '
 
 complete -xc doing -n '__fish_seen_subcommand_from help; and not __fish_seen_subcommand_from (doing help -c)' -a "(doing help -c)"
 
+function __fish_doing_complete_args
+  for cmd in (doing commands_accepting -c $argv[1])
+    complete -x -c doing -l $argv[1] -n "__fish_doing_using_command $cmd" -a "(__fish_doing_complete_$argv[1])"
+  end
+end
+
+__fish_doing_complete_args tag
+
 complete -xc doing -n '__fish_doing_needs_command' -a 'add_section' -d Add\ a\ new\ section\ to\ the\ \"doing\"\ file
 complete -xc doing -n '__fish_doing_needs_command' -a 'again resume' -d Repeat\ last\ entry\ as\ new\ entry
 complete -xc doing -n '__fish_doing_needs_command' -a 'archive move' -d Move\ entries\ between\ sections
@@ -100,6 +177,7 @@ complete -xc doing -n '__fish_doing_needs_command' -a 'views' -d List\ available
 complete -xc doing -n '__fish_doing_needs_command' -a 'wiki' -d Output\ a\ tag\ wiki
 complete -xc doing -n '__fish_doing_needs_command' -a 'yesterday' -d List\ entries\ from\ yesterday
 complete -c doing -l ask  -f  -n '__fish_doing_using_command again resume' -d Prompt\ for\ note\ via\ multi-line\ input
+complete -c doing -l started  -f -r -n '__fish_doing_using_command again resume' -d Backdate\ start\ date\ by\ interval\ or\ set\ to\ time\ \[4pm\|20m\|2h\|\"yesterday\ noon\"\]
 complete -c doing -l bool  -f -r -n '__fish_doing_using_command again resume' -d Boolean\ used\ to\ combine\ multiple\ tags
 complete -c doing -l case  -f -r -n '__fish_doing_using_command again resume' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
 complete -c doing -l editor -s e -f  -n '__fish_doing_using_command again resume' -d Edit\ duplicated\ entry\ with\ vim\ before\ adding
@@ -159,9 +237,9 @@ complete -c doing -l section -s s -f -r -n '__fish_doing_using_command done did'
 complete -c doing -l for  -f -r -n '__fish_doing_using_command done did' -d Set\ completion\ date\ to\ start\ date\ plus\ interval
 complete -c doing -l unfinished -s u -f  -n '__fish_doing_using_command done did' -d Finish\ last\ entry\ not\ already\ marked\ @done
 complete -c doing -l archive -s a -f  -n '__fish_doing_using_command finish' -d Archive\ entries
-complete -c doing -l at  -f -r -n '__fish_doing_using_command finish' -d Set\ finish\ date\ to\ specific\ date/time
+complete -c doing -l finished  -f -r -n '__fish_doing_using_command finish' -d Set\ finish\ date\ to\ specific\ date/time
 complete -c doing -l auto  -f  -n '__fish_doing_using_command finish' -d Auto-generate\ finish\ dates\ from\ next\ entry\'s\ start\ time
-complete -c doing -l back -s b -f -r -n '__fish_doing_using_command finish' -d Backdate\ completed\ date\ to\ date\ string\ \[4pm\|20m\|2h\|yesterday\ noon\]
+complete -c doing -l started  -f -r -n '__fish_doing_using_command finish' -d Backdate\ completed\ date\ to\ date\ string\ \[4pm\|20m\|2h\|yesterday\ noon\]
 complete -c doing -l bool  -f -r -n '__fish_doing_using_command finish' -d Boolean
 complete -c doing -l case  -f -r -n '__fish_doing_using_command finish' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
 complete -c doing -l date  -f  -n '__fish_doing_using_command finish' -d Include\ date
@@ -183,6 +261,7 @@ complete -c doing -l delete -s d -f  -n '__fish_doing_using_command grep search'
 complete -c doing -l duration  -f  -n '__fish_doing_using_command grep search' -d Show\ elapsed\ time\ on\ entries\ without\ @done\ tag
 complete -c doing -l editor -s e -f  -n '__fish_doing_using_command grep search' -d Edit\ matching\ entries\ with\ vim
 complete -c doing -l from  -f -r -n '__fish_doing_using_command grep search' -d Date\ range\ to\ show
+complete -c doing -l hilite -s h -f  -n '__fish_doing_using_command grep search' -d Highlight\ search\ matches\ in\ output
 complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command grep search' -d Display\ an\ interactive\ menu\ of\ results\ to\ perform\ further\ operations
 complete -c doing -l not  -f  -n '__fish_doing_using_command grep search' -d Show\ items\ that\ \*don\'t\*\ match\ search\ string
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command grep search' -d Output\ to\ export\ format
@@ -213,6 +292,7 @@ complete -c doing -l case  -f -r -n '__fish_doing_using_command last' -d Case\ s
 complete -c doing -l delete -s d -f  -n '__fish_doing_using_command last' -d Delete\ the\ last\ entry
 complete -c doing -l duration  -f  -n '__fish_doing_using_command last' -d Show\ elapsed\ time\ if\ entry\ is\ not\ tagged\ @done
 complete -c doing -l editor -s e -f  -n '__fish_doing_using_command last' -d Edit\ entry\ with\ vim
+complete -c doing -l hilite -s h -f  -n '__fish_doing_using_command last' -d Highlight\ search\ matches\ in\ output
 complete -c doing -l not  -f  -n '__fish_doing_using_command last' -d Show\ items\ that\ \*don\'t\*\ match\ search\ string\ or\ tag\ filter
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command last' -d Specify\ a\ section
 complete -c doing -l search  -f -r -n '__fish_doing_using_command last' -d Search\ filter
@@ -220,7 +300,7 @@ complete -c doing -l tag  -f -r -n '__fish_doing_using_command last' -d Tag\ fil
 complete -c doing -l val  -f -r -n '__fish_doing_using_command last' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command last' -d Force\ exact\ search\ string\ matching
 complete -c doing -l ask  -f  -n '__fish_doing_using_command later' -d Prompt\ for\ note\ via\ multi-line\ input
-complete -c doing -l back -s b -f -r -n '__fish_doing_using_command later' -d Backdate\ start\ time\ to\ date\ string\ \[4pm\|20m\|2h\|yesterday\ noon\]
+complete -c doing -l started  -f -r -n '__fish_doing_using_command later' -d Backdate\ start\ time\ to\ date\ string\ \[4pm\|20m\|2h\|yesterday\ noon\]
 complete -c doing -l editor -s e -f  -n '__fish_doing_using_command later' -d Edit\ entry\ with\ vim
 complete -c doing -l note -s n -f -r -n '__fish_doing_using_command later' -d Note
 complete -c doing -l bool  -f -r -n '__fish_doing_using_command mark flag' -d Boolean
@@ -239,7 +319,7 @@ complete -c doing -l val  -f -r -n '__fish_doing_using_command mark flag' -d Per
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command mark flag' -d Force\ exact\ search\ string\ matching
 complete -c doing -l archive -s a -f  -n '__fish_doing_using_command meanwhile' -d Archive\ previous\ @meanwhile\ entry
 complete -c doing -l ask  -f  -n '__fish_doing_using_command meanwhile' -d Prompt\ for\ note\ via\ multi-line\ input
-complete -c doing -l back -s b -f -r -n '__fish_doing_using_command meanwhile' -d Backdate\ start\ date\ for\ new\ entry\ to\ date\ string\ \[4pm\|20m\|2h\|yesterday\ noon\]
+complete -c doing -l started  -f -r -n '__fish_doing_using_command meanwhile' -d Backdate\ start\ date\ for\ new\ entry\ to\ date\ string\ \[4pm\|20m\|2h\|yesterday\ noon\]
 complete -c doing -l editor -s e -f  -n '__fish_doing_using_command meanwhile' -d Edit\ entry\ with\ vim
 complete -c doing -l note -s n -f -r -n '__fish_doing_using_command meanwhile' -d Note
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command meanwhile' -d Section
@@ -331,6 +411,7 @@ complete -c doing -l count -s c -f -r -n '__fish_doing_using_command show' -d Ma
 complete -c doing -l case  -f -r -n '__fish_doing_using_command show' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
 complete -c doing -l duration  -f  -n '__fish_doing_using_command show' -d Show\ elapsed\ time\ on\ entries\ without\ @done\ tag
 complete -c doing -l from  -f -r -n '__fish_doing_using_command show' -d Date\ range\ to\ show
+complete -c doing -l hilite -s h -f  -n '__fish_doing_using_command show' -d Highlight\ search\ matches\ in\ output
 complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command show' -d Select\ from\ a\ menu\ of\ matching\ entries\ to\ perform\ additional\ operations
 complete -c doing -l menu -s m -f  -n '__fish_doing_using_command show' -d Select\ section\ or\ tag\ to\ display\ from\ a\ menu
 complete -c doing -l not  -f  -n '__fish_doing_using_command show' -d Show\ items\ that\ \*don\'t\*\ match\ search/tag/date\ filters
@@ -408,6 +489,7 @@ complete -c doing -l case  -f -r -n '__fish_doing_using_command view' -d Case\ s
 complete -c doing -l color  -f  -n '__fish_doing_using_command view' -d Include\ colors\ in\ output
 complete -c doing -l duration  -f  -n '__fish_doing_using_command view' -d Show\ elapsed\ time\ on\ entries\ without\ @done\ tag
 complete -c doing -l from  -f -r -n '__fish_doing_using_command view' -d Date\ range\ to\ show
+complete -c doing -l hilite -s h -f  -n '__fish_doing_using_command view' -d Highlight\ search\ matches\ in\ output
 complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command view' -d Select\ from\ a\ menu\ of\ matching\ entries\ to\ perform\ additional\ operations
 complete -c doing -l not  -f  -n '__fish_doing_using_command view' -d Show\ items\ that\ \*don\'t\*\ match\ search\ string
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command view' -d Output\ to\ export\ format
@@ -440,7 +522,7 @@ complete -c doing -l times -s t -f  -n '__fish_doing_using_command yesterday' -d
 complete -c doing -l tag_order  -f -r -n '__fish_doing_using_command yesterday' -d Tag\ sort\ direction
 complete -c doing -l tag_sort  -f -r -n '__fish_doing_using_command yesterday' -d Sort\ tags\ by
 complete -c doing -l totals  -f  -n '__fish_doing_using_command yesterday' -d Show\ time\ totals\ at\ the\ end\ of\ output
-complete -f -c doing -s o -l output -x -n '__fish_doing_using_command grep search on select show since today view yesterday' -a '(__fish_doing_export_plugins)'
+complete -f -c doing -s o -l output -x -n '__fish_doing_using_command grep search on select show since today view yesterday' -a '(__fish_doing_export_plugin)'
 complete -f -c doing -s b -l bool -x -n '__fish_doing_using_command again resume archive move autotag cancel finish grep search last mark flag note reset begin rotate show tag tags view wiki' -a 'and or not pattern'
 complete -f -c doing -l case -x -n '__fish_doing_using_command again resume archive move cancel finish grep search import last mark flag note reset begin rotate select show show tag tags tags view' -a 'case-sensitive ignore smart'
 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'

data/lib/doing/colors.rb

@@ -24,6 +24,7 @@ module Doing
       [:yellow, 33],
       [:blue, 34],
       [:magenta, 35],
+      [:purple, 35],
       [:cyan, 36],
       [:white, 37],
       [:bgblack, 40],
@@ -32,6 +33,7 @@ module Doing
       [:bgyellow, 43],
       [:bgblue, 44],
       [:bgmagenta, 45],
+      [:bgpurple, 45],
       [:bgcyan, 46],
       [:bgwhite, 47],
       [:boldblack, 90], # High intensity, aixterm (works in OS X)
@@ -40,6 +42,7 @@ module Doing
       [:boldyellow, 93],
       [:boldblue, 94],
       [:boldmagenta, 95],
+      [:boldpurple, 95],
       [:boldcyan, 96],
       [:boldwhite, 97],
       [:boldbgblack, 100], # High intensity background, aixterm (works in OS X)
@@ -48,6 +51,7 @@ module Doing
       [:boldbgyellow, 103],
       [:boldbgblue, 104],
       [:boldbgmagenta, 105],
+      [:boldbgpurple, 105],
       [:boldbgcyan, 106],
       [:boldbgwhite, 107],
       [:softpurple, '0;35;40'],

data/lib/doing/completion/fish_completion.rb

@@ -31,28 +31,89 @@ module Doing
             and return 0
           end
 
+          function __fish_doing_cache_timer_expired
+            set -l timer __fish_doing_cache_timer_$argv[1]
+            if not set -q $timer
+              set -g $timer (date '+%s')
+            end
+
+            if test (math (date '+%s') - $$timer) -gt $argv[2]
+              set -g $timer (date '+%s')
+              return 1
+            end
+
+            return 0
+          end
+
+          function __fish_doing_subcommands
+            if not set -q __fish_doing_subcommands_cache
+              or __fish_doing_cache_timer_expired subcommands 86400
+              set -g -a __fish_doing_subcommands_cache (doing help -c)
+            end
+            printf '%s\n' $__fish_doing_subcommands_cache
+          end
+
           function __fish_doing_complete_sections
-            doing sections -c
+            if not set -q __fish_doing_sections_cache
+              or __fish_doing_cache_timer_expired sections 3600
+              set -g -a __fish_doing_sections_cache (doing sections -c)
+            end
+            printf '%s\n' $__fish_doing_sections_cache
+            __fish_doing_complete_show_tag
           end
 
           function __fish_doing_complete_views
-            doing views -c
+            if not set -q __fish_doing_views_cache
+              or __fish_doing_cache_timer_expired views 3600
+              set -g -a __fish_doing_views_cache (doing views -c)
+            end
+            printf '%s\n' $__fish_doing_views_cache
           end
 
-          function __fish_doing_subcommands
-            doing help -c
+          function __fish_doing_export_plugin
+            if not set -q __fish_doing_export_plugin_cache
+              or __fish_doing_cache_timer_expired export_plugins 3600
+              set -g -a __fish_doing_export_plugin_cache (doing plugins --type export -c)
+            end
+            printf '%s\n' $__fish_doing_export_plugin_cache
+          end
+
+          function __fish_doing_import_plugin
+            if not set -q __fish_doing_import_plugin_cache
+              or __fish_doing_cache_timer_expired import_plugins 3600
+              set -g -a __fish_doing_import_plugin_cache (doing plugins --type import -c)
+            end
+            printf '%s\n' $__fish_doing_import_plugin_cache
+          end
+
+          function __fish_doing_complete_template
+            if not set -q __fish_doing_template_cache
+              or __fish_doing_cache_timer_expired template 3600
+              set -g -a __fish_doing_template_cache (doing template -c)
+            end
+            printf '%s\n' $__fish_doing_template_cache
           end
 
-          function __fish_doing_export_plugins
-            doing plugins --type export -c
+          function __fish_doing_complete_tag
+            if not set -q __fish_doing_tag_cache
+              or __fish_doing_cache_timer_expired tags 60
+              set -g -a __fish_doing_tag_cache (doing tags)
+            end
+            printf '%s\n' $__fish_doing_tag_cache
           end
 
-          function __fish_doing_import_plugins
-            doing plugins --type import -c
+          function __fish_doing_complete_show_tag
+            if not set -q __fish_doing_tag_cache
+              or __fish_doing_cache_timer_expired tags 60
+              set -g -a __fish_doing_tag_cache (doing tags)
+            end
+            printf '@%s\n' $__fish_doing_tag_cache
           end
 
-          function __fish_doing_complete_templates
-            doing template -c
+          function __fish_doing_complete_args
+            for cmd in (doing commands_accepting -c $argv[1])
+              complete -x -c doing -l $argv[1] -n "__fish_doing_using_command $cmd" -a "(__fish_doing_complete_$argv[1])"
+            end
           end
 
           complete -c doing -f
@@ -64,6 +125,14 @@ module Doing
           complete -f -c doing -s t -l type -x -n '__fish_doing_using_command import' -a '(__fish_doing_import_plugins)'
 
           complete -xc doing -n '__fish_seen_subcommand_from help; and not __fish_seen_subcommand_from (doing help -c)' -a "(doing help -c)"
+
+          function __fish_doing_complete_args
+            for cmd in (doing commands_accepting -c $argv[1])
+              complete -x -c doing -l $argv[1] -n "__fish_doing_using_command $cmd" -a "(__fish_doing_complete_$argv[1])"
+            end
+          end
+
+          __fish_doing_complete_args tag
         EOFUNCTIONS
       end
 
@@ -161,7 +230,7 @@ module Doing
         end
 
         unless need_export.empty?
-          out << "complete -f -c doing -s o -l output -x -n '__fish_doing_using_command #{need_export.join(' ')}' -a '(__fish_doing_export_plugins)'"
+          out << "complete -f -c doing -s o -l output -x -n '__fish_doing_using_command #{need_export.join(' ')}' -a '(__fish_doing_export_plugin)'"
         end
 
         unless need_bool.empty?

data/lib/doing/configuration.rb

@@ -30,6 +30,7 @@ module Doing
         'command_path' => File.join(Util.user_home, '.config', 'doing', 'commands')
       },
       'doing_file' => '~/.local/share/doing/what_was_i_doing.md',
+      'doing_file_sort' => 'desc',
       'backup_dir' => '~/.local/share/doing/doing_backup',
       'history_size' => 15,
       'current_section' => 'Currently',
@@ -99,7 +100,8 @@ module Doing
       'search' => {
         'matching' => 'pattern', # fuzzy, pattern, exact
         'distance' => 3,
-        'case' => 'smart' # sensitive, ignore, smart
+        'case' => 'smart', # sensitive, ignore, smart
+        'highlight' => false
       },
       'include_notes' => true,
       'interaction' => {

data/lib/doing/hash.rb

@@ -38,7 +38,7 @@ module Doing
     #
     def deep_set(path, value)
       if path.count == 1
-        if value
+        unless value.nil? || value =~ /^ *$/
           self[path[0]] = value
         else
           delete(path[0])

data/lib/doing/item.rb

@@ -9,6 +9,8 @@ module Doing
 
     # attr_reader :id
 
+    include Color
+
     ##
     ## Initialize an item with date, title, section, and
     ## optional note
@@ -269,6 +271,34 @@ module Doing
       (case_type == :smart && search !~ /[A-Z]/) || case_type == :ignore
     end
 
+    def highlight_search(search, distance: nil, negate: false, case_type: nil)
+      prefs = Doing.config.settings['search'] || {}
+      matching = prefs.fetch('matching', 'pattern').normalize_matching
+      distance ||= prefs.fetch('distance', 3).to_i
+      case_type ||= prefs.fetch('case', 'smart').normalize_case
+      new_note = Note.new
+
+      if search.is_rx? || matching == :fuzzy
+        rx = search.to_rx(distance: distance, case_type: case_type)
+        new_title = @title.gsub(rx) { |m| yellow(m) }
+        new_note.add(@note.to_s.gsub(rx) { |m| yellow(m) })
+      else
+        query = to_phrase_query(search.strip)
+
+        if query[:must].nil? && query[:must_not].nil?
+          query[:must] = query[:should]
+          query[:should] = []
+        end
+        query[:must].concat(query[:should]).each do |s|
+          rx = Regexp.new(s.wildcard_to_rx, ignore_case(s, case_type))
+          new_title = @title.gsub(rx) { |m| yellow(m) }
+          new_note.add(@note.to_s.gsub(rx) { |m| yellow(m) })
+        end
+      end
+
+      Item.new(@date, new_title, @section, new_note)
+    end
+
     ##
     ## Test if item matches search string
     ##
@@ -372,6 +402,27 @@ module Doing
       "\t- #{@date.strftime('%Y-%m-%d %H:%M')} | #{@title}#{@note.empty? ? '' : "\n#{@note}"}"
     end
 
+    ##
+    ## outputs a colored string with relative date and highlighted tags
+    ##
+    ## @return     Pretty representation of the object.
+    ##
+    def to_pretty(elements: %i[date title section])
+      output = []
+      elements.each do |e|
+        case e
+        when :date
+          output << format('%13s |', @date.relative_date).cyan
+        when :section
+          output << "#{magenta}(#{white(@section)}#{magenta})"
+        when :title
+          output << @title.white.highlight_tags('cyan')
+        end
+      end
+
+      output.join(' ')
+    end
+
     # @private
     def inspect
       # %(<Doing::Item @date=#{@date} @title="#{@title}" @section:"#{@section}" @note:#{@note.to_s}>)

data/lib/doing/items.rb

@@ -131,7 +131,9 @@ module Doing
       out = []
       @sections.each do |section|
         out.push(section.original)
-        in_section(section.title).each { |item| out.push(item.to_s)}
+        items = in_section(section.title).sort_by { |i| i.date }
+        items.reverse! if Doing.config.settings['doing_file_sort'].normalize_order == 'desc'
+        items.each { |item| out.push(item.to_s)}
       end
 
       out.join("\n")

data/lib/doing/log_adapter.rb

@@ -398,9 +398,9 @@ module Doing
       return topic.ljust(TOPIC_WIDTH) if topic && message.strip.empty?
 
       topic = formatted_topic(topic, colon: block_given?)
-      message.truncmiddle!(@max_length - TOPIC_WIDTH - 5)
+      # message.truncmiddle!(@max_length - TOPIC_WIDTH - 5)
       out = topic + message
-      out.truncate!(@max_length) if @max_length.positive?
+      # out.truncate!(@max_length) if @max_length.positive?
       messages << out
       out
     end

data/lib/doing/pager.rb

@@ -55,7 +55,7 @@ module Doing
           write_io.write(text)
           write_io.close
         rescue SystemCallError => e
-          raise Errors::DoingStandardError, "Pager error, #{e}"
+          # raise Errors::DoingStandardError, "Pager error, #{e}"
         end
 
         _, status = Process.waitpid2(pid)

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

@@ -75,7 +75,7 @@ module Doing
           note = i.note.map { |line| line.strip.link_urls(format: :markdown) } if i.note
         end
 
-        title = "#{title} @project(#{i.section})" unless variables[:is_single]
+        title = "#{title} @section(#{i.section})" unless variables[:is_single]
 
         tags.concat(i.tag_array).sort!.uniq!
         flagged = day_flagged = true if i.tags?(wwid.config['marker_tag'])

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

@@ -48,7 +48,7 @@ module Doing
           note = i.note.map { |line| line.strip.link_urls(format: :markdown) } if i.note
         end
 
-        title = "#{title} @project(#{i.section})" unless variables[:is_single]
+        title = "#{title} @section(#{i.section})" unless variables[:is_single]
 
         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

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

@@ -119,6 +119,8 @@ module Doing
 
         output.gsub!(/\\%/, '%')
 
+        output.highlight_search!(opt[:search]) if opt[:search] && !opt[:not] && opt[:hilite]
+
         out += "#{output}\n"
       end
 

data/lib/doing/prompt.rb

@@ -17,6 +17,7 @@ module Doing
       end
 
       def enter_text(prompt, default_response: '')
+        $stdin.reopen('/dev/tty')
         return default_response if @default_answer
 
         print "#{yellow(prompt).sub(/:?$/, ':')} #{reset}"
@@ -24,12 +25,13 @@ module Doing
       end
 
       def read_line(prompt: 'Enter text', completions: [], default_response: '')
+        $stdin.reopen('/dev/tty')
         return default_response if @default_answer
 
         unless completions.empty?
           completions.sort!
           comp = proc { |s| completions.grep(/^#{Regexp.escape(s)}/) }
-          Readline.completion_append_character = " "
+          Readline.completion_append_character = ' '
           Readline.completion_proc = comp
         end
 
@@ -41,20 +43,26 @@ module Doing
       end
 
       def read_lines(prompt: 'Enter text', completions: [])
+        $stdin.reopen('/dev/tty')
         return default_response if @default_answer
 
         completions.sort!
         comp = proc { |s| completions.grep(/^#{Regexp.escape(s)}/) }
-        Readline.completion_append_character = " "
+        Readline.completion_append_character = ' '
         Readline.completion_proc = comp
-
-        puts "#{boldgreen(prompt.sub(/:?$/, ':'))} #{yellow('Hit return for a new line, ')}#{boldwhite('enter a blank line (')}#{boldyellow('return twice')}#{boldwhite(') to end editing')}"
+        prompt_text = []
+        prompt_text << boldgreen(prompt.sub(/:?$/, ':'))
+        prompt_text << yellow(' Enter a blank line (')
+        prompt_text << boldwhite('return twice')
+        prompt_text << yellow(') to end editing')
+        puts prompt_text.join('')
 
         res = []
 
         begin
-          while line = Readline.readline('> ', true)
+          while (line = Readline.readline('> ', true))
             break if line.strip.empty?
+
             res << line.chomp
           end
         rescue Interrupt
@@ -65,6 +73,7 @@ module Doing
       end
 
       def request_lines(prompt: 'Enter text')
+        $stdin.reopen('/dev/tty')
         ask_note = []
         reader = TTY::Reader.new(interrupt: -> { raise Errors::UserCancelled }, track_history: false)
         puts "#{boldgreen(prompt.sub(/:?$/, ':'))} #{yellow('Hit return for a new line, ')}#{boldwhite('enter a blank line (')}#{boldyellow('return twice')}#{boldwhite(') to end editing')}"
@@ -92,6 +101,8 @@ module Doing
           return @force_answer
         end
 
+        $stdin.reopen('/dev/tty')
+
         default = if default_response.is_a?(String)
                     default_response =~ /y/i ? true : false
                   else

data/lib/doing/string.rb

@@ -101,6 +101,49 @@ module Doing
       gsub(/(\s|m)(@[^ ("']+)/, "\\1#{tag_color}\\2#{last_color}")
     end
 
+    def to_phrase_query(query)
+      parser = PhraseParser::QueryParser.new
+      transformer = PhraseParser::QueryTransformer.new
+      parse_tree = parser.parse(query)
+      transformer.apply(parse_tree).to_elasticsearch
+    end
+
+    def ignore_case(search, case_type)
+      (case_type == :smart && search !~ /[A-Z]/) || case_type == :ignore
+    end
+
+    def highlight_search!(search, distance: nil, negate: false, case_type: nil)
+      replace highlight_search(search, distance: distance, negate: negate, case_type: case_type)
+    end
+
+    def highlight_search(search, distance: nil, negate: false, case_type: nil)
+      out = dup
+      prefs = Doing.config.settings['search'] || {}
+      matching = prefs.fetch('matching', 'pattern').normalize_matching
+      distance ||= prefs.fetch('distance', 3).to_i
+      case_type ||= prefs.fetch('case', 'smart').normalize_case
+
+      if search.is_rx? || matching == :fuzzy
+        rx = search.to_rx(distance: distance, case_type: case_type)
+        out.gsub!(rx) { |m| m.bgyellow.black }
+      else
+        query = to_phrase_query(search.strip)
+
+        if query[:must].nil? && query[:must_not].nil?
+          query[:must] = query[:should]
+          query[:should] = []
+        end
+        qs = []
+        qs.concat(query[:must]) if query[:must]
+        qs.concat(query[:should]) if query[:should]
+        qs.each do |s|
+          rx = Regexp.new(s.wildcard_to_rx, ignore_case(s, case_type))
+          out.gsub!(rx) { |m| m.bgyellow.black }
+        end
+      end
+      out
+    end
+
     ##
     ## Test if line should be ignored
     ##
@@ -642,6 +685,15 @@ module Doing
       end
     end
 
+    def to_bool
+      case self
+      when /^[yt1]/i
+        true
+      else
+        false
+      end
+    end
+
     ##
     ## Convert a string value to an appropriate type. If
     ## kind is not specified, '[one, two]' becomes an Array,
@@ -661,6 +713,8 @@ module Doing
           gsub(/^\[ *| *\]$/, '').split(/ *, */)
         when /^i/i
           to_i
+        when /^(fa|tr)/i
+          to_bool
         when /^f/i
           to_f
         when /^sy/i