doing 1.0.52 → 1.0.57

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.52'
+  VERSION = '1.0.57'
 end

data/lib/doing/wwid.rb

@@ -3,6 +3,56 @@
 require 'deep_merge'
 require 'open3'
 
+##
+## @brief      Hash helpers
+##
+class Hash
+  def has_tags?(tags, bool = 'AND')
+    tags = tags.split(/ *, */) if tags.is_a? String
+    item = self
+    case bool
+    when 'AND'
+      result = true
+      tags.each do |tag|
+        unless item['title'] =~ /@#{tag}/
+          result = false
+          break
+        end
+      end
+      result
+    when 'NOT'
+      result = true
+      tags.each do |tag|
+        if item['title'] =~ /@#{tag}/
+          result = false
+          break
+        end
+      end
+      result
+    else
+      result = false
+      tags.each do |tag|
+        if item['title'] =~ /@#{tag}/
+          result = true
+          break
+        end
+      end
+      result
+    end
+  end
+
+  def matches_search?(search)
+    item = self
+    text = item['note'] ? item['title'] + item['note'].join(' ') : item['title']
+    pattern = if search.strip =~ %r{^/.*?/$}
+                search.sub(%r{/(.*?)/}, '\1')
+              else
+                search.split('').join('.{0,3}')
+              end
+    text =~ /#{pattern}/i ? true : false
+  end
+end
+
 ##
 ## @brief      String helpers
 ##
@@ -131,6 +181,7 @@ class WWID
     @config['autotag']['synonyms'] ||= {}
     @config['doing_file'] ||= '~/what_was_i_doing.md'
     @config['current_section'] ||= 'Currently'
+    @config['config_editor_app'] ||= nil
     @config['editor_app'] ||= nil
 
     @config['html_template'] ||= {}
@@ -333,7 +384,7 @@ class WWID
       tmpfile.unlink
     end
 
