doing 2.1.24 → 2.1.28

data/lib/doing/wwid.rb

@@ -338,6 +338,7 @@ module Doing
     ## @option opt :note [Array] item note (will be converted if value is String)
     ## @option opt :back [Date] backdate
     ## @option opt :timed [Boolean] new item is timed entry, marks previous entry as @done
+    ## @option opt :done [Date] If set, adds a @done tag to new entry
     ##
     def add_item(title, section = nil, opt)
       opt ||= {}
@@ -360,9 +361,18 @@ module Doing
 
       title.compress!
       entry = Item.new(opt[:back], title.strip, section)
+
+      if opt[:done] && entry.should_finish?
+        if entry.should_time?
+          entry.tag('done', value: opt[:done])
+        else
+          entry.tag('done')
+        end
+      end
+
       entry.note = note
 
-      items = @content.dup
+      items = @content.clone
       if opt[:timed]
         items.reverse!
         items.each_with_index do |i, x|
@@ -380,7 +390,8 @@ module Doing
       # logger.count(:added, level: :debug)
       logger.info('New entry:', %(added "#{entry.date.relative_date}: #{entry.title}" to #{section}))
 
-      Hooks.trigger :post_entry_added, self, entry.dup
+      Hooks.trigger :post_entry_added, self, entry
+      entry
     end
 
     ##
@@ -474,6 +485,7 @@ module Doing
     #
     def repeat_item(item, opt)
       opt ||= {}
+      old_item = item.clone
       if item.should_finish?
         if item.should_time?
           finish_date = verify_duration(item.date, Time.now, title: item.title)
@@ -481,7 +493,7 @@ module Doing
         else
           item.title.tag!('done')
         end
-        Hooks.trigger :post_entry_updated, self, item
+        Hooks.trigger :post_entry_updated, self, item, old_item
       end
 
       # Remove @done tag
@@ -647,11 +659,12 @@ module Doing
     ## @option opt [Array] :val (nil) Array of tag value queries
     ##
     def filter_items(items = Items.new, opt: {})
+      logger.benchmark(:filter_items, :start)
       time_rx = /^(\d{1,2}+(:\d{1,2}+)?( *(am|pm))?|midnight|noon)$/
 
       if items.nil? || items.empty?
         section = opt[:section] ? guess_section(opt[:section]) : 'All'
-        items = section =~ /^all$/i ? @content.dup : @content.in_section(section)
+        items = section =~ /^all$/i ? @content.clone : @content.in_section(section)
       end
 
       opt[:time_filter] = [nil, nil]
@@ -798,6 +811,8 @@ module Doing
         output.concat(filtered_items.reverse.slice(0, count))
       end
 
+      logger.benchmark(:filter_items, :finish)
+
       output
     end
 
@@ -847,7 +862,7 @@ module Doing
           note.map!(&:strip)
           note.delete_if(&:ignore?)
           item = items[i]
-          old_item = item.dup
+          old_item = item.clone
           item.date = date || items[i].date
           item.title = title
           item.note = note
@@ -855,7 +870,7 @@ module Doing
             Doing.logger.count(:skipped, level: :debug)
           else
             Doing.logger.count(:updated)
-            Hooks.trigger :post_entry_updated, self, item
+            Hooks.trigger :post_entry_updated, self, item, old_item
           end
         end
       end
@@ -1045,9 +1060,10 @@ module Doing
                 else
                   opt[:resume]
                 end
+          old_item = item.clone
           new_entry = reset_item(item, date: date, resume: res)
           @content.update_item(item, new_entry)
-          Hooks.trigger :post_entry_updated, self, new_entry
+          Hooks.trigger :post_entry_updated, self, new_entry, old_item
         end
         write(@doing_file)
 
@@ -1062,8 +1078,9 @@ module Doing
       if opt[:flag]
         tag = @config['marker_tag'] || 'flagged'
         items.map! do |i|
+          old_item = i.clone
           i.tag(tag, date: false, remove: opt[:remove], single: single)
-          Hooks.trigger :post_entry_updated, self, i
+          Hooks.trigger :post_entry_updated, self, i, old_item
         end
       end
 
@@ -1071,9 +1088,10 @@ module Doing
         tag = 'done'
         items.map! do |i|
           if i.should_finish?
+            old_item = i.clone
             should_date = !opt[:cancel] && i.should_time?
             i.tag(tag, date: should_date, remove: opt[:remove], single: single)
-            Hooks.trigger :post_entry_updated, self, i
+            Hooks.trigger :post_entry_updated, self, i, old_item
           end
         end
       end
@@ -1087,8 +1105,9 @@ module Doing
           else
             logger.count(:added_tags)
             logger.write(items.count == 1 ? :info : :debug, 'Tagged:', new_title)
+            old_item = i.clone
             i.title = new_title
-            Hooks.trigger :post_entry_updated, self, i
+            Hooks.trigger :post_entry_updated, self, i, old_item
           end
         end
       end
@@ -1096,17 +1115,19 @@ module Doing
       if opt[:tag]
         tag = opt[:tag]
         items.map! do |i|
+          old_item = i.clone
           i.tag(tag, date: false, remove: opt[:remove], single: single)
           i.expand_date_tags(@config['date_tags'])
-          Hooks.trigger :post_entry_updated, self, i
+          Hooks.trigger :post_entry_updated, self, i, old_item
         end
       end
 
       if opt[:archive] || opt[:move]
         section = opt[:archive] ? 'Archive' : guess_section(opt[:move])
         items.map! do |i|
+          old_item = i.clone
           i.move_to(section, label: true)
-          Hooks.trigger :post_entry_updated, self, i
+          Hooks.trigger :post_entry_updated, self, i, old_item
         end
       end
 
@@ -1193,6 +1214,7 @@ module Doing
       opt[:sequential] ||= false
       opt[:date] ||= false
       opt[:remove] ||= false
+      opt[:update] ||= false
       opt[:autotag] ||= false
       opt[:back] ||= false
       opt[:unfinished] ||= false
@@ -1228,6 +1250,7 @@ module Doing
       end
 
       items.each do |item|
+        old_item = item.clone
         added = []
         removed = []
 
@@ -1304,7 +1327,7 @@ module Doing
             else
               old_title = item.title.dup
               should_date = opt[:date] && item.should_time?
-              item.title.tag!('done', remove: true) if tag =~ /done/ && !should_date
+              item.title.tag!('done', remove: true) if tag =~ /done/ && (!should_date || opt[:update])
               item.title.tag!(tag, value: should_date ? done_date.strftime('%F %R') : nil)
               added << tag if old_title != item.title
             end
@@ -1322,7 +1345,7 @@ module Doing
         end
 
         item.expand_date_tags(@config['date_tags'])
-        Hooks.trigger :post_entry_updated, self, item
+        Hooks.trigger :post_entry_updated, self, item, old_item
       end
 
       write(@doing_file)
@@ -1361,6 +1384,7 @@ module Doing
         return
       end
 
+      old_item = item.clone
       content = ["#{item.date.strftime('%F %R')} | #{item.title.dup}"]
       content << item.note.strip_lines.join("\n") unless item.note.empty?
       new_item = fork_editor(content.join("\n"))
@@ -1376,7 +1400,7 @@ module Doing
         item.title = title
         item.note.add(note, replace: true)
         logger.info('Edited:', item.title)
-        Hooks.trigger :post_entry_updated, self, item.dup
+        Hooks.trigger :post_entry_updated, self, item, old_item
 
         write(@doing_file)
       end
@@ -1413,6 +1437,7 @@ module Doing
       found_items = 0
 
       @content.each_with_index do |item, i|
+        old_item = i.clone
         next unless item.section == opt[:section] || opt[:section] =~ /all/i
 
         next unless item.title =~ /@#{tag}/
@@ -1431,7 +1456,7 @@ module Doing
           logger.count(:completed)
           logger.info('Completed:', item.title)
         end
-        Hooks.trigger :post_entry_updated, self, item
+        Hooks.trigger :post_entry_updated, self, item, old_item
       end
 
 
@@ -1492,7 +1517,7 @@ module Doing
 
         unless ((!tags.empty? && !item.tags?(tags, bool)) || (opt[:search] && !item.search(opt[:search].to_s)) || (opt[:before] && item.date >= cutoff))
           new_item = @content.delete(item)
-          Hooks.trigger :post_entry_removed, self, item.dup
+          Hooks.trigger :post_entry_removed, self, item.clone
           raise DoingRuntimeError, "Error deleting item: #{item}" if new_item.nil?
 
           new_content.add_section(new_item.section, log: false)
@@ -1598,6 +1623,7 @@ module Doing
     ## @param      opt   [Hash] Additional Options
     ##
     def list_section(opt, items: Items.new)
+      logger.benchmark(:list_section, :start)
       opt[:config_template] ||= 'default'
 
       tpl_cfg = @config.dig('templates', opt[:config_template])
@@ -1611,7 +1637,7 @@ module Doing
       cfg.deep_merge({
                        'wrap_width' => @config['wrap_width'] || 0,
                        'date_format' => @config['default_date_format'],
-                       'order' => @config['order'] || 'asc',
+                       'order' => @config['order'] || :asc,
                        'tags_color' => @config['tags_color'],
                        'duration' => @config['duration'],
                        'interval_format' => @config['interval_format']
@@ -1623,8 +1649,8 @@ module Doing
       opt[:age] ||= :newest
       opt[:age] = opt[:age].normalize_age
       opt[:format] ||= cfg['date_format']
-      opt[:order] ||= cfg['order'] || 'asc'
-      opt[:tag_order] ||= 'asc'
+      opt[:order] ||= cfg['order'] || :asc
+      opt[:tag_order] ||= :asc
       opt[:tags_color] = cfg['tags_color'] || false if opt[:tags_color].nil?
       opt[:template] ||= cfg['template']
 
@@ -1650,7 +1676,7 @@ module Doing
 
       items = filter_items(items, opt: opt)
 
-      items.reverse! unless opt[:order] =~ /^d/i
+      items.reverse! unless opt[:order].normalize_order == :desc
 
       if opt[:delete]
         delete_items(items, force: opt[:force])
@@ -1673,6 +1699,7 @@ module Doing
       opt[:output] ||= 'template'
       opt[:wrap_width] ||= @config['templates']['default']['wrap_width'] || 0
 
+      logger.benchmark(:list_section, :finish)
       output(items, title, is_single, opt)
     end
 
@@ -1700,7 +1727,7 @@ module Doing
       destination = guess_section(destination)
 
       if @content.section?(destination) && (@content.section?(section) || archive_all)
-        do_archive(section, destination, { count: count, tags: tags, bool: bool, search: options[:search], label: options[:label], before: options[:before] })
+        do_archive(section, destination, { count: count, tags: tags, bool: bool, search: options[:search], label: options[:label], before: options[:before], after: options[:after], from: options[:from] })
         write(doing_file)
       else
         raise InvalidArgument, 'Either source or destination does not exist'
@@ -1722,7 +1749,7 @@ module Doing
       cfg = @config['templates'][opt[:config_template]].deep_merge(@config['templates']['default'], { extend_existing_arrays: true, sort_merged_arrays: true }).deep_merge({
         'wrap_width' => @config['wrap_width'] || 0,
         'date_format' => @config['default_date_format'],
-        'order' => @config['order'] || 'asc',
+        'order' => @config['order'] || :asc,
         'tags_color' => @config['tags_color'],
         'duration' => @config['duration'],
         'interval_format' => @config['interval_format']
@@ -1741,7 +1768,7 @@ module Doing
         from: opt[:from],
         format: cfg['date_format'],
         interval_format: opt[:interval_format],
-        order: cfg['order'] || 'asc',
+        order: cfg['order'] || :asc,
         output: output,
         section: opt[:section],
         sort_tags: opt[:sort_tags],
@@ -1776,7 +1803,7 @@ module Doing
       list_section({
                      section: section,
                      count: 0,
-                     order: 'asc',
+                     order: :asc,
                      date_filter: dates,
                      times: times,
                      output: output,
@@ -1842,7 +1869,7 @@ module Doing
       cfg = @config['templates'][opt[:config_template]].deep_merge(@config['templates']['default'], { extend_existing_arrays: true, sort_merged_arrays: true }).deep_merge({
         'wrap_width' => @config['wrap_width'] || 0,
         'date_format' => @config['default_date_format'],
-        'order' => @config['order'] || 'asc',
+        'order' => @config['order'] || :asc,
         'tags_color' => @config['tags_color'],
         'duration' => @config['duration'],
         'interval_format' => @config['interval_format']
@@ -1858,7 +1885,7 @@ module Doing
       opt[:count] = count
       opt[:format] = cfg['date_format']
       opt[:template] = opt[:template] || cfg['template']
-      opt[:order] = 'asc'
+      opt[:order] = :asc
       opt[:times] = times
 
       list_section(opt)
@@ -1875,7 +1902,7 @@ module Doing
       cfg = @config['templates'][options[:config_template]].deep_merge(@config['templates']['default'], { extend_existing_arrays: true, sort_merged_arrays: true }).deep_merge({
         'wrap_width' => @config['wrap_width'] || 0,
         'date_format' => @config['default_date_format'],
-        'order' => @config['order'] || 'asc',
+        'order' => @config['order'] || :asc,
         'tags_color' => @config['tags_color'],
         'duration' => @config['duration'],
         'interval_format' => @config['interval_format']
@@ -2022,10 +2049,10 @@ module Doing
     ##
     ## @param      format        [String] return format (html,
     ##                           json, or text)
-    ## @param      sort_by_name  [Boolean] Sort by name if true, otherwise by time
-    ## @param      sort_order    [String] The sort order (asc or desc)
+    ## @param      sort_by       [Symbol] Sort by :name or :time
+    ## @param      sort_order    [Symbol] The sort order (:asc or :desc)
     ##
-    def tag_times(format: :text, sort_by_name: false, sort_order: 'asc')
+    def tag_times(format: :text, sort_by: :time, sort_order: :asc)
       return '' if @timers.empty?
 
       max = @timers.keys.sort_by { |k| k.length }.reverse[0].length + 1
@@ -2033,13 +2060,13 @@ module Doing
       total = @timers.delete('All')
 
       tags_data = @timers.delete_if { |_k, v| v == 0 }
-      sorted_tags_data = if sort_by_name
+      sorted_tags_data = if sort_by.normalize_tag_sort == :name
                            tags_data.sort_by { |k, _v| k }
                          else
                            tags_data.sort_by { |_k, v| v }
                          end
 
-      sorted_tags_data.reverse! if sort_order =~ /^asc/i
+      sorted_tags_data.reverse! if sort_order.normalize_order == :asc
       case format
       when :html
 
@@ -2189,9 +2216,9 @@ EOS
         Doing.config_with(ENV['DOING_CONFIG'], { ignore_local: true })
       end
 
-      Doing.logger.benchmark(:configure, :start)
+      logger.benchmark(:configure, :start)
       config = Doing.config
-      Doing.logger.benchmark(:configure, :finish)
+      logger.benchmark(:configure, :finish)
 
       config.settings['backup_dir'] = ENV['DOING_BACKUP_DIR'] if ENV['DOING_BACKUP_DIR']
       @config = config.settings
@@ -2202,7 +2229,7 @@ EOS
 
       filename ||= @config['doing_file']
       init_doing_file(filename)
-      current_content = @content.dup
+      current_content = @content.clone
       backup_file = Util::Backup.last_backup(filename, count: 1)
       raise DoingRuntimeError, 'No undo history to diff' if backup_file.nil?
 
@@ -2245,6 +2272,7 @@ EOS
     ##             template trigger
     ##
     def output(items, title, is_single, opt)
+      logger.benchmark(:output, :start)
       opt ||= {}
       out = nil
 
@@ -2262,7 +2290,7 @@ EOS
       end
 
       logger.debug('Output:', "#{items.count} #{items.count == 1 ? 'item' : 'items'} shown")
-
+      logger.benchmark(:output, :finish)
       out
     end
 
@@ -2306,25 +2334,37 @@ EOS
       section_items = @content.in_section(section)
       max = section_items.count - count.to_i
 
+      opt[:after] = opt[:from][0] if opt[:from]
+      opt[:before] = opt[:from][1] if opt[:from]
+
+      time_rx = /^(\d{1,2}+(:\d{1,2}+)?( *(am|pm))?|midnight|noon)$/
+
+      if opt[:before].is_a?(String) && opt[:before] =~ time_rx
+        opt[:before] = opt[:before].chronify(guess: :end, future: false)
+      end
+
+      if opt[:after].is_a?(String) && opt[:after] =~ time_rx
+        opt[:after] = opt[:after].chronify(guess: :begin, future: false)
+      end
+
       counter = 0
 
       @content.map do |item|
         break if counter >= max
-        if opt[:before]
-          time_string = opt[:before]
-          cutoff = time_string.chronify(guess: :begin)
-        end
 
-        if (item.section.downcase != section.downcase && section != /^all$/i) || item.section.downcase == destination.downcase
-          item
-        elsif ((!tags.empty? && !item.tags?(tags, bool)) || (opt[:search] && !item.search(opt[:search].to_s)) || (opt[:before] && item.date >= cutoff))
-          item
-        else
-          counter += 1
-          item.move_to(destination, label: label, log: false)
-          Hooks.trigger :post_entry_updated, self, item.dup
-          item
-        end
+        next if item.section.downcase == destination.downcase
+
+        next if item.section.downcase != section.downcase && section != /^all$/i
+
+        next if (opt[:before] && item.date > opt[:before]) || (opt[:after] && item.date < opt[:after])
+
+        next if (!tags.empty? && !item.tags?(tags, bool)) || (opt[:search] && !item.search(opt[:search].to_s))
+
+        counter += 1
+        old_item = item.clone
+        item.move_to(destination, label: label, log: false)
+        Hooks.trigger :post_entry_updated, self, item, old_item
+        item
       end
 
       if counter.positive?

data/lib/doing.rb

@@ -28,10 +28,11 @@ require_relative 'doing/hash'
 require_relative 'doing/types'
 require_relative 'doing/colors'
 require_relative 'doing/template_string'
-require_relative 'doing/string'
+require_relative 'doing/string/string'
 require_relative 'doing/time'
-require_relative 'doing/array'
-require_relative 'doing/symbol'
+require_relative 'doing/array/array'
+require_relative 'doing/good'
+require_relative 'doing/normalize'
 require_relative 'doing/util'
 require_relative 'doing/util_backup'
 require_relative 'doing/configuration'
@@ -49,9 +50,7 @@ require_relative 'doing/pager'
 require_relative 'doing/completion'
 require_relative 'doing/boolean_term_parser'
 require_relative 'doing/phrase_parser'
-require_relative 'doing/array_chronify'
-require_relative 'doing/numeric_chronify'
-require_relative 'doing/string_chronify'
+require_relative 'doing/chronify/chronify'
 # require 'doing/markdown_document_listener'
 
 # Main doing module

data/lib/examples/commands/wiki.rb

@@ -36,8 +36,7 @@ command :wiki do |c|
   c.switch [:only_timed], default_value: false, negatable: false
 
   c.action do |global, options, args|
-    wwid = global[:wwid]
-    tags = wwid.tag_groups([], opt: options)
+    tags = @wwid.tag_groups([], opt: options)
 
     wiki = Doing::Plugins.plugins.dig(:export, 'wiki', :class)
 
@@ -46,7 +45,7 @@ command :wiki do |c|
 
       raise RuntimeError, 'Missing plugin "wiki"' unless wiki
 
-      out = wiki.render(wwid, items, variables: export_options)
+      out = wiki.render(@wwid, items, variables: export_options)
 
       if out
         FileUtils.mkdir_p('doing_wiki')
@@ -56,13 +55,13 @@ command :wiki do |c|
       end
     end
 
-    template = if wwid.config['export_templates']['wiki_index'] && File.exist?(File.expand_path(wwid.config['export_templates']['wiki_index']))
-                 IO.read(File.expand_path(wwid.config['export_templates']['wiki_index']))
+    template = if @settings['export_templates']['wiki_index'] && File.exist?(File.expand_path(@settings['export_templates']['wiki_index']))
+                 IO.read(File.expand_path(@settings['export_templates']['wiki_index']))
                else
                  wiki.template('wiki_index')
                end
-    style = if wwid.config['export_templates']['wiki_css'] && File.exist?(File.expand_path(wwid.config['export_templates']['wiki_css']))
-              IO.read(File.expand_path(wwid.config['export_templates']['wiki_css']))
+    style = if @settings['export_templates']['wiki_css'] && File.exist?(File.expand_path(@settings['export_templates']['wiki_css']))
+              IO.read(File.expand_path(@settings['export_templates']['wiki_css']))
             else
               wiki.template('wiki_css')
             end

data/lib/examples/plugins/wiki_export/wiki_export.rb

@@ -74,7 +74,7 @@ module Doing
                 self.template('wiki_css')
               end
 
-      totals = opt[:totals] ? wwid.tag_times(format: :html, sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order]) : ''
+      totals = opt[:totals] ? wwid.tag_times(format: :html, sort_by: opt[:sort_tags], sort_order: opt[:tag_order]) : ''
       engine = Haml::Engine.new(template)
       Doing.logger.debug('Wiki Export:', "#{items_out.count} items output to #{variables[:page_title]} wiki page")
       @out = engine.render(Object.new,