-    input
+    input.split(/\n/).delete_if {|line| line =~ /^#/ }.join("\n").strip
   end
 
   #
@@ -346,9 +397,20 @@ class WWID
   def format_input(input)
     raise 'No content in entry' if input.nil? || input.strip.empty?
 
-    input_lines = input.split(/[\n\r]+/)
-    title = input_lines[0].strip
+    input_lines = input.split(/[\n\r]+/).delete_if {|line| line =~ /^#/ || line =~ /^\s*$/ }
+    title = input_lines[0]&.strip
+    raise 'No content in first line' if title.nil? || title.strip.empty?
+
     note = input_lines.length > 1 ? input_lines[1..-1] : []
+    # If title line ends in a parenthetical, use that as the note
+    if note.empty? && title =~ /\(.*?\)$/
+      title.sub!(/\((.*?)\)$/) do
+        m = Regexp.last_match
+        note.push(m[1])
+        ''
+      end
+    end
+
     note.map!(&:strip)
     note.delete_if { |line| line =~ /^\s*$/ || line =~ /^#/ }
 
@@ -637,6 +699,8 @@ class WWID
   def restart_last(opt = {})
     opt[:section] ||= 'all'
     opt[:note] ||= []
+    opt[:tag] ||= []
+    opt[:tag_bool] ||= 'AND'
 
     last = last_entry(opt)
     if last.nil?
@@ -645,8 +709,9 @@ class WWID
     end
     # Remove @done tag
     title = last['title'].sub(/\s*@done(\(.*?\))?/, '').chomp
+    section = opt[:in].nil? ? last['section'] : guess_section(opt[:in])
     @auto_tag = false
-    add_item(title, last['section'], { note: opt[:note], back: opt[:date], timed: true })
+    add_item(title, section, { note: opt[:note], back: opt[:date], timed: true })
     write(@doing_file)
   end
 
@@ -656,6 +721,7 @@ class WWID
   ## @param      opt   (Hash) Additional Options
   ##
   def last_entry(opt = {})
+    opt[:tag_bool] ||= 'AND'
     opt[:section] ||= @current_section
 
     sec_arr = []
@@ -682,6 +748,12 @@ class WWID
       all_items.concat(@content[section]['items'].dup) if @content.key?(section)
     end
 
+    if opt[:tag] && opt[:tag].length.positive?
+      all_items.select! { |item| item.has_tags?(opt[:tag], opt[:tag_bool]) }
+    elsif opt[:search]&.length
+      all_items.select! { |item| item.matches_search?(opt[:search]) }
+    end
+
     all_items.max_by { |item| item['date'] }
   end
 
@@ -735,41 +807,10 @@ class WWID
         items.map! do |item|
           break if index == count
 
-          tag_match = if opt[:tag].length.positive?
-                        case opt[:tag_bool]
-                        when 'AND'
-                          result = true
-                          opt[:tag].each do |tag|
-                            unless item['title'] =~ /@#{tag}/
-                              result = false
-                              break
-                            end
-                          end
-                          result
-                        when 'NOT'
-                          result = true
-                          opt[:tag].each do |tag|
-                            if item['title'] =~ /@#{tag}/
-                              result = false
-                              break
-                            end
-                          end
-                          result
-                        else
-                          result = false
-                          opt[:tag].each do |tag|
-                            if item['title'] =~ /@#{tag}/
-                              result = true
-                              break
-                            end
-                          end
-                          result
-                        end
-                      else
-                        true
-                      end
-
-          if tag_match
+          tag_match = opt[:tag].nil? || opt[:tag].empty? ? true : item.has_tags?(opt[:tag], opt[:tag_bool])
+          search_match = opt[:search].nil? || opt[:search].empty? ? true : item.matches_search?(opt[:search])
+
+          if tag_match && search_match
             if opt[:autotag]
               new_title = autotag(item['title']) if @auto_tag
               if new_title == item['title']
@@ -783,17 +824,23 @@ class WWID
                 done_date = next_start - 1
                 next_start = item['date']
               elsif opt[:back]
-                done_date = item['date'] + (opt[:back] - item['date'])
+                if opt[:back].is_a? Integer
+                  done_date = item['date'] + opt[:back]
+                else
+                  done_date = item['date'] + (opt[:back] - item['date'])
+                end
               else
                 done_date = Time.now
               end
 
               title = item['title']
               opt[:tags].each do |tag|
-                tag.strip!
-                if opt[:remove] && title =~ /@#{tag}\b/
-                  title.gsub!(/(^| )@#{tag}(\([^)]*\))?/, '')
-                  @results.push(%(Removed @#{tag}: "#{title}" in #{section}))
+                tag = tag.strip
+                if opt[:remove]
+                  if title =~ /@#{tag}\b/
+                    title.gsub!(/(^| )@#{tag}(\([^)]*\))?/, '')
+                    @results.push(%(Removed @#{tag}: "#{title}" in #{section}))
+                  end
                 elsif title !~ /@#{tag}/
                   title.chomp!
                   title += if opt[:date]
@@ -839,6 +886,75 @@ class WWID
     write(@doing_file)
   end
 
+  ##
+  ## @brief      Edit the last entry
+  ##
+  ## @param      section  (String) The section, default "All"
+  ##
+  def edit_last(section: 'All', options: {})
+    section = guess_section(section)
+
+    if section =~ /^all$/i
+      items = []
+      @content.each do |_k, v|
+        items.concat(v['items'])
+      end
+      # section = combined['items'].dup.sort_by { |item| item['date'] }.reverse[0]['section']
+    else
+      items = @content[section]['items']
+    end
+
+    items = items.sort_by { |item| item['date'] }.reverse
+
+    idx = nil
+
+    if options[:tag] && !options[:tag].empty?
+      items.each_with_index do |item, i|
+        if item.has_tags?(options[:tag], options[:tag_bool])
+          idx = i
+          break
+        end
+      end
+    elsif options[:search]
+      items.each_with_index do |item, i|
+        if item.matches_search?(options[:search])
+          idx = i
+          break
+        end
+      end
+    else
+      idx = 0
+    end
+
+    if idx.nil?
+      @results.push('No entries found')
+      return
+    end
+
+    section = items[idx]['section']
+
+    section_items = @content[section]['items']
+    s_idx = section_items.index(items[idx])
+
+    current_item = section_items[s_idx]['title']
+    old_note = section_items[s_idx]['note'] ? section_items[s_idx]['note'].map(&:strip).join("\n") : nil
+    current_item += "\n#{old_note}" unless old_note.nil?
+    new_item = fork_editor(current_item)
+    title, note = format_input(new_item)
+
+    if title.nil? || title.empty?
+      @results.push('No content provided')
+    elsif title == section_items[s_idx]['title'] && note == old_note
+      @results.push('No change in content')
+    else
+      section_items[s_idx]['title'] = title
+      section_items[s_idx]['note'] = note
+      @results.push("Entry edited: #{section_items[s_idx]['title']}")
+      @content[section]['items'] = section_items
+      write(@doing_file)
+    end
+  end
+
   ##
   ## @brief      Add a note to the last entry in a section
   ##
@@ -934,7 +1050,7 @@ class WWID
 
     if opt[:new_item]
       title, note = format_input(opt[:new_item])
-      note.push(opt[:note].gsub(/ *$/, '')) if opt[:note]
+      note.push(opt[:note].map(&:chomp)) if opt[:note]
       title += " @#{tag}"
       add_item(title.cap_first, opt[:section], { note: note.join(' ').rstrip, back: opt[:back] })
     end
@@ -1092,10 +1208,7 @@ class WWID
       end
     end
 
-    if opt[:section].class != Hash
-      warn 'Invalid section object'
-      return
-    end
+    raise 'Invalid section object' unless opt[:section].instance_of? Hash
 
     items = opt[:section]['items'].sort_by { |item| item['date'] }
 
@@ -1113,19 +1226,23 @@ class WWID
 
     if opt[:tag_filter] && !opt[:tag_filter]['tags'].empty?
       items.delete_if do |item|
-        if opt[:tag_filter]['bool'] =~ /(AND|ALL)/
-          score = 0
+        case opt[:tag_filter]['bool']
+        when /(AND|ALL)/
+          del = false
           opt[:tag_filter]['tags'].each do |tag|
-            score += 1 if item['title'] =~ /@#{tag}/
+            unless item['title'] =~ /@#{tag}/
+              del = true
+              break
+            end
           end
-          score < opt[:tag_filter]['tags'].length
-        elsif opt[:tag_filter]['bool'] =~ /NONE/
+          del
+        when /NONE/
           del = false
           opt[:tag_filter]['tags'].each do |tag|
             del = true if item['title'] =~ /@#{tag}/
           end
           del
-        elsif opt[:tag_filter]['bool'] =~ /(OR|ANY)/
+        when /(OR|ANY)/
           del = true
           opt[:tag_filter]['tags'].each do |tag|
             del = false if item['title'] =~ /@#{tag}/
@@ -1136,15 +1253,7 @@ class WWID
     end
 
     if opt[:search]
-      items.keep_if do |item|
-        text = item['note'] ? item['title'] + item['note'].join(' ') : item['title']
-        pattern = if opt[:search].strip =~ %r{^/.*?/$}
-                    opt[:search].sub(%r{/(.*?)/}, '\1')
-                  else
-                    opt[:search].split('').join('.{0,3}')
-                  end
-        text =~ /#{pattern}/i
-      end
+      items.keep_if {|item| item.matches_search?(opt[:search]) }
     end
 
     if opt[:only_timed]
@@ -1173,9 +1282,10 @@ class WWID
 
     out = ''
 
-    raise 'Unknown output format' if opt[:output] && !(opt[:output] =~ /(template|html|csv|json|timeline)/)
+    raise 'Unknown output format' if opt[:output] && (opt[:output] !~ /^(template|html|csv|json|timeline)$/i)
 
-    if opt[:output] == 'csv'
+    case opt[:output]
+    when /^csv$/i
       output = [CSV.generate_line(%w[date title note timer section])]
       items.each do |i|
         note = ''
@@ -1188,7 +1298,7 @@ class WWID
         output.push(CSV.generate_line([i['date'], i['title'], note, interval, i['section']]))
       end
       out = output.join('')
-    elsif opt[:output] == 'json' || opt[:output] == 'timeline'
+    when /^(json|timeline)/i
       items_out = []
       max = items[-1]['date'].strftime('%F')
       min = items[0]['date'].strftime('%F')
@@ -1284,7 +1394,7 @@ class WWID
         EOTEMPLATE
         return template
       end
-    elsif opt[:output] == 'html'
+    when /^html$/i
       page_title = section
       items_out = []
       items.each do |i|
@@ -1398,7 +1508,7 @@ class WWID
                        else
                          colors['default']
                        end
-          output.gsub!(/\s(@[^ (]+)/, " #{colors[opt[:tags_color]]}\\1#{last_color}")
+          output.gsub!(/(\s|m)(@[^ (]+)/, "\\1#{colors[opt[:tags_color]]}\\2#{last_color}")
         end
         output.sub!(/%note/, note)
         output.sub!(/%odnote/, note.gsub(/^\t*/, ''))
@@ -1413,7 +1523,7 @@ class WWID
         output.gsub!(/%n/, "\n")
         output.gsub!(/%t/, "\t")
 
-        out += output + "\n"
+        out += "#{output}\n"
       end
       out += tag_times('text', opt[:sort_tags]) if opt[:totals]
     end
@@ -1474,7 +1584,8 @@ class WWID
 
     if tags && !tags.empty?
       items.delete_if do |item|
-        if bool =~ /(AND|ALL)/
+        case bool
+        when /(AND|ALL)/i
           score = 0
           tags.each do |tag|
             score += 1 if item['title'] =~ /@#{tag}/i
@@ -1482,14 +1593,14 @@ class WWID
           res = score < tags.length
           moved_items.push(item) if res
           res
-        elsif bool =~ /NONE/
+        when /NONE/i
           del = false
           tags.each do |tag|
             del = true if item['title'] =~ /@#{tag}/i
           end
           moved_items.push(item) if del
           del
-        elsif bool =~ /(OR|ANY)/
+        when /(OR|ANY)/i
           del = true
           tags.each do |tag|
             del = false if item['title'] =~ /@#{tag}/i
@@ -1499,7 +1610,7 @@ class WWID
         end
       end
       moved_items.each do |item|
-        if label && !(section == 'Currently')
+        if label && section != 'Currently'
           item['title'] =
             item['title'].sub(/(?:@from\(.*?\))?(.*)$/, "\\1 @from(#{section})")
         end
@@ -1508,23 +1619,27 @@ class WWID
       @content[destination]['items'] += items
       @results.push("Archived #{items.length} items from #{section} to #{destination}")
     else
+      count = items.length if items.length < count
 
-      return if items.length < count
-
-      @content[section]['items'] = if count == 0
+      @content[section]['items'] = if count.zero?
                                      []
                                    else
                                      items[0..count - 1]
                                    end
 
-      items.each do |item|
-        if label && !(section == 'Currently')
+      items.map! do |item|
+        if label && section != 'Currently'
           item['title'] =
             item['title'].sub(/(?:@from\(.*?\))?(.*)$/, "\\1 @from(#{section})")
         end
+        item
+      end
+      if items.count > count
+        @content[destination]['items'].concat(items[count..-1])
+      else
+        @content[destination]['items'].concat(items)
       end
 
-      @content[destination]['items'] += items[count..-1]
       @results.push("Archived #{items.length - count} items from #{section} to #{destination}")
     end
   end
@@ -1645,8 +1760,11 @@ class WWID
     cfg = @config['templates']['recent']
     section ||= @current_section
     section = guess_section(section)
+
     list_section({ section: section, wrap_width: cfg['wrap_width'], count: count,
-                   format: cfg['date_format'], template: cfg['template'], order: 'asc', times: times, totals: opt[:totals], sort_tags: opt[:sort_tags] })
+                   format: cfg['date_format'], template: cfg['template'],
+                   order: 'asc', times: times, totals: opt[:totals],
+                   sort_tags: opt[:sort_tags], tags_color: opt[:tags_color] })
   end
 
   ##
@@ -1655,12 +1773,29 @@ class WWID
   ## @param      times    (Bool) Show times
   ## @param      section  (String) Section to pull from, default Currently
   ##
-  def last(times = true, section = nil)
-    section ||= @current_section
-    section = guess_section(section)
+  def last(times: true, section: nil, options: {})
+    section = section.nil? || section =~ /all/i ? 'All' : guess_section(section)
     cfg = @config['templates']['last']
-    list_section({ section: section, wrap_width: cfg['wrap_width'], count: 1, format: cfg['date_format'],
-                   template: cfg['template'], times: times })
+
+    opts = {
+      section: section,
+      wrap_width: cfg['wrap_width'],
+      count: 1,
+      format: cfg['date_format'],
+      template: cfg['template'],
+      times: times
+    }
+
+    if options[:tag]
+      opts[:tag_filter] = {
+        'tags' => options[:tag],
+        'bool' => options[:tag_bool]
+      }
+    end
+
+    opts[:search] = options[:search] if options[:search]
+
+    list_section(opts)
   end
 
   ##