doing 1.0.90 → 2.0.2.pre

data/lib/doing/wwid.rb

@@ -1,2587 +1,2159 @@
 #!/usr/bin/ruby
+# frozen_string_literal: true
 
 require 'deep_merge'
 require 'open3'
 require 'pp'
 require 'shellwords'
+require 'erb'
+
+module Doing
+  ##
+  ## @brief      Main "What Was I Doing" methods
+  ##
+  class WWID
+    attr_reader   :additional_configs, :current_section, :doing_file, :content
+
+    attr_accessor :config, :config_file, :auto_tag, :default_option
+
+    # include Util
+
+    ##
+    ## @brief      Initializes the object.
+    ##
+    def initialize
+      @timers = {}
+      @recorded_items = []
+      @content = {}
+      @doingrc_needs_update = false
+      @default_config_file = '.doingrc'
+      @auto_tag = true
+      @user_home = Util.user_home
+    end
+
+    ##
+    ## @brief      Logger
+    ##
+    ## Responds to :debug, :info, :warn, and :error
+    ##
+    ## Each method takes a topic, and a message or block
+    ##
+    ## Example: debug('Hooks', 'Hook 1 triggered')
+    ##
+    def logger
+      @logger ||= Doing.logger
+    end
+
+    ##
+    ## @brief      Initializes the doing file.
+    ##
+    ## @param      path  (String) Override path to a doing file, optional
+    ##
+    def init_doing_file(path = nil)
+      @doing_file =  File.expand_path(@config['doing_file'])
+
+      if path.nil?
+        create(@doing_file) unless File.exist?(@doing_file)
+        input = IO.read(@doing_file)
+        input = input.force_encoding('utf-8') if input.respond_to? :force_encoding
+      elsif File.exist?(File.expand_path(path)) && File.file?(File.expand_path(path)) && File.stat(File.expand_path(path)).size.positive?
+        @doing_file = File.expand_path(path)
+        input = IO.read(File.expand_path(path))
+        input = input.force_encoding('utf-8') if input.respond_to? :force_encoding
+      elsif path.length < 256
+        @doing_file = File.expand_path(path)
+        create(path)
+        input = IO.read(File.expand_path(path))
+        input = input.force_encoding('utf-8') if input.respond_to? :force_encoding
+      end
 
-##
-## @brief      Main "What Was I Doing" methods
-##
-class WWID
-  attr_accessor :content, :sections, :current_section, :doing_file, :config, :user_home, :default_config_file,
-                :config_file, :results, :auto_tag
-
-  ##
-  ## @brief      Initializes the object.
-  ##
-  def initialize
-    @content = {}
-    @doingrc_needs_update = false
-    @default_config_file = '.doingrc'
-    @interval_cache = {}
-    @results = []
-    @auto_tag = true
-  end
-
-  ##
-  ## @brief      Finds a project-specific configuration file
-  ##
-  ## @return     (String) A file path
-  ##
-  def find_local_config
-    config = {}
-    dir = Dir.pwd
+      @other_content_top = []
+      @other_content_bottom = []
+
+      section = 'Uncategorized'
+      lines = input.split(/[\n\r]/)
+      current = 0
+
+      lines.each do |line|
+        next if line =~ /^\s*$/
+
+        if line =~ /^(\S[\S ]+):\s*(@\S+\s*)*$/
+          section = Regexp.last_match(1)
+          @content[section] = {}
+          @content[section][:original] = line
+          @content[section][:items] = []
+          current = 0
+        elsif line =~ /^\s*- (\d{4}-\d\d-\d\d \d\d:\d\d) \| (.*)/
+          date = Regexp.last_match(1).strip
+          title = Regexp.last_match(2).strip
+          item = Item.new(date, title, section)
+          @content[section][:items].push(item)
+          current += 1
+        elsif current.zero?
+          # if content[section][:items].length - 1 == current
+          @other_content_top.push(line)
+        elsif line =~ /^\S/
+          @other_content_bottom.push(line)
+        else
+          prev_item = @content[section][:items][current - 1]
+          prev_item.note = Note.new unless prev_item.note
 
-    local_config_files = []
+          prev_item.note.add(line)
+          # end
+        end
+      end
+      Hooks.trigger :post_read, self
+    end
 
-    while dir != '/' && (dir =~ %r{[A-Z]:/}).nil?
-      local_config_files.push(File.join(dir, @default_config_file)) if File.exist? File.join(dir, @default_config_file)
+    ##
+    ## @brief      Create a new doing file
+    ##
+    def create(filename = nil)
+      filename = @doing_file if filename.nil?
+      return if File.exist?(filename) && File.stat(filename).size.positive?
 
-      dir = File.dirname(dir)
+      File.open(filename, 'w+') do |f|
+        f.puts "#{@config['current_section']}:"
+      end
     end
 
-    local_config_files
-  end
+    ##
+    ## @brief      Create a process for an editor and wait for the file handle to return
+    ##
+    ## @param      input  (String) Text input for editor
+    ##
+    def fork_editor(input = '')
+      # raise Errors::NonInteractive, 'Non-interactive terminal' unless $stdout.isatty || ENV['DOING_EDITOR_TEST']
 
-  ##
-  ## @brief      Reads a configuration.
-  ##
-  def read_config(opt = {})
-    @config_file ||= if Dir.respond_to?('home')
-                       File.join(Dir.home, @default_config_file)
-                     else
-                       File.join(File.expand_path('~'), @default_config_file)
-                     end
-
-    additional_configs = if opt[:ignore_local]
-                           []
-                         else
-                           find_local_config
-                         end
+      raise Errors::MissingEditor, 'No EDITOR variable defined in environment' if Util.default_editor.nil?
 
-    begin
-      @local_config = {}
+      tmpfile = Tempfile.new(['doing', '.md'])
 
-      @config = YAML.load_file(@config_file) || {} if File.exist?(@config_file)
-      additional_configs.each do |cfg|
-        new_config = YAML.load_file(cfg) || {} if cfg
-        @local_config = @local_config.deep_merge(new_config)
+      File.open(tmpfile.path, 'w+') do |f|
+        f.puts input
+        f.puts "\n# The first line is the entry title, any lines after that are added as a note"
       end
 
-      # @config.deep_merge(@local_config)
-    rescue StandardError
-      @config = {}
-      @local_config = {}
-      # exit_now! "error reading config"
-    end
-  end
-
-  ##
-  ## @brief      Read user configuration and merge with defaults
-  ##
-  ## @param      opt   (Hash) Additional Options
-  ##
-  def configure(opt = {})
-    @timers = {}
-    @recorded_items = []
-    opt[:ignore_local] ||= false
-
-    @config_file ||= File.join(@user_home, @default_config_file)
-
-    read_config({ ignore_local: opt[:ignore_local] })
-
-    @config = {} if @config.nil?
-
-    @config['autotag'] ||= {}
-    @config['autotag']['whitelist'] ||= []
-    @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'] ||= {}
-    @config['html_template']['haml'] ||= nil
-    @config['html_template']['css'] ||= nil
-
-    @config['templates'] ||= {}
-    @config['templates']['default'] ||= {
-      'date_format' => '%Y-%m-%d %H:%M',
-      'template' => '%date | %title%note',
-      'wrap_width' => 0
-    }
-    @config['templates']['today'] ||= {
-      'date_format' => '%_I:%M%P',
-      'template' => '%date: %title %interval%note',
-      'wrap_width' => 0
-    }
-    @config['templates']['last'] ||= {
-      'date_format' => '%-I:%M%P on %a',
-      'template' => '%title (at %date)%odnote',
-      'wrap_width' => 88
-    }
-    @config['templates']['recent'] ||= {
-      'date_format' => '%_I:%M%P',
-      'template' => '%shortdate: %title (%section)',
-      'wrap_width' => 88,
-      'count' => 10
-    }
-    @config['views'] ||= {
-      'done' => {
-        'date_format' => '%_I:%M%P',
-        'template' => '%date | %title%note',
-        'wrap_width' => 0,
-        'section' => 'All',
-        'count' => 0,
-        'order' => 'desc',
-        'tags' => 'done complete cancelled',
-        'tags_bool' => 'OR'
-      },
-      'color' => {
-        'date_format' => '%F %_I:%M%P',
-        'template' => '%boldblack%date %boldgreen| %boldwhite%title%default%note',
-        'wrap_width' => 0,
-        'section' => 'Currently',
-        'count' => 10,
-        'order' => 'asc'
-      }
-    }
-    @config['marker_tag'] ||= 'flagged'
-    @config['marker_color'] ||= 'red'
-    @config['default_tags'] ||= []
-    @config['tag_sort'] ||= 'time'
-
-    @current_section = config['current_section']
-    @default_template = config['templates']['default']['template']
-    @default_date_format = config['templates']['default']['date_format']
-
-    @config[:include_notes] ||= true
+      pid = Process.fork { system("#{Util.editor_with_args} #{tmpfile.path}") }
 
-    # if ENV['DOING_DEBUG'].to_i == 3
-    #   if @config['default_tags'].length > 0
-    #     exit_now! "DEFAULT CONFIG CHANGED"
-    #   end
-    # end
+      trap('INT') do
+        begin
+          Process.kill(9, pid)
+        rescue StandardError
+          Errno::ESRCH
+        end
+        tmpfile.unlink
+        tmpfile.close!
+        exit 0
+      end
 
-    File.open(@config_file, 'w') { |yf| YAML.dump(@config, yf) } unless File.exist?(@config_file)
+      Process.wait(pid)
 
-    @config = @local_config.deep_merge(@config)
+      begin
+        if $?.exitstatus == 0
+          input = IO.read(tmpfile.path)
+        else
+          exit_now! 'Cancelled'
+        end
+      ensure
+        tmpfile.close
+        tmpfile.unlink
+      end
 
-    @current_section = @config['current_section']
-    @default_template = @config['templates']['default']['template']
-    @default_date_format = @config['templates']['default']['date_format']
-  end
+      input.split(/\n/).delete_if(&:ignore?).join("\n")
+    end
+
+    ##
+    ## @brief      Takes a multi-line string and formats it as an entry
+    ##
+    ## @return     (Array) [(String)title, (Array)note]
+    ##
+    ## @param      input  (String) The string to parse
+    ##
+    ## @return     (Array) [(String)title, (Note)note]
+    ##
+    def format_input(input)
+      raise Errors::EmptyInput, 'No content in entry' if input.nil? || input.strip.empty?
+
+      input_lines = input.split(/[\n\r]+/).delete_if(&:ignore?)
+      title = input_lines[0]&.strip
+      raise Errors::EmptyInput, 'No content in first line' if title.nil? || title.strip.empty?
+
+      note = Note.new
+      note.add(input_lines[1..-1]) if input_lines.length > 1
+      # If title line ends in a parenthetical, use that as the note
+      if note.empty? && title =~ /\s+\(.*?\)$/
+        title.sub!(/\s+\((.*?)\)$/) do
+          m = Regexp.last_match
+          note.add(m[1])
+          ''
+        end
+      end
 
-  ##
-  ## @brief      Initializes the doing file.
-  ##
-  ## @param      path  (String) Override path to a doing file, optional
-  ##
-  def init_doing_file(path = nil)
-    @doing_file = File.expand_path(@config['doing_file'])
-
-    input = path
-
-    if input.nil?
-      create(@doing_file) unless File.exist?(@doing_file)
-      input = IO.read(@doing_file)
-      input = input.force_encoding('utf-8') if input.respond_to? :force_encoding
-    elsif File.exist?(File.expand_path(input)) && File.file?(File.expand_path(input)) && File.stat(File.expand_path(input)).size.positive?
-      @doing_file = File.expand_path(input)
-      input = IO.read(File.expand_path(input))
-      input = input.force_encoding('utf-8') if input.respond_to? :force_encoding
-    elsif input.length < 256
-      @doing_file = File.expand_path(input)
-      create(input)
-      input = IO.read(File.expand_path(input))
-      input = input.force_encoding('utf-8') if input.respond_to? :force_encoding
-    end
+      note.strip_lines!
+      note.compress
+
+      [title, note]
+    end
+
+    ##
+    ## @brief      Converts input string into a Time object when input takes on the
+    ##             following formats:
+    ##             - interval format e.g. '1d2h30m', '45m' etc.
+    ##             - a semantic phrase e.g. 'yesterday 5:30pm'
+    ##             - a strftime e.g. '2016-03-15 15:32:04 PDT'
+    ##
+    ## @param      input  (String) String to chronify
+    ##
+    ## @return     (DateTime) result
+    ##
+    def chronify(input, future: false, guess: :begin)
+      now = Time.now
+      raise Errors::InvalidTimeExpression, "Invalid time expression #{input.inspect}" if input.to_s.strip == ''
+
+      secs_ago = if input.match(/^(\d+)$/)
+                   # plain number, assume minutes
+                   Regexp.last_match(1).to_i * 60
+                 elsif (m = input.match(/^(?:(?<day>\d+)d)?(?:(?<hour>\d+)h)?(?:(?<min>\d+)m)?$/i))
+                   # day/hour/minute format e.g. 1d2h30m
+                   [[m['day'], 24 * 3600],
+                    [m['hour'], 3600],
+                    [m['min'], 60]].map { |qty, secs| qty ? (qty.to_i * secs) : 0 }.reduce(0, :+)
+                 end
 
-    @other_content_top = []
-    @other_content_bottom = []
-
-    section = 'Uncategorized'
-    lines = input.split(/[\n\r]/)
-    current = 0
-
-    lines.each do |line|
-      next if line =~ /^\s*$/
-
-      if line =~ /^(\S[\S ]+):\s*(@\S+\s*)*$/
-        section = Regexp.last_match(1)
-        @content[section] = {}
-        @content[section]['original'] = line
-        @content[section]['items'] = []
-        current = 0
-      elsif line =~ /^\s*- (\d{4}-\d\d-\d\d \d\d:\d\d) \| (.*)/
-        date = Time.parse(Regexp.last_match(1))
-        title = Regexp.last_match(2)
-        @content[section]['items'].push({ 'title' => title, 'date' => date, 'section' => section })
-        current += 1
-      elsif current.zero?
-        # if content[section]['items'].length - 1 == current
-        @other_content_top.push(line)
-      elsif line =~ /^\S/
-        @other_content_bottom.push(line)
+      if secs_ago
+        now - secs_ago
       else
-        @content[section]['items'][current - 1]['note'] = [] unless @content[section]['items'][current - 1].key? 'note'
-
-        @content[section]['items'][current - 1]['note'].push(line.chomp)
-        # end
+        Chronic.parse(input, { guess: guess, context: future ? :future : :past, ambiguous_time_range: 8 })
       end
     end
-  end
 
-  ##
-  ## @brief      Return the contents of the HAML template for HTML output
-  ##
-  ## @return     (String) HAML template
-  ##
-  def haml_template
-    IO.read(File.join(File.dirname(__FILE__), '../templates/doing.haml'))
-  end
+    ##
+    ## @brief      Converts simple strings into seconds that can be added to a Time
+    ##             object
+    ##
+    ## @param      qty   (String) HH:MM or XX[dhm][[XXhm][XXm]] (1d2h30m, 45m,
+    ##                   1.5d, 1h20m, etc.)
+    ##
+    ## @return     (Integer) seconds
+    ##
+    def chronify_qty(qty)
+      minutes = 0
+      case qty.strip
+      when /^(\d+):(\d\d)$/
+        minutes += Regexp.last_match(1).to_i * 60
+        minutes += Regexp.last_match(2).to_i
+      when /^(\d+(?:\.\d+)?)([hmd])?$/
+        amt = Regexp.last_match(1)
+        type = Regexp.last_match(2).nil? ? 'm' : Regexp.last_match(2)
+
+        minutes = case type.downcase
+                  when 'm'
+                    amt.to_i
+                  when 'h'
+                    (amt.to_f * 60).round
+                  when 'd'
+                    (amt.to_f * 60 * 24).round
+                  else
+                    minutes
+                  end
+      end
+      minutes * 60
+    end
+
+    ##
+    ## @brief      List sections
+    ##
+    ## @return     (Array) section titles
+    ##
+    def sections
+      @content.keys
+    end
+
+    ##
+    ## @brief      Adds a section.
+    ##
+    ## @param      title  (String) The new section title
+    ##
+    def add_section(title)
+      if @content.key?(title.cap_first)
+        logger.debug('Skipped': 'Section already exists')
+        return
+      end
 
-  ##
-  ## @brief      Return the contents of the CSS template for HTML output
-  ##
-  ## @return     (String) CSS template
-  ##
-  def css_template
-    IO.read(File.join(File.dirname(__FILE__), '../templates/doing.css'))
-  end
+      @content[title.cap_first] = { :original => "#{title}:", :items => [] }
+      logger.info('New section:', %("#{title.cap_first}"))
+    end
 
-  ##
-  ## @brief      Create a new doing file
-  ##
-  def create(filename = nil)
-    filename = @doing_file if filename.nil?
-    return if File.exist?(filename) && File.stat(filename).size.positive?
+    ##
+    ## @brief      Attempt to match a string with an existing section
+    ##
+    ## @param      frag     (String) The user-provided string
+    ## @param      guessed  (Boolean) already guessed and failed
+    ##
+    def guess_section(frag, guessed: false, suggest: false)
+      return 'All' if frag =~ /^all$/i
+      frag ||= @config['current_section']
 
-    File.open(filename, 'w+') do |f|
-      f.puts "#{@current_section}:"
-    end
-  end
+      sections.each { |sect| return sect.cap_first if frag.downcase == sect.downcase }
+      section = false
+      re = frag.split('').join('.*?')
+      sections.each do |sect|
+        next unless sect =~ /#{re}/i
 
-  ##
-  ## @brief      Create a process for an editor and wait for the file handle to return
-  ##
-  ## @param      input  (String) Text input for editor
-  ##
-  def fork_editor(input = '')
-    tmpfile = Tempfile.new(['doing', '.md'])
+        logger.debug('Match:', %(Assuming "#{sect}" from "#{frag}"))
+        section = sect
+        break
+      end
 
-    File.open(tmpfile.path, 'w+') do |f|
-      f.puts input
-      f.puts "\n# The first line is the entry title, any lines after that are added as a note"
-    end
+      return section if suggest
 
-    pid = Process.fork { system("$EDITOR #{tmpfile.path}") }
+      unless section || guessed
+        alt = guess_view(frag, guessed: true, suggest: true)
+        if alt
+          meant_view = yn("Did you mean `doing view #{alt}`?", default_response: 'n')
+          raise Errors::InvalidSection, "Run again with `doing view #{alt}`" if meant_view
+        end
 
-    trap('INT') do
-      begin
-        Process.kill(9, pid)
-      rescue StandardError
-        Errno::ESRCH
-      end
-      tmpfile.unlink
-      tmpfile.close!
-      exit 0
-    end
+        res = yn("Section #{frag} not found, create it", default_response: 'n')
 
-    Process.wait(pid)
+        if res
+          add_section(frag.cap_first)
+          write(@doing_file)
+          return frag.cap_first
+        end
 
-    begin
-      if $?.exitstatus == 0
-        input = IO.read(tmpfile.path)
+        raise Errors::InvalidSection, "Unknown section: #{frag}"
+      end
+      section ? section.cap_first : guessed
+    end
+
+    ##
+    ## @brief      Ask a yes or no question in the terminal
+    ##
+    ## @param      question     (String) The question to ask
+    ## @param      default      (Bool)   default response if no input
+    ##
+    ## @return     (Bool) yes or no
+    ##
+    def yn(question, default_response: false)
+      if default_response.is_a?(String)
+        default = default_response =~ /y/i ? true : false
       else
-        exit_now! 'Cancelled'
+        default = default_response
       end
-    ensure
-      tmpfile.close
-      tmpfile.unlink
-    end
-
-    input.split(/\n/).delete_if {|line| line =~ /^#/ }.join("\n")
-  end
 
-  #
-  # @brief      Takes a multi-line string and formats it as an entry
-  #
-  # @return     (Array) [(String)title, (Array)note]
-  #
-  # @param      input  (String) The string to parse
-  #
-  def format_input(input)
-    exit_now! 'No content in entry' if input.nil? || input.strip.empty?
-
-    input_lines = input.split(/[\n\r]+/).delete_if {|line| line =~ /^#/ || line =~ /^\s*$/ }
-    title = input_lines[0]&.strip
-    exit_now! '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 =~ /\s+\(.*?\)$/
-      title.sub!(/\s+\((.*?)\)$/) do
-        m = Regexp.last_match
-        note.push(m[1])
-        ''
-      end
-    end
+      # if global --default is set, answer default
+      return default if @default_option
 
-    note.map!(&:strip)
-    note.delete_if { |line| line =~ /^\s*$/ || line =~ /^#/ }
+      # if this isn't an interactive shell, answer default
+      return default unless $stdout.isatty
 
-    [title, note]
-  end
+      # clear the buffer
+      if ARGV&.length
+        ARGV.length.times do
+          ARGV.shift
+        end
+      end
+      system 'stty cbreak'
 
-  #
-  # @brief      Converts input string into a Time object when input takes on the
-  #             following formats:
-  #             - interval format e.g. '1d2h30m', '45m' etc.
-  #             - a semantic phrase e.g. 'yesterday 5:30pm'
-  #             - a strftime e.g. '2016-03-15 15:32:04 PDT'
-  #
-  # @param      input  (String) String to chronify
-  #
-  # @return     (DateTime) result
-  #
-  def chronify(input)
-    now = Time.now
-    exit_now! "Invalid time expression #{input.inspect}" if input.to_s.strip == ''
-
-    secs_ago = if input.match(/^(\d+)$/)
-                 # plain number, assume minutes
-                 Regexp.last_match(1).to_i * 60
-               elsif (m = input.match(/^(?:(?<day>\d+)d)?(?:(?<hour>\d+)h)?(?:(?<min>\d+)m)?$/i))
-                 # day/hour/minute format e.g. 1d2h30m
-                 [[m['day'], 24 * 3600],
-                  [m['hour'], 3600],
-                  [m['min'], 60]].map { |qty, secs| qty ? (qty.to_i * secs) : 0 }.reduce(0, :+)
-               end
-
-    if secs_ago
-      now - secs_ago
-    else
-      Chronic.parse(input, { context: :past, ambiguous_time_range: 8 })
-    end
-  end
+      cw = Color.white
+      cbw = Color.boldwhite
+      cbg = Color.boldgreen
+      cd = Color.default
 
-  #
-  # @brief      Converts simple strings into seconds that can be added to a Time
-  #             object
-  #
-  # @param      qty   (String) HH:MM or XX[dhm][[XXhm][XXm]] (1d2h30m, 45m,
-  #                   1.5d, 1h20m, etc.)
-  #
-  # @return     (Integer) seconds
-  #
-  def chronify_qty(qty)
-    minutes = 0
-    case qty.strip
-    when /^(\d+):(\d\d)$/
-      minutes += Regexp.last_match(1).to_i * 60
-      minutes += Regexp.last_match(2).to_i
-    when /^(\d+(?:\.\d+)?)([hmd])?$/
-      amt = Regexp.last_match(1)
-      type = Regexp.last_match(2).nil? ? 'm' : Regexp.last_match(2)
-
-      minutes = case type.downcase
-                when 'm'
-                  amt.to_i
-                when 'h'
-                  (amt.to_f * 60).round
-                when 'd'
-                  (amt.to_f * 60 * 24).round
+      options = unless default.nil?
+                  "#{cw}[#{default ? "#{cbg}Y#{cw}/#{cbw}n" : "#{cbw}y#{cw}/#{cbg}N"}#{cw}]#{cd}"
                 else
-                  minutes
+                  "#{cw}[#{cbw}y#{cw}/#{cbw}n#{cw}]#{cd}"
                 end
-    end
-    minutes * 60
-  end
-
-  ##
-  ## @brief      List sections
-  ##
-  ## @return     (Array) section titles
-  ##
-  def sections
-    @content.keys
-  end
-
-  ##
-  ## @brief      Adds a section.
-  ##
-  ## @param      title  (String) The new section title
-  ##
-  def add_section(title)
-    @content[title.cap_first] = { 'original' => "#{title}:", 'items' => [] }
-    @results.push(%(Added section "#{title.cap_first}"))
-  end
+      $stdout.syswrite "#{cbw}#{question.sub(/\?$/, '')} #{options}#{cbw}?#{cd} "
+      res = $stdin.sysread 1
+      puts
+      system 'stty cooked'
+
+      res.chomp!
+      res.downcase!
+
+      return default if res.empty?
+
+      res =~ /y/i ? true : false
+    end
+
+    ##
+    ## @brief      Attempt to match a string with an existing view
+    ##
+    ## @param      frag     (String) The user-provided string
+    ## @param      guessed  (Boolean) already guessed
+    ##
+    def guess_view(frag, guessed: false, suggest: false)
+      views.each { |view| return view if frag.downcase == view.downcase }
+      view = false
+      re = frag.split('').join('.*?')
+      views.each do |v|
+        next unless v =~ /#{re}/i
+
+        logger.debug('Match:', %(Assuming "#{v}" from "#{frag}"))
+        view = v
+        break
+      end
+      unless view || guessed
+        guess = guess_section(frag, guessed: true, suggest: true)
+        exit_now! "Did you mean `doing show #{guess}`?" if guess
 
-  ##
-  ## @brief      Attempt to match a string with an existing section
-  ##
-  ## @param      frag     (String) The user-provided string
-  ## @param      guessed  (Boolean) already guessed and failed
-  ##
-  def guess_section(frag, guessed: false)
-    return 'All' if frag =~ /^all$/i
-    frag ||= @current_section
-    sections.each { |section| return section.cap_first if frag.downcase == section.downcase }
-    section = false
-    re = frag.split('').join('.*?')
-    sections.each do |sect|
-      next unless sect =~ /#{re}/i
-
-      warn "Assuming you meant #{sect}"
-      section = sect
-      break
-    end
-    unless section || guessed
-      alt = guess_view(frag, true)
-      exit_now! "Did you mean `doing view #{alt}`?" if alt
+        raise Errors::InvalidView, "Unknown view: #{frag}"
 
-      res = yn("Section #{frag} not found, create it", default_response: false)
+      end
+      view
+    end
+
+    ##
+    ## @brief      Adds an entry
+    ##
+    ## @param      title    (String) The entry title
+    ## @param      section  (String) The section to add to
+    ## @param      opt      (Hash) Additional Options {:date, :note, :back, :timed}
+    ##
+    def add_item(title, section = nil, opt = {})
+      section ||= @config['current_section']
+      add_section(section) unless @content.key?(section)
+      opt[:date] ||= Time.now
+      opt[:note] ||= []
+      opt[:back] ||= Time.now
+      opt[:timed] ||= false
+
+      opt[:note] = opt[:note].lines if opt[:note].is_a?(String)
+
+      title = [title.strip.cap_first]
+      title = title.join(' ')
+
+      if @auto_tag
+        title = autotag(title)
+        title.add_tags!(@config['default_tags']) unless @config['default_tags'].empty?
+      end
 
-      if res
-        add_section(frag.cap_first)
-        write(@doing_file)
-        return frag.cap_first
+      title.gsub!(/ +/, ' ')
+      entry = Item.new(opt[:back], title.strip, section)
+      entry.note = opt[:note].map(&:chomp) unless opt[:note].join('').strip == ''
+      items = @content[section][:items]
+      if opt[:timed]
+        items.reverse!
+        items.each_with_index do |i, x|
+          next if i.title =~ / @done/
+
+          items[x].title = "#{i.title} @done(#{opt[:back].strftime('%F %R')})"
+          break
+        end
+        items.reverse!
       end
 
-      exit_now! "Unknown section: #{frag}"
+      items.push(entry)
+      logger.count(:added)
+      logger.debug('Entry added:', %("#{entry.title}" to #{section}))
     end
-    section ? section.cap_first : guessed
-  end
-
-  ##
-  ## @brief      Ask a yes or no question in the terminal
-  ##
-  ## @param      question     (String) The question to ask
-  ## @param      default      (Bool)   default response if no input
-  ##
-  ## @return     (Bool) yes or no
-  ##
-  def yn(question, default_response: false)
-    default = default_response ? default_response : 'n'
 
-    # if this isn't an interactive shell, answer default
-    return default.downcase == 'y' unless $stdout.isatty
+    ##
+    ## @brief      Remove items from a list that already exist in @content
+    ##
+    ## @param      items       (Array) The items to deduplicate
+    ## @param      no_overlap  (Boolean) Remove items with overlapping time spans
+    ##
+    def dedup(items, no_overlap = false)
 
-    # clear the buffer
-    if ARGV&.length
-      ARGV.length.times do
-        ARGV.shift
+      combined = []
+      @content.each do |_k, v|
+        combined += v[:items]
       end
-    end
-    system 'stty cbreak'
-
-    cw = colors['white']
-    cbw = colors['boldwhite']
-    cbg = colors['boldgreen']
-    cd = colors['default']
-
-    options = if default
-                default =~ /y/i ? "#{cw}[#{cbg}Y#{cw}/#{cbw}n#{cw}]#{cd}" : "#{cw}[#{cbw}y#{cw}/#{cbg}N#{cw}]#{cd}"
-              else
-                "#{cw}[#{cbw}y#{cw}/#{cbw}n#{cw}]#{cd}"
-              end
-    $stdout.syswrite "#{cbw}#{question.sub(/\?$/, '')} #{options}#{cbw}?#{cd} "
-    res = $stdin.sysread 1
-    puts
-    system 'stty cooked'
-
-    res.chomp!
-    res.downcase!
 
-    res = default.downcase if res == ''
-
-    res =~ /y/i
-  end
-
-  ##
-  ## @brief      Attempt to match a string with an existing view
-  ##
-  ## @param      frag     (String) The user-provided string
-  ## @param      guessed  (Boolean) already guessed
-  ##
-  def guess_view(frag, guessed = false)
-    views.each { |view| return view if frag.downcase == view.downcase }
-    view = false
-    re = frag.split('').join('.*?')
-    views.each do |v|
-      next unless v =~ /#{re}/i
-
-      warn "Assuming you meant #{v}"
-      view = v
-      break
-    end
-    unless view || guessed
-      alt = guess_section(frag, guessed: true)
-      if alt
-        exit_now! "Did you mean `doing show #{alt}`?"
-      else
-        exit_now! "Unknown view: #{frag}"
+      items.delete_if do |item|
+        duped = false
+        combined.each do |comp|
+          duped = no_overlap ? item.overlapping_time?(comp) : item.same_time?(comp)
+          break if duped
+        end
+        logger.count(:skipped, level: :debug, message: 'overlapping entry') if duped
+        logger.log_now(:debug, 'Skipped:', "overlapping entry: #{item.title}") if duped
+        duped
       end
     end
-    view
-  end
 
-  ##
-  ## @brief      Adds an entry
-  ##
-  ## @param      title    (String) The entry title
-  ## @param      section  (String) The section to add to
-  ## @param      opt      (Hash) Additional Options {:date, :note, :back, :timed}
-  ##
-  def add_item(title, section = nil, opt = {})
-    section ||= @current_section
-    add_section(section) unless @content.has_key?(section)
-    opt[:date] ||= Time.now
-    opt[:note] ||= []
-    opt[:back] ||= Time.now
-    opt[:timed] ||= false
-
-    opt[:note] = [opt[:note]] if opt[:note].instance_of?(String)
-
-    title = [title.strip.cap_first]
-    title = title.join(' ')
-
-    if @auto_tag
-      title = autotag(title)
-      unless @config['default_tags'].empty?
-        default_tags = @config['default_tags'].map do |t|
-          next if t.nil?
-
-          dt = t.sub(/^ *@/, '').chomp
-          if title =~ /@#{dt}/
-            ''
-          else
-            " @#{dt}"
+    ##
+    ## @brief      Imports external entries
+    ##
+    ## @param      path     (String) Path to JSON report file
+    ## @param      opt      (Hash) Additional Options
+    ##
+    def import(paths, opt = {})
+      Plugins.plugins[:import].each do |_, options|
+        next unless opt[:type] =~ /^(#{options[:trigger].normalize_trigger})$/i
+
+        if paths.count.positive?
+          paths.each do |path|
+            options[:class].import(self, path, options: opt)
           end
+        else
+          options[:class].import(self, nil, options: opt)
         end
-        default_tags.delete_if { |t| t == '' }
-        title += default_tags.join(' ')
-      end
-    end
-    title.gsub!(/ +/, ' ')
-    entry = { 'title' => title.strip, 'date' => opt[:back] }
-    entry['note'] = opt[:note].map(&:chomp) unless opt[:note].join('').strip == ''
-    items = @content[section]['items']
-    if opt[:timed]
-      items.reverse!
-      items.each_with_index do |i, x|
-        next if i['title'] =~ / @done/
-
-        items[x]['title'] = "#{i['title']} @done(#{opt[:back].strftime('%F %R')})"
         break
       end
-      items.reverse!
     end
-    items.push(entry)
-    @content[section]['items'] = items
-    @results.push(%(Added "#{entry['title']}" to #{section}))
-  end
 
-  def same_time?(item_a, item_b)
-    item_a['date'] == item_b['date'] ? get_interval(item_a, formatted: false, record: false) == get_interval(item_b,  formatted: false, record: false) : false
-  end
+    ##
+    ## @brief      Return the content of the last note for a given section
+    ##
+    ## @param      section  (String) The section to retrieve from, default
+    ##                      All
+    ##
+    def last_note(section = 'All')
+      section = guess_section(section)
 
-  def overlapping_time?(item_a, item_b)
-    return true if same_time?(item_a, item_b)
+      last_item = last_entry({ section: section })
 
-    start_a = item_a['date']
-    interval = get_interval(item_a, formatted: false, record: false)
-    end_a = interval ? start_a + interval.to_i : start_a
-    start_b = item_b['date']
-    interval = get_interval(item_b,  formatted: false, record: false)
-    end_b = interval ? start_b + interval.to_i : start_b
-    (start_a >= start_b && start_a <= end_b) || (end_a >= start_b && end_a <= end_b) || (start_a < start_b && end_a > end_b)
-  end
+      raise Errors::NoEntryError, 'No entry found' unless last_item
 
-  def dedup(items, no_overlap = false)
+      logger.log_now(:info, 'Edit note:', last_item.title)
 
-    combined = []
-    @content.each do |_k, v|
-      combined += v['items']
+      note = last_item.note&.to_s || ''
+      "#{last_item.title}\n# EDIT BELOW THIS LINE ------------\n#{note}"
     end
 
-    items.delete_if do |item|
-      duped = false
-      combined.each do |comp|
-        duped = no_overlap ? overlapping_time?(item, comp) : same_time?(item, comp)
-        break if duped
+    def reset_item(item, resume: false)
+      item.date = Time.now
+      if resume
+        item.tag('done', remove: true)
       end
-      # warn "Skipping overlapping entry: #{item['title']}" if duped
-      duped
+      Doing.logger.info('Reset:', %(Reset #{resume ? 'and resumed ' : ''} "#{item.title}" in #{item.section}))
+      item
     end
-  end
 
-  ##
-  ## @brief      Imports a Timing report
-  ##
-  ## @param      path     (String) Path to JSON report file
-  ## @param      section  (String) The section to add to
-  ## @param      opt      (Hash) Additional Options
-  ##
-  def import_timing(path, opt = {})
-    section = opt[:section] || @current_section
-    opt[:no_overlap] ||= false
-    opt[:autotag] ||= @auto_tag
-
-    add_section(section) unless @content.has_key?(section)
-
-    add_tags = opt[:tag] ? opt[:tag].split(/[ ,]+/).map { |t| t.sub(/^@?/, '@') }.join(' ') : ''
-    prefix = opt[:prefix] ? opt[:prefix] : '[Timing.app]'
-    exit_now! "File not found" unless File.exist?(File.expand_path(path))
-
-    data = JSON.parse(IO.read(File.expand_path(path)))
-    new_items = []
-    data.each do |entry|
-      # Only process task entries
-      next if entry.key?('activityType') && entry['activityType'] != 'Task'
-      # Only process entries with a start and end date
-      next unless entry.key?('startDate') && entry.key?('endDate')
-
-      # Round down seconds and convert UTC to local time
-      start_time = Time.parse(entry['startDate'].sub(/:\d\dZ$/, ':00Z')).getlocal
-      end_time = Time.parse(entry['endDate'].sub(/:\d\dZ$/, ':00Z')).getlocal
-      next unless start_time && end_time
-
-      tags = entry['project'].split(/ ▸ /).map {|proj| proj.gsub(/[^a-z0-9]+/i, '').downcase }
-      title = "#{prefix} "
-      title += entry.key?('activityTitle') && entry['activityTitle'] != '(Untitled Task)' ? entry['activityTitle'] : 'Working on'
-      tags.each do |tag|
-        if title =~ /\b#{tag}\b/i
-          title.sub!(/\b#{tag}\b/i, "@#{tag}")
+    def repeat_item(item, opt = {})
+      original = item.dup
+      if item.should_finish?
+        if item.should_time?
+          item.title.tag!('done', value: Time.now.strftime('%F %R'))
         else
-          title += " @#{tag}"
+          item.title.tag!('done')
         end
       end
-      title = autotag(title) if opt[:autotag]
-      title += " @done(#{end_time.strftime('%Y-%m-%d %H:%M')})"
-      title.gsub!(/ +/, ' ')
-      title.strip!
-      new_entry = { 'title' => title, 'date' => start_time, 'section' => section }
-      new_entry['note'] = entry['notes'].split(/\n/).map(&:chomp) if entry.key?('notes')
-      new_items.push(new_entry)
+
+      # Remove @done tag
+      title = item.title.sub(/\s*@done(\(.*?\))?/, '').chomp
+      section = opt[:in].nil? ? item.section : guess_section(opt[:in])
+      @auto_tag = false
+
+      note = opt[:note] || Note.new
+
+      if opt[:editor]
+        to_edit = title
+        to_edit += "\n#{note.to_s}" unless note.empty?
+        new_item = fork_editor(to_edit)
+        title, note = format_input(new_item)
+
+        if title.nil? || title.empty?
+          logger.debug('Skipped:', 'No content provided')
+          return
+        end
+      end
+
+      update_item(original, item)
+      add_item(title, section, { note: note, back: opt[:date], timed: true })
+      write(@doing_file)
     end
-    total = new_items.count
-    new_items = dedup(new_items, opt[:no_overlap])
-    dups = total - new_items.count
-    @results.push(%(Skipped #{dups} items with overlapping times)) if dups > 0
-    @content[section]['items'].concat(new_items)
-    @results.push(%(Imported #{new_items.count} items to #{section}))
-  end
 
-  ##
-  ## @brief      Return the content of the last note for a given section
-  ##
-  ## @param      section  (String) The section to retrieve from, default
-  ##                      All
-  ##
-  def last_note(section = 'All')
-    section = guess_section(section)
-    if section =~ /^all$/i
-      combined = { 'items' => [] }
-      @content.each do |_k, v|
-        combined['items'] += v['items']
+    ##
+    ## @brief      Restart the last entry
+    ##
+    ## @param      opt   (Hash) Additional Options
+    ##
+    def repeat_last(opt = {})
+      opt[:section] ||= 'all'
+      opt[:note] ||= []
+      opt[:tag] ||= []
+      opt[:tag_bool] ||= :and
+
+      last = last_entry(opt)
+      if last.nil?
+        logger.debug('Skipped:', 'No previous entry found')
+        return
       end
-      section = combined['items'].dup.sort_by { |item| item['date'] }.reverse[0]['section']
+
+      repeat_item(last, opt)
     end
 
-    exit_now! "Section #{section} not found" unless @content.key?(section)
+    ##
+    ## @brief      Get the last entry
+    ##
+    ## @param      opt   (Hash) Additional Options
+    ##
+    def last_entry(opt = {})
+      opt[:tag_bool] ||= :and
+      opt[:section] ||= @config['current_section']
 
-    last_item = @content[section]['items'].dup.sort_by { |item| item['date'] }.reverse[0]
-    warn "Editing note for #{last_item['title']}"
-    note = ''
-    note = last_item['note'].map(&:strip).join("\n") unless last_item['note'].nil?
-    "#{last_item['title']}\n# EDIT BELOW THIS LINE ------------\n#{note}"
-  end
+      items = filter_items([], opt: opt)
 
-  ##
-  ## @brief      Restart the last entry
-  ##
-  ## @param      opt   (Hash) Additional Options
-  ##
-  def restart_last(opt = {})
-    opt[:section] ||= 'all'
-    opt[:note] ||= []
-    opt[:tag] ||= []
-    opt[:tag_bool] ||= :and
-
-    last = last_entry(opt)
-    if last.nil?
-      @results.push(%(No previous entry found))
-      return
-    end
-    unless last.has_tags?(['done'], 'ALL')
-      new_item = last.dup
-      new_item['title'] += " @done(#{Time.now.strftime('%F %R')})"
-      update_item(last, new_item)
-    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, section, { note: opt[:note], back: opt[:date], timed: true })
-    write(@doing_file)
-  end
+      logger.debug('Filtered:', "Parameters matched #{items.count} entries")
 
-  ##
-  ## @brief      Get the last entry
-  ##
-  ## @param      opt   (Hash) Additional Options
-  ##
-  def last_entry(opt = {})
-    opt[:tag_bool] ||= :and
-    opt[:section] ||= @current_section
-
-    sec_arr = []
-
-    if opt[:section].nil?
-      sec_arr = [@current_section]
-    elsif opt[:section].instance_of?(String)
-      if opt[:section] =~ /^all$/i
-        combined = { 'items' => [] }
-        @content.each do |_k, v|
-          combined['items'] += v['items']
-        end
-        items = combined['items'].dup.sort_by { |item| item['date'] }.reverse
-        sec_arr.push(items[0]['section'])
+      if opt[:interactive]
+        last_entry = choose_from_items(items, {
+          menu: true,
+          header: '',
+          prompt: 'Select an entry > ',
+          multiple: false,
+          sort: false,
+          show_if_single: true
+        }, include_section: opt[:section] =~ /^all$/i )
       else
-        sec_arr = [guess_section(opt[:section])]
+        last_entry = items.max_by { |item| item.date }
       end
+
+      last_entry
     end
 
-    all_items = []
-    sec_arr.each do |section|
-      all_items.concat(@content[section]['items'].dup) if @content.key?(section)
+    ##
+    ## @brief      Generate a menu of options and allow user selection
+    ##
+    ## @return     (String) The selected option
+    ##
+    def choose_from(options, prompt: 'Make a selection: ', multiple: false, sorted: true, fzf_args: [])
+      return nil unless $stdout.isatty
+
+      fzf = File.join(File.dirname(__FILE__), '../helpers/fuzzyfilefinder')
+      # fzf_args << '-1' # User is expecting a menu, and even if only one it seves as confirmation
+      fzf_args << %(--prompt "#{prompt}")
+      fzf_args << '--multi' if multiple
+      header = "esc: cancel,#{multiple ? ' tab: multi-select, ctrl-a: select all,' : ''} return: confirm"
+      fzf_args << %(--header "#{header}")
+      options.sort! if sorted
+      res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} #{fzf_args.join(' ')}`
+      return false if res.strip.size.zero?
+
+      res
     end
 
-    if opt[:tag]&.length
-      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]) }
+    def all_tags(items, opt: {})
+      all_tags = []
+      items.each { |item| all_tags.concat(item.tags).uniq! }
+      all_tags.sort
     end
 
-    all_items.max_by { |item| item['date'] }
-  end
+    def tag_groups(items, opt: {})
+      all_items = filter_items(items, opt: opt)
+      tags = all_tags(all_items, opt: {})
+      tag_groups = {}
+      tags.each do |tag|
+        tag_groups[tag] ||= []
+        tag_groups[tag] = filter_items(all_items, opt: { tag: tag, tag_bool: :or })
+      end
 
-  ##
-  ## @brief      Generate a menu of options and allow user selection
-  ##
-  ## @return     (String) The selected option
-  ##
-  def choose_from(options, prompt: 'Make a selection: ', multiple: false, fzf_args: [])
-    fzf = File.join(File.dirname(__FILE__), '../helpers/fuzzyfilefinder')
-    fzf_args << '-1'
-    fzf_args << %(--prompt "#{prompt}")
-    fzf_args << '--multi' if multiple
-    header = "esc: cancel,#{multiple ? ' tab: multi-select, ctrl-a: select all,' : ''} return: confirm"
-    fzf_args << %(--header "#{header}")
-    res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} #{fzf_args.join(' ')}`
-    return false if res.strip.size.zero?
-
-    res
-  end
+      tag_groups
+    end
+
+    ##
+    ## @brief      Filter items based on search criteria
+    ##
+    ## @param      items  (Array) The items to filter (if empty, filters all items)
+    ## @param      opt    (Hash) The filter parameters
+    ##
+    ## Available filter options in opt object
+    ##
+    ## - +:section+ (String)
+    ## - +:unfinished+ (Boolean)
+    ## - +:tag+ (Array or comma-separated string)
+    ## - +:tag_bool+ (:and, :or, :not)
+    ## - +:search+ (string, optional regex with //)
+    ## - +:date_filter+ (Array[(Time)start, (Time)end])
+    ## - +:only_timed+ (Boolean)
+    ## - +:before+ (Date/Time string, unparsed)
+    ## - +:after+ (Date/Time string, unparsed)
+    ## - +:today+ (Boolean)
+    ## - +:yesterday+ (Boolean)
+    ## - +:count+ (Number to return)
+    ## - +:age+ (String, 'old' or 'new')
+    ##
+    def filter_items(items = [], opt: {})
+      if items.nil? || items.empty?
+        section = opt[:section] ? guess_section(opt[:section]) : 'All'
+
+        items = if section =~ /^all$/i
+                  @content.each_with_object([]) { |(_k, v), arr| arr.concat(v[:items].dup) }
+                else
+                  @content[section][:items].dup
+                end
+      end
 
-  ##
-  ## @brief      Display an interactive menu of entries
-  ##
-  ## @param      opt   (Hash) Additional options
-  ##
-  def interactive(opt = {})
-    fzf = File.join(File.dirname(__FILE__), '../helpers/fuzzyfilefinder')
+      items.sort_by! { |item| [item.date, item.title.downcase] }.reverse
+      filtered_items = items.select do |item|
+        keep = true
+        finished = opt[:unfinished] && item.tags?('done', :and)
+        keep = false if finished
 
-    section = opt[:section] ? guess_section(opt[:section]) : 'All'
+        if keep && opt[:tag]
+          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
+        end
 
+        if keep && opt[:search]
+          search_match = opt[:search].nil? || opt[:search].empty? ? true : item.search(opt[:search])
+          keep = false unless search_match
+        end
 
-    if section =~ /^all$/i
-      combined = { 'items' => [] }
-      @content.each do |_k, v|
-        combined['items'] += v['items']
-      end
-      items = combined['items'].dup.sort_by { |item| item['date'] }.reverse
-    else
-      items = @content[section]['items']
-    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
+        end
 
-    options = items.map.with_index do |item, i|
-      out = [
-        i,
-        ') ',
-        item['date'],
-        ' | ',
-        item['title']
-      ]
-      if section =~ /^all/i
-        out.concat([
-          ' (',
-          item['section'],
-          ') '
-        ])
-      end
-      out.join('')
-    end
-    fzf_args = [
-      %(--header="Arrows: navigate, tab: mark for selection, ctrl-a: select all, enter: commit"),
-      %(--prompt="Select entries to act on > "),
-      '-1',
-      '-m',
-      '--bind ctrl-a:select-all',
-      %(-q "#{opt[:query]}")
-    ]
-    if !opt[:menu]
-      exit_now! "Can't skip menu when no query is provided" unless opt[:query]
-
-      fzf_args.concat([%(--filter="#{opt[:query]}"), '--no-sort'])
-    end
+        keep = false if keep && opt[:only_timed] && !item.interval
 
-    res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} #{fzf_args.join(' ')}`
-    selected = []
-    res.split(/\n/).each do |item|
-      idx = item.match(/^(\d+)\)/)[1].to_i
-      selected.push(items[idx])
-    end
+        if keep && opt[:tag_filter] && !opt[:tag_filter]['tags'].empty?
+          keep = item.tags?(opt[:tag_filter]['tags'], opt[:tag_filter]['bool'])
+        end
 
-    if selected.empty?
-      @results.push("No selection")
-      return
-    end
+        if keep && opt[:before]
+          time_string = opt[:before]
+          cutoff = chronify(time_string, guess: :begin)
+          keep = cutoff && item.date <= cutoff
+        end
 
-    actions = %i[editor delete tag flag finish cancel tag archive output save_to]
-    has_action = false
-    actions.each do |a|
-      if opt[a]
-        has_action = true
-        break
-      end
-    end
+        if keep && opt[:after]
+          time_string = opt[:after]
+          cutoff = chronify(time_string, guess: :end)
+          keep = cutoff && item.date >= cutoff
+        end
 
-    unless has_action
-      choice = choose_from([
-                             'add tag',
-                             'remove tag',
-                             'cancel',
-                             'delete',
-                             'finish',
-                             'flag',
-                             'archive',
-                             'move',
-                             'edit',
-                             'output formatted'
-                           ],
-                           prompt: 'What do you want to do with the selected items? > ',
-                           multiple: true,
-                           fzf_args: ['--height=60%', '--tac', '--no-sort'])
-      return unless choice
-
-      to_do = choice.strip.split(/\n/)
-      to_do.each do |action|
-        case action
-        when /(add|remove) tag/
-          type = action =~ /^add/ ? 'add' : 'remove'
-          if opt[:tag]
-            exit_now! "'add tag' and 'remove tag' can not be used together"
-          end
-          print "#{colors['yellow']}Tag to #{type}: #{colors['reset']}"
-          tag = STDIN.gets
-          return if tag =~ /^ *$/
-          opt[:tag] = tag.strip.sub(/^@/, '')
-          opt[:remove] = true if type == 'remove'
-        when /output formatted/
-          output_format = choose_from(%w[doing taskpaper json timeline html csv].sort, prompt: 'Which output format? > ', fzf_args: ['--height=60%', '--tac', '--no-sort'])
-          return if tag =~ /^ *$/
-          opt[:output] = output_format.strip
-          res = opt[:force] ? false : yn('Save to file?', default_response: 'n')
-          if res
-            print "#{colors['yellow']}File path/name: #{colors['reset']}"
-            filename = STDIN.gets.strip
-            return if filename.empty?
-            opt[:save_to] = filename
-          end
-        when /archive/
-          opt[:archive] = true
-        when /delete/
-          opt[:delete] = true
-        when /edit/
-          opt[:editor] = true
-        when /finish/
-          opt[:finish] = true
-        when /cancel/
-          opt[:cancel] = true
-        when /move/
-          section = choose_section.strip
-          opt[:move] = section.strip unless section =~ /^ *$/
-        when /flag/
-          opt[:flag] = true
+        if keep && opt[:today]
+          keep = item.date >= Date.today.to_time && item.date < Date.today.next_day.to_time
+        elsif keep && opt[:yesterday]
+          keep = item.date >= Date.today.prev_day.to_time && item.date < Date.today.to_time
         end
-      end
-    end
 
-    if opt[:delete]
-      res = opt[:force] ? true : yn("Delete #{selected.size} items?", default_response: 'y')
-      if res
-        selected.each { |item| delete_item(item) }
-        write(@doing_file)
+        keep
       end
-      return
-    end
+      count = opt[:count] && opt[:count].positive? ? opt[:count] : filtered_items.length
 
-    if opt[:flag]
-      tag = @config['marker_tag'] || 'flagged'
-      selected.map! do |item|
-        if opt[:remove]
-          untag_item(item, tag)
-        else
-          tag_item(item, tag, date: false)
-        end
+      if opt[:age] =~ /^o/i
+        filtered_items.slice(0, count).reverse
+      else
+        filtered_items.reverse.slice(0, count)
       end
-    end
 
-    if opt[:finish] || opt[:cancel]
-      tag = 'done'
-      selected.map! do |item|
-        if opt[:remove]
-          untag_item(item, tag)
-        else
-          tag_item(item, tag, date: !opt[:cancel])
-        end
-      end
     end
 
-    if opt[:tag]
-      tag = opt[:tag]
-      selected.map! do |item|
-        if opt[:remove]
-          untag_item(item, tag)
-        else
-          tag_item(item, tag, date: false)
-        end
+    ##
+    ## @brief      Display an interactive menu of entries
+    ##
+    ## @param      opt   (Hash) Additional options
+    ##
+    def interactive(opt = {})
+      section = opt[:section] ? guess_section(opt[:section]) : 'All'
+      opt[:query] = opt[:search] if opt[:search] && !opt[:query]
+      opt[:multiple] = true
+      items = filter_items([], opt: { section: section, search: opt[:search] })
+
+      selection = choose_from_items(items, opt, include_section: section =~ /^all$/i)
+
+      if selection.empty?
+        logger.debug('Skipped:', 'No selection')
+        return
       end
-    end
 
-    if opt[:archive] || opt[:move]
-      section = opt[:archive] ? 'Archive' : guess_section(opt[:move])
-      selected.map! {|item| move_item(item, section) }
+      act_on(selection, opt)
     end
 
-    write(@doing_file)
+    def choose_from_items(items, opt = {}, include_section: false)
+      return nil unless $stdout.isatty
 
-    if opt[:editor]
+      return nil unless items.count.positive?
 
-      editable_items = []
+      opt[:header] ||= "Arrows: navigate, tab: mark for selection, ctrl-a: select all, enter: commit"
+      opt[:prompt] ||= "Select entries to act on > "
 
-      selected.each do |item|
-        editable = "#{item['date']} | #{item['title']}"
-        old_note = item['note'] ? item['note'].map(&:strip).join("\n") : nil
-        editable += "\n#{old_note}" unless old_note.nil?
-        editable_items << editable
+      pad = items.length.to_s.length
+      options = items.map.with_index do |item, i|
+        out = [
+          format("%#{pad}d", i),
+          ') ',
+          format('%13s', item.date.relative_date),
+          ' | ',
+          item.title
+        ]
+        if include_section
+          out.concat([
+            ' (',
+            item.section,
+            ') '
+          ])
+        end
+        out.join('')
       end
-      divider = "\n-----------\n"
-      input = editable_items.map(&:strip).join(divider) + "\n\n# You may delete entries, but leave all divider lines in place"
 
-      new_items = fork_editor(input).split(/#{divider}/)
+      fzf = File.join(File.dirname(__FILE__), '../helpers/fuzzyfilefinder')
 
-      new_items.each_with_index do |new_item, i|
+      fzf_args = [
+        %(--header="#{opt[:header]}"),
+        %(--prompt="#{opt[:prompt].sub(/ *$/, ' ')}"),
+        opt[:multiple] ? '--multi' : '--no-multi',
+        '-0',
+        '--bind ctrl-a:select-all',
+        %(-q "#{opt[:query]}")
+      ]
+      fzf_args.push('-1') unless opt[:show_if_single]
 
-        input_lines = new_item.split(/[\n\r]+/).delete_if {|line| line =~ /^#/ || line =~ /^\s*$/ }
-        title = input_lines[0]&.strip
+      unless opt[:menu]
+        raise Errors::InvalidArgument, "Can't skip menu when no query is provided" unless opt[:query]
 
-        if title.nil? || title =~ /^#{divider.strip}$/ || title.strip.empty?
-          delete_item(selected[i])
-        else
-          note = input_lines.length > 1 ? input_lines[1..-1] : []
+        fzf_args.concat([%(--filter="#{opt[:query]}"), opt[:sort] ? '' : '--no-sort'])
+      end
 
-          note.map!(&:strip)
-          note.delete_if { |line| line =~ /^\s*$/ || line =~ /^#/ }
+      res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} #{fzf_args.join(' ')}`
+      selected = []
+      res.split(/\n/).each do |item|
+        idx = item.match(/^ *(\d+)\)/)[1].to_i
+        selected.push(items[idx])
+      end
 
-          date = title.match(/^([\d\-: ]+) \| /)[1]
-          title.sub!(/^([\d\-: ]+) \| /, '')
+      opt[:multiple] ? selected : selected[0]
+    end
 
-          item = selected[i].dup
-          item['title'] = title
-          item['note'] = note
-          item['date'] = Time.parse(date) || selected[i]['date']
-          update_item(selected[i], item)
+    def act_on(items, opt = {})
+      actions = %i[editor delete tag flag finish cancel archive output save_to]
+      has_action = false
+      actions.each do |a|
+        if opt[a]
+          has_action = true
+          break
         end
       end
 
-      write(@doing_file)
-    end
+      unless has_action
+        actions = [
+                     'add tag',
+                     'remove tag',
+                     'cancel',
+                     'delete',
+                     'finish',
+                     'flag',
+                     'archive',
+                     'move',
+                     'edit',
+                     'output formatted'
+                   ]
+
+        actions.concat(['resume/repeat', 'begin/reset']) if items.count == 1
+
+        choice = choose_from(actions,
+                             prompt: 'What do you want to do with the selected items? > ',
+                             multiple: true,
+                             sorted: false,
+                             fzf_args: ['--height=60%', '--tac', '--no-sort'])
+        return unless choice
+
+        to_do = choice.strip.split(/\n/)
+        to_do.each do |action|
+          case action
+          when /resume/
+            opt[:resume] = true
+          when /reset/
+            opt[:reset] = true
+          when /(add|remove) tag/
+            type = action =~ /^add/ ? 'add' : 'remove'
+            raise Errors::InvalidArgument, "'add tag' and 'remove tag' can not be used together" if opt[:tag]
+
+            print "#{Color.yellow}Tag to #{type}: #{Color.reset}"
+            tag = $stdin.gets
+            next if tag =~ /^ *$/
+
+            opt[:tag] = tag.strip.sub(/^@/, '')
+            opt[:remove] = true if type == 'remove'
+          when /output formatted/
+            output_format = choose_from(Plugins.available_plugins(type: :export).sort,
+                                        prompt: 'Which output format? > ',
+                                        fzf_args: ['--height=60%', '--tac', '--no-sort'])
+            next if tag =~ /^ *$/
+
+            unless output_format
+              raise Errors::UserCancelled, 'Cancelled'
+            end
+
+            opt[:output] = output_format.strip
+            res = opt[:force] ? false : yn('Save to file?', default_response: 'n')
+            if res
+              print "#{Color.yellow}File path/name: #{Color.reset}"
+              filename = $stdin.gets.strip
+              next if filename.empty?
 
-    if opt[:output]
-      selected.map! do |item|
-        item['title'] = "#{item['title']} @project(#{item['section']})"
-        item
+              opt[:save_to] = filename
+            end
+          when /archive/
+            opt[:archive] = true
+          when /delete/
+            opt[:delete] = true
+          when /edit/
+            opt[:editor] = true
+          when /finish/
+            opt[:finish] = true
+          when /cancel/
+            opt[:cancel] = true
+          when /move/
+            section = choose_section.strip
+            opt[:move] = section.strip unless section =~ /^ *$/
+          when /flag/
+            opt[:flag] = true
+          end
+        end
       end
 
-      @content = { 'Export' => { 'original' => 'Export:', 'items' => selected } }
-      options = { section: 'Export' }
+      if opt[:resume] || opt[:reset]
+        if items.count > 1
+          logger.error('Error:', 'resume and restart can only be used on a single entry')
+        else
+          item = items[0]
+          if opt[:resume] && !opt[:reset]
+            repeat_item(item, { editor: opt[:editor] })
+          elsif opt[:reset]
+            if item.tags?('done', :and) && !opt[:resume]
+              res = opt[:force] ? true : yn('Remove @done tag?', default_response: 'y')
+            else
+              res = opt[:resume]
+            end
+            update_item(item, reset_item(item, resume: res))
+          end
+          write(@doing_file)
+        end
+        return
+      end
 
-      case opt[:output]
-      when /doing/
-        options[:template] = '- %date | %title%note'
-      when /taskpaper/
-        options[:template] = '- %title @date(%date)%note'
-      else
-        options[:output] = opt[:output]
+      if opt[:delete]
+        res = opt[:force] ? true : yn("Delete #{items.size} items?", default_response: 'y')
+        if res
+          items.each { |item| delete_item(item) }
+          write(@doing_file)
+        end
+        return
       end
 
-      output = list_section(options)
+      if opt[:flag]
+        tag = @config['marker_tag'] || 'flagged'
+        items.map! do |item|
+          tag_item(item, tag, date: false, remove: opt[:remove])
+        end
+      end
 
-      if opt[:save_to]
-        file = File.expand_path(opt[:save_to])
-        if File.exist?(file)
-          # Create a backup copy for the undo command
-          FileUtils.cp(file, "#{file}~")
+      if opt[:finish] || opt[:cancel]
+        tag = 'done'
+        items.map! do |item|
+          if item.should_finish?
+            should_date = !opt[:cancel] && item.should_time?
+            tag_item(item, tag, date: should_date, remove: opt[:remove])
+          end
         end
+      end
 
-        File.open(file, 'w+') do |f|
-          f.puts output
+      if opt[:tag]
+        tag = opt[:tag]
+        items.map! do |item|
+          tag_item(item, tag, date: false, remove: opt[:remove])
         end
+      end
 
-        @results.push("Export saved to #{file}")
-      else
-        puts output
+      if opt[:archive] || opt[:move]
+        section = opt[:archive] ? 'Archive' : guess_section(opt[:move])
+        items.map! {|item| move_item(item, section) }
       end
-    end
-  end
 
-  ##
-  ## @brief      Tag the last entry or X entries
-  ##
-  ## @param      opt   (Hash) Additional Options
-  ##
-  def tag_last(opt = {})
-    opt[:section] ||= nil
-    opt[:count] ||= 1
-    opt[:archive] ||= false
-    opt[:tags] ||= ['done']
-    opt[:sequential] ||= false
-    opt[:date] ||= false
-    opt[:remove] ||= false
-    opt[:autotag] ||= false
-    opt[:back] ||= false
-    opt[:took] ||= nil
-    opt[:unfinished] ||= false
-
-    sec_arr = []
-
-    if opt[:section].nil?
-      if opt[:search] || opt[:tag]
-        sec_arr = sections
-      else
-        sec_arr = [@current_section]
-      end
-    elsif opt[:section].instance_of?(String)
-      if opt[:section] =~ /^all$/i
-        if opt[:count] == 1
-          combined = { 'items' => [] }
-          @content.each do |_k, v|
-            combined['items'] += v['items']
-          end
-          items = combined['items'].dup.sort_by { |item| item['date'] }.reverse
-          sec_arr.push(items[0]['section'])
-        elsif opt[:count] > 1
-          if opt[:search] || opt[:tag]
-            sec_arr = sections
-          else
-            exit_now! 'A count greater than one requires a section to be specified'
-          end
-        else
-          sec_arr = sections
-        end
-      else
-        sec_arr = [guess_section(opt[:section])]
-      end
-    end
+      write(@doing_file)
 
-    sec_arr.each do |section|
-      if @content.key?(section)
+      if opt[:editor]
 
-        items = @content[section]['items'].dup.sort_by { |item| item['date'] }.reverse
-        idx = 0
-        done_date = Time.now
-        count = (opt[:count]).zero? ? items.length : opt[:count]
-        items.map! do |item|
-          break if idx == count
-          finished = opt[:unfinished] && item.has_tags?('done', :and)
-          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 && !finished
-            if opt[:autotag]
-              new_title = autotag(item['title']) if @auto_tag
-              if new_title == item['title']
-                @results.push(%(Autotag: No changes))
-              else
-                @results.push("Tags updated: #{new_title}")
-                item['title'] = new_title
-              end
-            else
-              if opt[:sequential]
-                next_entry = next_item(item)
+        editable_items = []
 
-                if next_entry.nil?
-                  done_date = Time.now
-                else
-                  done_date = next_entry['date'] - 60
-                end
-              elsif opt[:took]
-                if item['date'] + opt[:took] > Time.now
-                  item['date'] = Time.now - opt[:took]
-                  done_date = Time.now
-                else
-                  done_date = item['date'] + opt[:took]
-                end
-              elsif opt[:back]
-                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
+        items.each do |item|
+          editable = "#{item.date} | #{item.title}"
+          old_note = item.note ? item.note.to_s : nil
+          editable += "\n#{old_note}" unless old_note.nil?
+          editable_items << editable
+        end
+        divider = "\n-----------\n"
+        input = editable_items.map(&:strip).join(divider) + "\n\n# You may delete entries, but leave all divider lines in place"
 
-              title = item['title']
-              opt[:tags].each do |tag|
-                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]
-                             " @#{tag}(#{done_date.strftime('%F %R')})"
-                           else
-                             " @#{tag}"
-                           end
-                  @results.push(%(Added @#{tag}: "#{title}" in #{section}))
-                end
-              end
-              item['title'] = title
-            end
+        new_items = fork_editor(input).split(/#{divider}/)
 
-            idx += 1
-          end
+        new_items.each_with_index do |new_item, i|
 
-          item
-        end
+          input_lines = new_item.split(/[\n\r]+/).delete_if(&:ignore?)
+          title = input_lines[0]&.strip
 
-        @content[section]['items'] = items
-
-        if opt[:archive] && section != 'Archive' && (opt[:count]).positive?
-          # concat [count] items from [section] and archive section
-          archived = @content[section]['items'][0..opt[:count] - 1].map do |i|
-            i['title'].sub!(/(?:@from\(.*?\))?(.*)$/, "\\1 @from(#{i['section']})")
-            i
-          end.concat(@content['Archive']['items'])
-          # slice [count] items off of [section] items
-          @content[opt[:section]]['items'] = @content[opt[:section]]['items'][opt[:count]..-1]
-          # overwrite archive section with concatenated array
-          @content['Archive']['items'] = archived
-          # log it
-          result = opt[:count] == 1 ? '1 entry' : "#{opt[:count]} entries"
-          @results.push("Archived #{result} from #{section}")
-        elsif opt[:archive] && (opt[:count]).zero?
-          @results.push('Archiving is skipped when operating on all entries') if (opt[:count]).zero?
-        end
-      else
-        exit_now! "Section not found: #{section}"
-      end
-    end
-
-    write(@doing_file)
-  end
+          if title.nil? || title =~ /^#{divider.strip}$/ || title.strip.empty?
+            delete_item(items[i])
+          else
+            note = input_lines.length > 1 ? input_lines[1..-1] : []
 
-  def move_item(item, section)
-    old_section = item['section']
-    new_item = item.dup
-    new_item['section'] = section
+            note.map!(&:strip)
+            note.delete_if(&:ignore?)
 
-    section_items = @content[old_section]['items']
-    section_items.delete(item)
-    @content[old_section]['items'] = section_items
+            date = title.match(/^([\d\-: ]+) \| /)[1]
+            title.sub!(/^([\d\-: ]+) \| /, '')
 
-    archive_items = @content[section]['items']
-    archive_items.push(new_item)
-    # archive_items = archive_items.sort_by { |item| item['date'] }
-    @content[section]['items'] = archive_items
+            item = items[i]
+            item.title = title
+            item.note = note
+            item.date = Time.parse(date) || items[i].date
+          end
+        end
 
-    @results.push("Entry moved to #{section}: #{new_item['title']}")
-    return new_item
-  end
+        write(@doing_file)
+      end
 
-  ##
-  ## @brief      Get next item in the index
-  ##
-  ## @param      old_item
-  ##
-  def next_item(old_item)
-    combined = { 'items' => [] }
-    @content.each do |_k, v|
-      combined['items'] += v['items']
-    end
-    items = combined['items'].dup.sort_by { |item| item['date'] }.reverse
-    idx = items.index(old_item)
+      if opt[:output]
+        items.map! do |item|
+          item.title = "#{item.title} @project(#{item.section})"
+          item
+        end
 
-    if idx > 0
-      items[idx - 1]
-    else
-      nil
-    end
-  end
+        @content = { 'Export' => { :original => 'Export:', :items => items } }
+        options = { section: 'Export' }
 
-  ##
-  ## @brief      Delete an item from the index
-  ##
-  ## @param      old_item
-  ##
-  def delete_item(old_item)
-    section = old_item['section']
 
-    section_items = @content[section]['items']
-    deleted = section_items.delete(old_item)
-    @results.push("Entry deleted: #{deleted['title']}")
-    @content[section]['items'] = section_items
-  end
+        if opt[:output] =~ /doing/
+          options[:output] = 'template'
+          options[:template] = '- %date | %title%note'
+        else
+          options[:output] = opt[:output]
+          options[:template] = opt[:template] || nil
+        end
 
-  ##
-  ## @brief      Remove a tag on an item from the index
-  ##
-  ## @param      old_item  (Item) The item to tag
-  ## @param      tag       (string) The tag to remove
-  ##
-  def untag_item(old_item, tags)
-    title = old_item['title'].dup
-    if tags.is_a? ::String
-      tags = tags.split(/ *, */).map {|t| t.strip.gsub(/\*/,'[^ (]*') }
-    end
+        output = list_section(options)
 
-    tags.each do |tag|
-      if title =~ /@#{tag}/
-        title.chomp!
-        title.gsub!(/ +@#{tag}(\(.*?\))?/, '')
-        new_item = old_item.dup
-        new_item['title'] = title
-        update_item(old_item, new_item)
-        return new_item
-      else
-        @results.push(%(Item isn't tagged @#{tag}: "#{title}" in #{old_item['section']}))
-        return old_item
-      end
-    end
-  end
+        if opt[:save_to]
+          file = File.expand_path(opt[:save_to])
+          if File.exist?(file)
+            # Create a backup copy for the undo command
+            FileUtils.cp(file, "#{file}~")
+          end
 
-  ##
-  ## @brief      Tag an item from the index
-  ##
-  ## @param      old_item  (Item) The item to tag
-  ## @param      tag       (string) The tag to apply
-  ## @param      date      (Boolean) Include timestamp?
-  ##
-  def tag_item(old_item, tags, remove: false, date: false)
-    title = old_item['title'].dup
-    if tags.is_a? ::String
-      tags = tags.split(/ *, */).map(&:strip)
-    end
+          File.open(file, 'w+') do |f|
+            f.puts output
+          end
 
-    done_date = Time.now
-    tags.each do |tag|
-      if title !~ /@#{tag}/
-        title.chomp!
-        if date
-          title += " @#{tag}(#{done_date.strftime('%F %R')})"
+          logger.warn('File written:', file)
         else
-          title += " @#{tag}"
+          Doing::Pager.page output
         end
-        new_item = old_item.dup
-        new_item['title'] = title
-        update_item(old_item, new_item)
-        return new_item
-      else
-        @results.push(%(Item already @#{tag}: "#{title}" in #{old_item['section']}))
-        return old_item
       end
     end
-  end
 
-  ##
-  ## @brief      Update an item in the index with a modified item
-  ##
-  ## @param      old_item  The old item
-  ## @param      new_item  The new item
-  ##
-  def update_item(old_item, new_item)
-    section = old_item['section']
+    ##
+    ## @brief      Tag an item from the index
+    ##
+    ## @param      item    (Item) The item to tag
+    ## @param      tags    (string) The tag to apply
+    ## @param      remove  (Boolean) remove tags
+    ## @param      date    (Boolean) Include timestamp?
+    ##
+    def tag_item(item, tags, remove: false, date: false)
+      added = []
+      removed = []
 
-    section_items = @content[section]['items']
-    s_idx = section_items.index(old_item)
+      tags = tags.to_tags if tags.is_a? ::String
 
-    section_items[s_idx] = new_item
-    @results.push("Entry updated: #{section_items[s_idx]['title']}")
-    @content[section]['items'] = section_items
-  end
+      done_date = Time.now
 
-  ##
-  ## @brief      Edit the last entry
-  ##
-  ## @param      section  (String) The section, default "All"
-  ##
-  def edit_last(section: 'All', options: {})
-    section = guess_section(section)
+      tags.each do |tag|
+        bool = remove ? :and : :not
+        if item.tags?(tag, bool)
+          item.tag(tag, remove: remove, value: date ? done_date.strftime('%F %R') : nil)
+          remove ? removed.push(tag) : added.push(tag)
+        end
+      end
 
-    if section =~ /^all$/i
-      items = []
-      @content.each do |_k, v|
-        items.concat(v['items'])
+      log_change(tags_added: added, tags_removed: removed, count: 1)
+
+      item
+    end
+
+    ##
+    ## @brief      Tag the last entry or X entries
+    ##
+    ## @param      opt   (Hash) Additional Options
+    ##
+    def tag_last(opt = {})
+      opt[:count] ||= 1
+      opt[:archive] ||= false
+      opt[:tags] ||= ['done']
+      opt[:sequential] ||= false
+      opt[:date] ||= false
+      opt[:remove] ||= false
+      opt[:autotag] ||= false
+      opt[:back] ||= false
+      opt[:unfinished] ||= false
+      opt[:section] = opt[:section] ? guess_section(opt[:section]) : 'All'
+
+      items = filter_items([], opt: opt)
+
+      logger.info('Skipped:', 'no items matched your search') if items.empty?
+
+      if opt[:interactive]
+        items = choose_from_items(items, {
+          menu: true,
+          header: '',
+          prompt: 'Select entries to tag > ',
+          multiple: true,
+          sort: true,
+          show_if_single: true
+        }, include_section: opt[:section] =~ /^all$/i )
+
+        return if items.nil?
       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
+      items.each do |item|
+        added = []
+        removed = []
+
+        if opt[:autotag]
+          new_title = autotag(item.title) if @auto_tag
+          if new_title == item.title
+            logger.count(:skipped, level: :debug, message: '%count unchaged %items')
+            # logger.debug('Autotag:', 'No changes')
+          else
+            logger.count(:added_tags)
+            logger.debug('Tags updated:', new_title)
+            item.title = new_title
+          end
+        else
+          if opt[:sequential]
+            next_entry = next_item(item)
+
+            done_date = if next_entry.nil?
+                          Time.now
+                        else
+                          next_entry.date - 60
+                        end
+          elsif opt[:took]
+            if item.date + opt[:took] > Time.now
+              item.date = Time.now - opt[:took]
+              done_date = Time.now
+            else
+              done_date = item.date + opt[:took]
+            end
+          elsif opt[:back]
+            done_date = if opt[:back].is_a? Integer
+                          item.date + opt[:back]
+                        else
+                          item.date + (opt[:back] - item.date)
+                        end
+          else
+            done_date = Time.now
+          end
 
-    idx = nil
+          opt[:tags].each do |tag|
+            if tag == 'done' && !item.should_finish?
 
-    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
+              Doing.logger.debug('Skipped:', "Item in never_finish: #{item.title}")
+              logger.count(:skipped, level: :debug)
+              next
+            end
+
+            tag = tag.strip
+            if opt[:remove] || opt[:rename]
+              rename_to = nil
+              if opt[:rename]
+                rename_to = tag
+                tag = opt[:rename]
+              end
+              old_title = item.title.dup
+              item.title.tag!(tag, remove: opt[:remove], rename_to: rename_to, regex: opt[:regex])
+              if old_title != item.title
+                removed << tag
+                added << rename_to if rename_to
+              else
+                logger.count(:skipped, level: :debug)
+              end
+            else
+              old_title = item.title.dup
+              should_date = opt[:date] && item.should_time?
+              item.title.tag!(tag, value: should_date ? done_date.strftime('%F %R') : nil)
+              added << tag if old_title != item.title
+            end
+          end
         end
-      end
-    elsif options[:search]
-      items.each_with_index do |item, i|
-        if item.matches_search?(options[:search])
-          idx = i
-          break
+
+        log_change(tags_added: added, tags_removed: removed)
+
+        item.note.add(opt[:note]) if opt[:note]
+
+        if opt[:archive] && opt[:section] != 'Archive' && (opt[:count]).positive?
+          move_item(item, 'Archive', label: true)
+        elsif opt[:archive] && opt[:count].zero?
+          logger.warn('Skipped:', 'Archiving is skipped when operating on all entries')
         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
-  ##
-  ## @param      section  (String) The section, default "All"
-  ## @param      note     (String) The note to add
-  ## @param      replace  (Bool) Should replace existing note
-  ##
-  def note_last(section, note, replace: false)
-    section = guess_section(section)
 
-    if section =~ /^all$/i
-      combined = { 'items' => [] }
-      @content.each do |_k, v|
-        combined['items'] += v['items']
+    ##
+    ## @brief      Move item from current section to
+    ##             destination section
+    ##
+    ## @param      item     The item
+    ## @param      section  The destination section
+    ##
+    ## @return     Updated item
+    ##
+    def move_item(item, section, label: true)
+      from = item.section
+      new_item = @content[item.section][:items].delete(item)
+      new_item.title.sub!(/(?:@from\(.*?\))?(.*)$/, "\\1 @from(#{from})") if label
+      new_item.section = section
+
+      @content[section][:items].concat([new_item])
+
+      logger.count(section == 'Archive' ? :archived : :moved)
+      logger.debug("Entry #{section == 'Archive' ? 'archived' : 'moved'}:",
+                  "#{new_item.title.truncate(60)} from #{from} to #{section}")
+      new_item
+    end
+
+    ##
+    ## @brief      Get next item in the index
+    ##
+    ## @param      item
+    ##
+    def next_item(item, options = {})
+      items = filter_items([], opt: options)
+
+      idx = items.index(item)
+
+      idx.positive? ? items[idx - 1] : nil
+    end
+
+    ##
+    ## @brief      Delete an item from the index
+    ##
+    ## @param      item  The item
+    ##
+    def delete_item(item)
+      section = item.section
+
+      section_items = @content[section][:items]
+      deleted = section_items.delete(item)
+      logger.count(:deleted)
+      logger.debug('Entry deleted:', deleted.title)
+    end
+
+    ##
+    ## @brief      Update an item in the index with a modified item
+    ##
+    ## @param      old_item  The old item
+    ## @param      new_item  The new item
+    ##
+    def update_item(old_item, new_item)
+      section = old_item.section
+
+      section_items = @content[section][:items]
+      s_idx = section_items.index { |item| item.equal?(old_item) }
+
+      unless s_idx
+        Doing.logger.error('Fail to update:', 'Could not find item in index')
+        raise Errors::ItemNotFound, 'Unable to find item in index, did it mutate?'
       end
-      section = combined['items'].dup.sort_by { |item| item['date'] }.reverse[0]['section']
-    end
 
-    exit_now! "Section #{section} not found" unless @content.key?(section)
-
-    # sort_section(opt[:section])
-    items = @content[section]['items'].dup.sort_by { |item| item['date'] }.reverse
-
-    current_note = items[0]['note']
-    current_note = [] if current_note.nil?
-    title = items[0]['title']
-    if replace
-      items[0]['note'] = note
-      if note.empty? && !current_note.empty?
-        @results.push(%(Removed note from "#{title}"))
-      elsif !current_note.empty? && !note.empty?
-        @results.push(%(Replaced note from "#{title}"))
-      elsif !note.empty?
-        @results.push(%(Added note to "#{title}"))
-      else
-        @results.push(%(Entry "#{title}" has no note))
-      end
-    elsif current_note.instance_of?(Array)
-      items[0]['note'] = current_note.concat(note)
-      @results.push(%(Added note to "#{title}")) unless note.empty?
-    else
-      items[0]['note'] = note
-      @results.push(%(Added note to "#{title}")) unless note.empty?
+      return if section_items[s_idx].equal?(new_item)
+
+      section_items[s_idx] = new_item
+      logger.count(:updated)
+      logger.debug('Entry updated:', section_items[s_idx].title.truncate(60))
+      new_item
     end
 
-    @content[section]['items'] = items
+    ##
+    ## @brief      Edit the last entry
+    ##
+    ## @param      section  (String) The section, default "All"
+    ##
+    def edit_last(section: 'All', options: {})
+      options[:section] = guess_section(section)
 
-  end
+      item = last_entry(options)
 
-  #
-  # @brief      Accepts one tag and the raw text of a new item if the passed tag
-  #             is on any item, it's replaced with @done. if new_item is not
-  #             nil, it's tagged with the passed tag and inserted. This is for
-  #             use where only one instance of a given tag should exist
-  #             (@meanwhile)
-  #
-  # @param      tag   (String) Tag to replace
-  # @param      opt   (Hash) Additional Options
-  #
-  def stop_start(target_tag, opt = {})
-    tag = target_tag.dup
-    opt[:section] ||= @current_section
-    opt[:archive] ||= false
-    opt[:back] ||= Time.now
-    opt[:new_item] ||= false
-    opt[:note] ||= false
-
-    opt[:section] = guess_section(opt[:section])
-
-    tag.sub!(/^@/, '')
-
-    found_items = 0
-    @content[opt[:section]]['items'].each_with_index do |item, i|
-      next unless item['title'] =~ /@#{tag}/
-
-      title = item['title'].gsub(/(^| )@(#{tag}|done)(\([^)]*\))?/, '')
-      title += " @done(#{opt[:back].strftime('%F %R')})"
-
-      @content[opt[:section]]['items'][i]['title'] = title
-      found_items += 1
-
-      if opt[:archive] && opt[:section] != 'Archive'
-        @results.push(%(Completed and archived "#{@content[opt[:section]]['items'][i]['title']}"))
-        archive_item = @content[opt[:section]]['items'][i]
-        archive_item['title'] = i['title'].sub(/(?:@from\(.*?\))?(.*)$/, "\\1 @from(#{i['section']})")
-        @content['Archive']['items'].push(archive_item)
-        @content[opt[:section]]['items'].delete_at(i)
+      if item.nil?
+        logger.debug('Skipped:', 'No entries found')
+        return
+      end
+
+      content = [item.title.dup]
+      content << item.note.to_s unless item.note.empty?
+      new_item = fork_editor(content.join("\n"))
+      title, note = format_input(new_item)
+
+      if title.nil? || title.empty?
+        logger.debug('Skipped:', 'No content provided')
+      elsif title == item.title && note.equal?(item.note)
+        logger.debug('Skipped:', 'No change in content')
       else
-        @results.push(%(Completed "#{@content[opt[:section]]['items'][i]['title']}"))
+        item.title = title
+        item.note.add(note, replace: true)
+        logger.info('Edited:', item.title)
+
+        write(@doing_file)
       end
     end
 
-    @results.push("No active @#{tag} tasks found.") if found_items == 0
+    ##
+    ## @brief      Accepts one tag and the raw text of a new item if the passed tag
+    ##             is on any item, it's replaced with @done. if new_item is not
+    ##             nil, it's tagged with the passed tag and inserted. This is for
+    ##             use where only one instance of a given tag should exist
+    ##             (@meanwhile)
+    ##
+    ## @param      tag   (String) Tag to replace
+    ## @param      opt   (Hash) Additional Options
+    ##
+    def stop_start(target_tag, opt = {})
+      tag = target_tag.dup
+      opt[:section] ||= @config['current_section']
+      opt[:archive] ||= false
+      opt[:back] ||= Time.now
+      opt[:new_item] ||= false
+      opt[:note] ||= false
 
-    if opt[:new_item]
-      title, note = format_input(opt[:new_item])
-      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
+      opt[:section] = guess_section(opt[:section])
 
-    write(@doing_file)
-  end
+      tag.sub!(/^@/, '')
 
-  ##
-  ## @brief      Write content to file or STDOUT
-  ##
-  ## @param      file  (String) The filepath to write to
-  ##
-  def write(file = nil, backup: true)
-    output = @other_content_top ? "#{@other_content_top.join("\n")}\n" : ''
+      found_items = 0
 
-    @content.each do |title, section|
-      output += "#{section['original']}\n"
-      output += list_section({ section: title, template: "\t- %date | %title%note", highlight: false })
-    end
-    output += @other_content_bottom.join("\n") unless @other_content_bottom.nil?
-    if file.nil?
-      $stdout.puts output
-    else
-      file = File.expand_path(file)
-      if File.exist?(file) && backup
-        # Create a backup copy for the undo command
-        FileUtils.cp(file, "#{file}~")
-      end
+      @content[opt[:section]][:items].each_with_index do |item, i|
+        next unless item.title =~ /@#{tag}/
 
-      File.open(file, 'w+') do |f|
-        f.puts output
-      end
+        item.title.add_tags!([tag, 'done'], remove: true)
+        item.tag('done', value: opt[:back].strftime('%F %R'))
+
+        found_items += 1
 
-      if @config.key?('run_after')
-        stdout, stderr, status = Open3.capture3(@config['run_after'])
-        if status.exitstatus.positive?
-          warn "Error running #{@config['run_after']}"
-          warn stderr
+        if opt[:archive] && opt[:section] != 'Archive'
+          item.title = item.title.sub(/(?:@from\(.*?\))?(.*)$/, "\\1 @from(#{item.section})")
+          move_item(item, 'Archive', label: false)
+          logger.count(:completed_archived)
+          logger.debug('Completed/archived:', item.title)
+        else
+          logger.count(:completed)
+          logger.debug('Completed:', item.title)
         end
       end
-    end
-  end
-
-  ##
-  ## @brief      Restore a backed up version of a file
-  ##
-  ## @param      file  (String) The filepath to restore
-  ##
-  def restore_backup(file)
-    if File.exist?(file + '~')
-      puts file + '~'
-      FileUtils.cp(file + '~', file)
-      @results.push("Restored #{file}")
-    end
-  end
-
-  ##
-  ## @brief      Rename doing file with date and start fresh one
-  ##
-  def rotate(opt = {})
-    count = opt[:keep] || 0
-    tags = []
-    tags.concat(opt[:tag].split(/ *, */).map { |t| t.sub(/^@/, '').strip }) if opt[:tag]
-    bool  = opt[:bool] || :and
-    sect = opt[:section] !~ /^all$/i ? guess_section(opt[:section]) : 'all'
-
-    if sect =~ /^all$/i
-      all_sections = sections.dup
-    else
-      all_sections = [sect]
-    end
 
-    counter = 0
-    new_content = {}
+      logger.debug('Skipped:', "No active @#{tag} tasks found.") if found_items.zero?
 
+      if opt[:new_item]
+        title, note = format_input(opt[:new_item])
+        note.add(opt[:note]) if opt[:note]
+        title.tag!(tag)
+        add_item(title.cap_first, opt[:section], { note: note, back: opt[:back] })
+      end
 
-    all_sections.each do |section|
-      items = @content[section]['items'].dup
-      new_content[section] = {}
-      new_content[section]['original'] = @content[section]['original']
-      new_content[section]['items'] = []
+      write(@doing_file)
+    end
 
-      moved_items = []
-      if !tags.empty? || opt[:search] || opt[:before]
-        if opt[:before]
-          time_string = opt[:before]
-          time_string += ' 12am' if time_string !~ /(\d+:\d+|\d+[ap])/
-          cutoff = chronify(time_string)
-        end
+    ##
+    ## @brief      Write content to file or STDOUT
+    ##
+    ## @param      file  (String) The filepath to write to
+    ##
+    def write(file = nil, backup: true)
+      Hooks.trigger :pre_write, self, file
+      output = wrapped_content
 
-        items.delete_if do |item|
-          if ((!tags.empty? && item.has_tags?(tags, bool)) || (opt[:search] && item.matches_search?(opt[:search].to_s)) || (opt[:before] && item['date'] < cutoff))
-            moved_items.push(item)
-            counter += 1
-            true
-          else
-            false
-          end
-        end
-        @content[section]['items'] = items
-        new_content[section]['items'] = moved_items
-        @results.push("Rotated #{moved_items.length} items from #{section}")
+      if file.nil?
+        $stdout.puts output
       else
-        new_content[section]['items'] = []
-        moved_items = []
+        Util.write_to_file(file, output, backup: backup)
+        run_after if @config.key?('run_after')
+      end
+    end
 
-        count = items.length if items.length < count
+    def wrapped_content
+      output = @other_content_top ? "#{@other_content_top.join("\n")}\n" : ''
 
-        if items.count > count
-          moved_items.concat(items[count..-1])
-        else
-          moved_items.concat(items)
-        end
+      @content.each do |title, section|
+        output += "#{section[:original]}\n"
+        output += list_section({ section: title, template: "\t- %date | %title%t2note", highlight: false, wrap_width: 0 })
+      end
 
-        @content[section]['items'] = if count.zero?
-                                       []
-                                     else
-                                       items[0..count - 1]
-                                     end
-        new_content[section]['items'] = moved_items
+      output + @other_content_bottom.join("\n") unless @other_content_bottom.nil?
+    end
 
-        @results.push("Rotated #{items.length - count} items from #{section}")
+    ##
+    ## @brief      Restore a backed up version of a file
+    ##
+    ## @param      file  (String) The filepath to restore
+    ##
+    def restore_backup(file)
+      if File.exist?("#{file}~")
+        FileUtils.cp("#{file}~", file)
+        logger.warn('File update:', "Restored #{file.sub(/^#{@user_home}/, '~')}")
+      else
+        logger.error('Restore error:', 'No backup file found')
       end
     end
 
-    write(@doing_file)
+    ##
+    ## @brief      Rename doing file with date and start fresh one
+    ##
+    def rotate(opt = {})
+      keep = opt[:keep] || 0
+      tags = []
+      tags.concat(opt[:tag].split(/ *, */).map { |t| t.sub(/^@/, '').strip }) if opt[:tag]
+      bool  = opt[:bool] || :and
+      sect = opt[:section] !~ /^all$/i ? guess_section(opt[:section]) : 'all'
 
-    file = @doing_file.sub(/(\.\w+)$/, "_#{Time.now.strftime('%Y-%m-%d')}\\1")
-    if File.exist?(file)
-      init_doing_file(file)
-      @content.deep_merge(new_content)
-    else
-      @content = new_content
-    end
+      if sect =~ /^all$/i
+        all_sections = sections.dup
+      else
+        all_sections = [sect]
+      end
 
-    write(file, backup: false)
-  end
+      counter = 0
+      new_content = {}
 
-  ##
-  ## @brief      Generate a menu of sections and allow user selection
-  ##
-  ## @return     (String) The selected section name
-  ##
-  def choose_section
-    choice = choose_from(sections.sort, prompt: 'Choose a section > ', fzf_args: ['--height=60%'])
-    choice ? choice.strip : choice
-  end
 
-  ##
-  ## @brief      List available views
-  ##
-  ## @return     (Array) View names
-  ##
-  def views
-    @config.has_key?('views') ? @config['views'].keys : []
-  end
+      all_sections.each do |section|
+        items = @content[section][:items].dup
+        new_content[section] = {}
+        new_content[section][:original] = @content[section][:original]
+        new_content[section][:items] = []
 
-  ##
-  ## @brief      Generate a menu of views and allow user selection
-  ##
-  ## @return     (String) The selected view name
-  ##
-  def choose_view
-    choice = choose_from(views.sort, prompt: 'Choose a view > ', fzf_args: ['--height=60%'])
-    choice ? choice.strip : choice
-  end
+        moved_items = []
+        if !tags.empty? || opt[:search] || opt[:before]
+          if opt[:before]
+            time_string = opt[:before]
+            cutoff = chronify(time_string, guess: :begin)
+          end
 
-  ##
-  ## @brief      Gets a view from configuration
-  ##
-  ## @param      title  (String) The title of the view to retrieve
-  ##
-  def get_view(title)
-    return @config['views'][title] if @config['views'].has_key?(title)
+          items.delete_if do |item|
+            if ((!tags.empty? && item.tags?(tags, bool)) || (opt[:search] && item.search(opt[:search].to_s)) || (opt[:before] && item.date < cutoff))
+              moved_items.push(item)
+              counter += 1
+              true
+            else
+              false
+            end
+          end
+          @content[section][:items] = items
+          new_content[section][:items] = moved_items
+          logger.warn('Rotated:', "#{moved_items.length} items from #{section}")
+        else
+          new_content[section][:items] = []
+          moved_items = []
 
-    false
-  end
+          count = items.length < keep ? items.length : keep
 
-  ##
-  ## @brief      Overachieving function for displaying contents of a section.
-  ##             This is a fucking mess. I mean, Jesus Christ.
-  ##
-  ## @param      opt   (Hash) Additional Options
-  ##
-  def list_section(opt = {})
-    opt[:count] ||= 0
-    count = opt[:count] - 1
-    opt[:age] ||= 'newest'
-    opt[:date_filter] ||= []
-    opt[:format] ||= @default_date_format
-    opt[:only_timed] ||= false
-    opt[:order] ||= 'desc'
-    opt[:search] ||= false
-    opt[:section] ||= nil
-    opt[:sort_tags] ||= false
-    opt[:tag_filter] ||= false
-    opt[:tag_order] ||= 'asc'
-    opt[:tags_color] ||= false
-    opt[:template] ||= @default_template
-    opt[:times] ||= false
-    opt[:today] ||= false
-    opt[:totals] ||= false
-
-    # opt[:highlight] ||= true
-    section = ''
-    if opt[:section].nil?
-      section = choose_section
-      opt[:section] = @content[section]
-    elsif opt[:section].instance_of?(String)
-      if opt[:section] =~ /^all$/i
-        combined = { 'items' => [] }
-        @content.each do |_k, v|
-          combined['items'] += v['items']
+          if items.count > count
+            moved_items.concat(items[count..-1])
+          else
+            moved_items.concat(items)
+          end
+
+          @content[section][:items] = if count.zero?
+                                         []
+                                       else
+                                         items[0..count - 1]
+                                       end
+          new_content[section][:items] = moved_items
+
+          logger.warn('Rotated:', "#{items.length - count} items from #{section}")
         end
-        section = if opt[:tag_filter] && opt[:tag_filter]['bool'].normalize_bool != :not
-                    opt[:tag_filter]['tags'].map do |tag|
-                      "@#{tag}"
-                    end.join(' + ')
+      end
+
+      write(@doing_file)
+
+      file = @doing_file.sub(/(\.\w+)$/, "_#{Time.now.strftime('%Y-%m-%d')}\\1")
+      if File.exist?(file)
+        init_doing_file(file)
+        @content.deep_merge(new_content)
+        logger.warn('File update:', "Added entries to existing file: #{file}")
+      else
+        @content = new_content
+        logger.warn('File update:', "Created new file: #{file}")
+      end
+
+      write(file, backup: false)
+    end
+
+    ##
+    ## @brief      Generate a menu of sections and allow user selection
+    ##
+    ## @return     (String) The selected section name
+    ##
+    def choose_section
+      choice = choose_from(sections.sort, prompt: 'Choose a section > ', fzf_args: ['--height=60%'])
+      choice ? choice.strip : choice
+    end
+
+    ##
+    ## @brief      List available views
+    ##
+    ## @return     (Array) View names
+    ##
+    def views
+      @config.has_key?('views') ? @config['views'].keys : []
+    end
+
+    ##
+    ## @brief      Generate a menu of views and allow user selection
+    ##
+    ## @return     (String) The selected view name
+    ##
+    def choose_view
+      choice = choose_from(views.sort, prompt: 'Choose a view > ', fzf_args: ['--height=60%'])
+      choice ? choice.strip : choice
+    end
+
+    ##
+    ## @brief      Gets a view from configuration
+    ##
+    ## @param      title  (String) The title of the view to retrieve
+    ##
+    def get_view(title)
+      return @config['views'][title] if @config['views'].has_key?(title)
+
+      false
+    end
+
+    ##
+    ## @brief      Display contents of a section based on options
+    ##
+    ## @param      opt   (Hash) Additional Options
+    ##
+    def list_section(opt = {})
+      opt[:count] ||= 0
+      opt[:age] ||= 'newest'
+      opt[:format] ||= @config.dig('templates', 'default', 'date_format')
+      opt[:order] ||= @config.dig('templates', 'default', 'order') || 'asc'
+      opt[:tag_order] ||= 'asc'
+      opt[:tags_color] ||= false
+      opt[:template] ||= @config.dig('templates', 'default', 'template')
+
+      # opt[:highlight] ||= true
+      title = ''
+      is_single = true
+      if opt[:section].nil?
+        opt[:section] = choose_section
+        title = opt[:section]
+      elsif opt[:section].instance_of?(String)
+        if opt[:section] =~ /^all$/i
+          title = if opt[:page_title]
+                    opt[:page_title]
+                  elsif opt[:tag_filter] && opt[:tag_filter]['bool'].normalize_bool != :not
+                    opt[:tag_filter]['tags'].map { |tag| "@#{tag}" }.join(' + ')
                   else
                     'doing'
                   end
-        opt[:section] = combined
-      else
-        section = guess_section(opt[:section])
-        opt[:section] = @content[section]
+        else
+          title = guess_section(opt[:section])
+        end
       end
-    end
 
-    exit_now! 'Invalid section object' unless opt[:section].instance_of? Hash
+      items = filter_items([], opt: opt).reverse
 
-    items = opt[:section]['items'].sort_by { |item| item['date'] }
+      items.reverse! if opt[:order] =~ /^d/i
 
-    if opt[:date_filter].length == 2
-      start_date = opt[:date_filter][0]
-      end_date = opt[:date_filter][1]
-      items.keep_if do |item|
-        if end_date
-          item['date'] >= start_date && item['date'] <= end_date
-        else
-          item['date'].strftime('%F') == start_date.strftime('%F')
+
+      if opt[:interactive]
+        opt[:menu] = !opt[:force]
+        opt[:query] = '' # opt[:search]
+        opt[:multiple] = true
+        selected = choose_from_items(items, opt, include_section: opt[:section] =~ /^all$/i )
+
+        if selected.empty?
+          logger.debug('Skipped:', 'No selection')
+          return
         end
+
+        act_on(selected, opt)
+        return
       end
-    end
 
-    if opt[:tag_filter] && !opt[:tag_filter]['tags'].empty?
-      items.select! { |item| item.has_tags?(opt[:tag_filter]['tags'], opt[:tag_filter]['bool']) }
-    end
 
-    if opt[:search]
-      items.keep_if {|item| item.matches_search?(opt[:search]) }
-    end
+      opt[:output] ||= 'template'
 
-    if opt[:only_timed]
-      items.delete_if do |item|
-        get_interval(item, record: false) == false
-      end
-    end
+      opt[:wrap_width] ||= @config['templates']['default']['wrap_width']
 
-    if opt[:before]
-      time_string = opt[:before]
-      time_string += ' 12am' if time_string !~ /(\d+:\d+|\d+[ap])/
-      cutoff = chronify(time_string)
-      if cutoff
-        items.delete_if { |item| item['date'] >= cutoff }
-      end
+      output(items, title, is_single, opt)
     end
 
-    if opt[:after]
-      time_string = opt[:after]
-      time_string += ' 11:59pm' if time_string !~ /(\d+:\d+|\d+[ap])/
-      cutoff = chronify(time_string)
-      if cutoff
-        items.delete_if { |item| item['date'] <= cutoff }
-      end
-    end
+    def output(items, title, is_single, opt = {})
+      out = nil
 
-    if opt[:today]
-      items.delete_if do |item|
-        item['date'] < Date.today.to_time
-      end.reverse!
-      section = Time.now.strftime('%A, %B %d')
-    elsif opt[:yesterday]
-      items.delete_if do |item|
-        item['date'] <= Date.today.prev_day.to_time or
-          item['date'] >= Date.today.to_time
-      end.reverse!
-    elsif opt[:age] =~ /oldest/i
-      items = items[0..count]
-    else
-      items = items.reverse[0..count]
-    end
+      raise Errors::InvalidArgument, 'Unknown output format' unless opt[:output] =~ Plugins.plugin_regex(type: :export)
 
-    items.reverse! if opt[:order] =~ /^a/i
+      export_options = { page_title: title, is_single: is_single, options: opt }
 
-    out = ''
+      Plugins.plugins[:export].each do |_, options|
+        next unless opt[:output] =~ /^(#{options[:trigger].normalize_trigger})$/i
 
-    exit_now! 'Unknown output format' if opt[:output] && (opt[:output] !~ /^(template|html|csv|json|timeline)$/i)
+        out = options[:class].render(self, items, variables: export_options)
+        break
+      end
 
-    case opt[:output]
-    when /^csv$/i
-      output = [CSV.generate_line(%w[date title note timer section])]
-      items.each do |i|
-        note = ''
-        if i['note']
-          arr = i['note'].map { |line| line.strip }.delete_if { |e| e =~ /^\s*$/ }
-          note = arr.join("\n") unless arr.nil?
-        end
-        interval = get_interval(i, formatted: false) if i['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
-        interval ||= 0
-        output.push(CSV.generate_line([i['date'], i['title'], note, interval, i['section']]))
-      end
-      out = output.join('')
-    when /^(json|timeline)/i
-      items_out = []
-      max = items[-1]['date'].strftime('%F')
-      min = items[0]['date'].strftime('%F')
-      items.each_with_index do |i, index|
-        if String.method_defined? :force_encoding
-          title = i['title'].force_encoding('utf-8')
-          note = i['note'].map { |line| line.force_encoding('utf-8').strip } if i['note']
-        else
-          title = i['title']
-          note = i['note'].map { |line| line.strip } if i['note']
-        end
-        if i['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
-          end_date = Time.parse(Regexp.last_match(1))
-          interval = get_interval(i, formatted: false)
-        end
-        end_date ||= ''
-        interval ||= 0
-        note ||= ''
-
-        tags = []
-        attributes = {}
-        skip_tags = %w[meanwhile done cancelled flagged]
-        i['title'].scan(/@([^(\s]+)(?:\((.*?)\))?/).each do |tag|
-          tags.push(tag[0]) unless skip_tags.include?(tag[0])
-          attributes[tag[0]] = tag[1] if tag[1]
+      out
+    end
+
+    def load_plugins
+      if @config.key?('plugins') && @config['plugins']['plugin_path']
+        add_dir = @config['plugins']['plugin_path']
+      else
+        add_dir = File.join(@user_home, '.config', 'doing', 'plugins')
+        begin
+          FileUtils.mkdir_p(add_dir) if add_dir
+        rescue
+          nil
         end
+      end
 
-        if opt[:output] == 'json'
+      Plugins.load_plugins(add_dir)
+    end
 
-          i = {
-            date: i['date'],
-            end_date: end_date,
-            title: title.strip, #+ " #{note}"
-            note: note.instance_of?(Array) ? note.map(&:strip).join("\n") : note,
-            time: '%02d:%02d:%02d' % fmt_time(interval),
-            tags: tags
-          }
+    ##
+    ## @brief      Move entries from a section to Archive or other specified
+    ##             section
+    ##
+    ## @param      section      (String) The source section
+    ## @param      options      (Hash) Options
+    ##
+    def archive(section = @config['current_section'], options = {})
+      count       = options[:keep] || 0
+      destination = options[:destination] || 'Archive'
+      tags        = options[:tags] || []
+      bool        = options[:bool] || :and
 
-          attributes.each { |attr, val| i[attr.to_sym] = val }
+      section = choose_section if section.nil? || section =~ /choose/i
+      archive_all = section =~ /^all$/i # && !(tags.nil? || tags.empty?)
+      section = guess_section(section) unless archive_all
 
-          items_out << i
+      add_section('Archive') if destination =~ /^archive$/i && !sections.include?('Archive')
 
-        elsif opt[:output] == 'timeline'
-          new_item = {
-            'id' => index + 1,
-            'content' => title.strip, #+ " #{note}"
-            'title' => title.strip + " (#{'%02d:%02d:%02d' % fmt_time(interval)})",
-            'start' => i['date'].strftime('%F %T'),
-            'type' => 'point'
-          }
+      destination = guess_section(destination)
 
-          if interval && interval.to_i > 0
-            new_item['end'] = end_date.strftime('%F %T')
-            new_item['type'] = 'range' if interval.to_i > 3600 * 3
-          end
-          items_out.push(new_item)
-        end
+      if sections.include?(destination) && (sections.include?(section) || archive_all)
+        do_archive(section, destination, { count: count, tags: tags, bool: bool, search: options[:search], label: options[:label], before: options[:before] })
+        write(doing_file)
+      else
+        raise Errors::InvalidArgument, 'Either source or destination does not exist'
       end
-      if opt[:output] == 'json'
-        puts JSON.pretty_generate({
-          'section' => section,
-          'items' => items_out,
-          'timers' => tag_times(format: 'json', sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order])
-        })
-      elsif opt[:output] == 'timeline'
-        template = <<~EOTEMPLATE
-                    <!doctype html>
-                    <html>
-                    <head>
-                      <link href="https://unpkg.com/vis-timeline@7.4.9/dist/vis-timeline-graph2d.min.css" rel="stylesheet" type="text/css" />
-                      <script src="https://unpkg.com/vis-timeline@7.4.9/dist/vis-timeline-graph2d.min.js"></script>
-                    </head>
-                    <body>
-                      <div id="mytimeline"></div>
-          #{'          '}
-                      <script type="text/javascript">
-                        // DOM element where the Timeline will be attached
-                        var container = document.getElementById('mytimeline');
-          #{'          '}
-                        // Create a DataSet with data (enables two way data binding)
-                        var data = new vis.DataSet(#{items_out.to_json});
-          #{'          '}
-                        // Configuration for the Timeline
-                        var options = {
-                          width: '100%',
-                          height: '800px',
-                          margin: {
-                            item: 20
-                          },
-                          stack: true,
-                          min: '#{min}',
-                          max: '#{max}'
-                        };
-          #{'          '}
-                        // Create a Timeline
-                        var timeline = new vis.Timeline(container, data, options);
-                      </script>
-                    </body>
-                    </html>
-        EOTEMPLATE
-        return template
-      end
-    when /^html$/i
-      page_title = section
-      items_out = []
-      items.each do |i|
-        # if i.has_key?('note')
-        #   note = '<span class="note">' + i['note'].map{|n| n.strip }.join('<br>') + '</span>'
-        # else
-        #   note = ''
-        # end
-        if String.method_defined? :force_encoding
-          title = i['title'].force_encoding('utf-8').link_urls
-          note = i['note'].map { |line| line.force_encoding('utf-8').strip.link_urls } if i['note']
-        else
-          title = i['title'].link_urls
-          note = i['note'].map { |line| line.strip.link_urls } if i['note']
-        end
-
-        interval = get_interval(i) if i['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
-        interval ||= false
+    end
 
-        items_out << {
-          date: i['date'].strftime('%a %-I:%M%p'),
-          title: title.gsub(/(@[^ (]+(\(.*?\))?)/im, '<span class="tag">\1</span>').strip, #+ " #{note}"
-          note: note,
-          time: interval,
-          section: i['section']
-        }
+    ##
+    ## @brief      Helper function, performs the actual archiving
+    ##
+    ## @param      section      (String) The source section
+    ## @param      destination  (String) The destination section
+    ## @param      opt          (Hash) Additional Options
+    ##
+    def do_archive(sect, destination, opt = {})
+      count = opt[:count] || 0
+      tags  = opt[:tags] || []
+      bool  = opt[:bool] || :and
+      label = opt[:label] || true
+
+      if sect =~ /^all$/i
+        all_sections = sections.dup
+        all_sections.delete(destination)
+      else
+        all_sections = [sect]
       end
 
-      template = if @config['html_template']['haml'] && File.exist?(File.expand_path(@config['html_template']['haml']))
-                   IO.read(File.expand_path(@config['html_template']['haml']))
-                 else
-                   haml_template
-                 end
+      counter = 0
 
-      style = if @config['html_template']['css'] && File.exist?(File.expand_path(@config['html_template']['css']))
-                IO.read(File.expand_path(@config['html_template']['css']))
-              else
-                css_template
-              end
+      all_sections.each do |section|
+        items = @content[section][:items].dup
 
-      totals = opt[:totals] ? tag_times(format: 'html', sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order]) : ''
-      engine = Haml::Engine.new(template)
-      out = engine.render(Object.new,
-                         { :@items => items_out, :@page_title => page_title, :@style => style, :@totals => totals })
-    else
-      items.each do |item|
-        if opt[:highlight] && item['title'] =~ /@#{@config['marker_tag']}\b/i
-          flag = colors[@config['marker_color']]
-          reset = colors['default']
-        else
-          flag = ''
-          reset = ''
-        end
+        moved_items = []
+        if !tags.empty? || opt[:search] || opt[:before]
+          if opt[:before]
+            time_string = opt[:before]
+            cutoff = chronify(time_string, guess: :begin)
+          end
 
-        if (item.key?('note') && !item['note'].empty?) && @config[:include_notes]
-          note_lines = item['note'].delete_if do |line|
-            line =~ /^\s*$/
+          items.delete_if do |item|
+            if ((!tags.empty? && item.tags?(tags, bool)) || (opt[:search] && item.search(opt[:search].to_s)) || (opt[:before] && item.date < cutoff))
+              moved_items.push(item)
+              counter += 1
+              true
+            else
+              false
+            end
           end
-          note_lines.map! { |line| "\t\t#{line.sub(/^\t*/, '').sub(/^-/, '—')}  " }
-          if opt[:wrap_width]&.positive?
-            width = opt[:wrap_width]
-            note_lines.map! do |line|
-              line.strip.gsub(/(.{1,#{width}})(\s+|\Z)/, "\t\\1\n")
+          moved_items.each do |item|
+            if label
+              item.title = if section == @config['current_section']
+                             item.title.sub(/(?: ?@from\(.*?\))?(.*)$/, '\1')
+                           else
+                             item.title.sub(/(?: ?@from\(.*?\))?(.*)$/, "\\1 @from(#{section})")
+                           end
+              logger.debug('Moved:', "#{item.title} from #{section} to #{destination}")
             end
           end
-          note = "\n#{note_lines.join("\n").chomp}"
-        else
-          note = ''
-        end
-        output = opt[:template].dup
 
-        output.gsub!(/%[a-z]+/) do |m|
-          if colors.key?(m.sub(/^%/, ''))
-            colors[m.sub(/^%/, '')]
-          else
-            m
+          @content[section][:items] = items
+          @content[destination][:items].concat(moved_items)
+          if moved_items.length.positive?
+            logger.info('Archived:', "#{moved_items.length} items from #{section} to #{destination}")
           end
-        end
-
-        output.sub!(/%date/, item['date'].strftime(opt[:format]))
-
-        interval = get_interval(item, record: true) if item['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
-        interval ||= ''
-        output.sub!(/%interval/, interval)
+        else
+          count = items.length if items.length < count
 
-        output.sub!(/%shortdate/) do
-          if item['date'] > Date.today.to_time
-            item['date'].strftime('    %_I:%M%P')
-          elsif item['date'] > (Date.today - 6).to_time
-            item['date'].strftime('%a %_I:%M%P')
-          elsif item['date'].year == Date.today.year
-            item['date'].strftime('%m/%d %_I:%M%P')
-          else
-            item['date'].strftime('%m/%d/%Y %_I:%M%P')
+          items.map! do |item|
+            if label
+              item.title = if section == @config['current_section']
+                             item.title.sub(/(?: ?@from\(.*?\))?(.*)$/, '\1')
+                           else
+                             item.title.sub(/(?: ?@from\(.*?\))?(.*)$/, "\\1 @from(#{section})")
+                           end
+              logger.debug('Moved:', "#{item.title} from #{section} to #{destination}")
+            end
+            item
           end
-        end
 
-        output.sub!(/%title/) do |_m|
-          if opt[:wrap_width] && opt[:wrap_width] > 0
-            flag + item['title'].gsub(/(.{1,#{opt[:wrap_width]}})(\s+|\Z)/, "\\1\n\t ").chomp + reset
+          if items.count > count
+            @content[destination][:items].concat(items[count..-1])
           else
-            flag + item['title'].chomp + reset
+            @content[destination][:items].concat(items)
           end
-        end
-
-        output.sub!(/%section/, item['section']) if item['section']
 
-        if opt[:tags_color]
-          escapes = output.scan(/(\e\[[\d;]+m)[^\e]+@/)
-          last_color = if escapes.length > 0
-                         escapes[-1][0]
-                       else
-                         colors['default']
-                       end
-          output.gsub!(/(\s|m)(@[^ (]+)/, "\\1#{colors[opt[:tags_color]]}\\2#{last_color}")
+          @content[section][:items] = if count.zero?
+                                        []
+                                      else
+                                        items[0..count - 1]
+                                      end
+          logger.count(destination == 'Archive' ? :archived : :moved,
+                       count: items.length - count,
+                       message: "%count %items from #{section} to #{destination}")
+          # logger.info('Archived:', "#{items.length - count} items from #{section} to #{destination}")
         end
-        output.sub!(/%note/, note)
-        output.sub!(/%odnote/, note.gsub(/^\t*/, ''))
-        output.sub!(/%chompnote/, note.gsub(/\n+/, ' ').gsub(/(^\s*|\s*$)/, '').gsub(/\s+/, ' '))
-        output.gsub!(/%hr(_under)?/) do |_m|
-          o = ''
-          `tput cols`.to_i.times do
-            o += Regexp.last_match(1).nil? ? '-' : '_'
-          end
-          o
-        end
-        output.gsub!(/%n/, "\n")
-        output.gsub!(/%t/, "\t")
-
-        out += "#{output}\n"
       end
-
-      out += tag_times(format: 'text', sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order]) if opt[:totals]
     end
-    out
-  end
 
-  ##
-  ## @brief      Move entries from a section to Archive or other specified
-  ##             section
-  ##
-  ## @param      section      (String) The source section
-  ## @param      options      (Hash) Options
-  ##
-  def archive(section = @current_section, options = {})
-    count       = options[:keep] || 0
-    destination = options[:destination] || 'Archive'
-    tags        = options[:tags] || []
-    bool        = options[:bool] || :and
+    ##
+    ## @brief      Show all entries from the current day
+    ##
+    ## @param      times   (Boolean) show times
+    ## @param      output  (String) output format
+    ## @param      opt     (Hash) Options
+    ##
+    def today(times = true, output = nil, opt = {})
+      opt[:totals] ||= false
+      opt[:sort_tags] ||= false
+
+      cfg = @config['templates']['today']
+      options = {
+        after: opt[:after],
+        before: opt[:before],
+        count: 0,
+        format: cfg['date_format'],
+        order: 'asc',
+        output: output,
+        section: opt[:section],
+        sort_tags: opt[:sort_tags],
+        template: cfg['template'],
+        times: times,
+        today: true,
+        totals: opt[:totals],
+        wrap_width: cfg['wrap_width']
+      }
+      list_section(options)
+    end
+
+    ##
+    ## @brief      Display entries within a date range
+    ##
+    ## @param      dates    (Array) [start, end]
+    ## @param      section  (String) The section
+    ## @param      times    (Bool) Show times
+    ## @param      output   (String) Output format
+    ## @param      opt      (Hash) Additional Options
+    ##
+    def list_date(dates, section, times = nil, output = nil, opt = {})
+      opt[:totals] ||= false
+      opt[:sort_tags] ||= false
+      section = guess_section(section)
+      # :date_filter expects an array with start and end date
+      dates = [dates, dates] if dates.instance_of?(String)
+
+      list_section({ section: section, count: 0, order: 'asc', date_filter: dates, times: times,
+                     output: output, totals: opt[:totals], sort_tags: opt[:sort_tags] })
+    end
+
+    ##
+    ## @brief      Show entries from the previous day
+    ##
+    ## @param      section  (String) The section
+    ## @param      times    (Bool) Show times
+    ## @param      output   (String) Output format
+    ## @param      opt      (Hash) Additional Options
+    ##
+    def yesterday(section, times = nil, output = nil, opt = {})
+      opt[:totals] ||= false
+      opt[:sort_tags] ||= false
+      section = guess_section(section)
+      y = (Time.now - (60 * 60 * 24)).strftime('%Y-%m-%d')
+      opt[:after] = "#{y} #{opt[:after]}" if opt[:after]
+      opt[:before] = "#{y} #{opt[:before]}" if opt[:before]
+
+      options = {
+        after: opt[:after],
+        before: opt[:before],
+        count: 0,
+        order: opt[:order],
+        output: output,
+        section: section,
+        sort_tags: opt[:sort_tags],
+        tag_order: opt[:tag_order],
+        times: times,
+        totals: opt[:totals],
+        yesterday: true
+      }
 
-    section = choose_section if section.nil? || section =~ /choose/i
-    archive_all = section =~ /^all$/i # && !(tags.nil? || tags.empty?)
-    section = guess_section(section) unless archive_all
+      list_section(options)
+    end
+
+    ##
+    ## @brief      Show recent entries
+    ##
+    ## @param      count    (Integer) The number to show
+    ## @param      section  (String) The section to show from, default Currently
+    ## @param      opt      (Hash) Additional Options
+    ##
+    def recent(count = 10, section = nil, opt = {})
+      times = opt[:t] || true
+      opt[:totals] ||= false
+      opt[:sort_tags] ||= false
+
+      cfg = @config['templates']['recent']
+      section ||= @config['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], tags_color: opt[:tags_color] })
+    end
+
+    ##
+    ## @brief      Show the last entry
+    ##
+    ## @param      times    (Bool) Show times
+    ## @param      section  (String) Section to pull from, default Currently
+    ##
+    def last(times: true, section: nil, options: {})
+      section = section.nil? || section =~ /all/i ? 'All' : guess_section(section)
+      cfg = @config['templates']['last']
+
+      opts = {
+        section: section,
+        wrap_width: cfg['wrap_width'],
+        count: 1,
+        format: cfg['date_format'],
+        template: cfg['template'],
+        times: times
+      }
 
-    add_section('Archive') if destination =~ /^archive$/i && !sections.include?('Archive')
+      if options[:tag]
+        opts[:tag_filter] = {
+          'tags' => options[:tag],
+          'bool' => options[:tag_bool]
+        }
+      end
 
-    destination = guess_section(destination)
+      opts[:search] = options[:search] if options[:search]
 
-    if sections.include?(destination) && (sections.include?(section) || archive_all)
-      do_archive(section, destination, { count: count, tags: tags, bool: bool, search: options[:search], label: options[:label], before: options[:before] })
-      write(doing_file)
-    else
-      exit_now! 'Either source or destination does not exist'
+      list_section(opts)
     end
-  end
 
-  ##
-  ## @brief      Helper function, performs the actual archiving
-  ##
-  ## @param      section      (String) The source section
-  ## @param      destination  (String) The destination section
-  ## @param      opt          (Hash) Additional Options
-  ##
-  def do_archive(sect, destination, opt = {})
-    count = opt[:count] || 0
-    tags  = opt[:tags] || []
-    bool  = opt[:bool] || :and
-    label = opt[:label] || true
-
-    if sect =~ /^all$/i
-      all_sections = sections.dup
-      all_sections.delete(destination)
-    else
-      all_sections = [sect]
-    end
+    ##
+    ## @brief Uses 'autotag' configuration to turn keywords into tags for time tracking.
+    ## Does not repeat tags in a title, and only converts the first instance of an
+    ## untagged keyword
+    ##
+    ## @param      text  (String) The text to tag
+    ##
+    def autotag(text)
+      return unless text
+      return text unless @auto_tag
 
-    counter = 0
+      original = text.dup
 
-    all_sections.each do |section|
-      items = @content[section]['items'].dup
+      current_tags = text.scan(/@\w+/)
+      whitelisted = []
+      @config['autotag']['whitelist'].each do |tag|
+        next if text =~ /@#{tag}\b/i
 
-      moved_items = []
-      if !tags.empty? || opt[:search] || opt[:before]
-        if opt[:before]
-          time_string = opt[:before]
-          time_string += ' 12am' if time_string !~ /(\d+:\d+|\d+[ap])/
-          cutoff = chronify(time_string)
+        text.sub!(/(?<!@)\b(#{tag.strip})\b/i) do |m|
+          m.downcase! if tag =~ /[a-z]/
+          whitelisted.push("@#{m}")
+          "@#{m}"
         end
+      end
+      tail_tags = []
+      @config['autotag']['synonyms'].each do |tag, v|
+        v.each do |word|
+          next unless text =~ /\b#{word}\b/i
 
-        items.delete_if do |item|
-          if ((!tags.empty? && item.has_tags?(tags, bool)) || (opt[:search] && item.matches_search?(opt[:search].to_s)) || (opt[:before] && item['date'] < cutoff))
-            moved_items.push(item)
-            counter += 1
-            true
-          else
-            false
-          end
+          tail_tags.push(tag) unless current_tags.include?("@#{tag}") || whitelisted.include?("@#{tag}")
         end
-        moved_items.each do |item|
-          if label && section != @current_section
-            item['title'] =
-              item['title'].sub(/(?:@from\(.*?\))?(.*)$/, "\\1 @from(#{section})")
-          end
-        end
-
-        @content[section]['items'] = items
-        @content[destination]['items'].concat(moved_items)
-        @results.push("Archived #{moved_items.length} items from #{section} to #{destination}")
-      else
-        count = items.length if items.length < count
-
-        items.map! do |item|
-          if label && section != @current_section
-            item['title'] =
-              item['title'].sub(/(?:@from\(.*?\))?(.*)$/, "\\1 @from(#{section})")
+      end
+      if @config['autotag'].key? 'transform'
+        @config['autotag']['transform'].each do |tag|
+          next unless tag =~ /\S+:\S+/
+
+          rx, r = tag.split(/:/)
+          r.gsub!(/\$/, '\\')
+          rx.sub!(/^@/, '')
+          regex = Regexp.new('@' + rx + '\b')
+
+          matches = text.scan(regex)
+          next unless matches
+
+          matches.each do |m|
+            new_tag = r
+            if m.is_a?(Array)
+              index = 1
+              m.each do |v|
+                new_tag.gsub!('\\' + index.to_s, v)
+                index += 1
+              end
+            end
+            tail_tags.push(new_tag)
           end
-          item
-        end
-
-        if items.count > count
-          @content[destination]['items'].concat(items[count..-1])
-        else
-          @content[destination]['items'].concat(items)
         end
-
-        @content[section]['items'] = if count.zero?
-                                       []
-                                     else
-                                       items[0..count - 1]
-                                     end
-
-        @results.push("Archived #{items.length - count} items from #{section} to #{destination}")
       end
-    end
-  end
-
-  ##
-  ## @brief      A dictionary of colors
-  ##
-  ## @return     (String) ANSI escape sequence
-  ##
-  def colors
-    color = {}
-    color['black'] = "\033[0;0;30m"
-    color['red'] = "\033[0;0;31m"
-    color['green'] = "\033[0;0;32m"
-    color['yellow'] = "\033[0;0;33m"
-    color['blue'] = "\033[0;0;34m"
-    color['magenta'] = "\033[0;0;35m"
-    color['cyan'] = "\033[0;0;36m"
-    color['white'] = "\033[0;0;37m"
-    color['bgblack'] = "\033[40m"
-    color['bgred'] = "\033[41m"
-    color['bggreen'] = "\033[42m"
-    color['bgyellow'] = "\033[43m"
-    color['bgblue'] = "\033[44m"
-    color['bgmagenta'] = "\033[45m"
-    color['bgcyan'] = "\033[46m"
-    color['bgwhite'] = "\033[47m"
-    color['boldblack'] = "\033[1;30m"
-    color['boldred'] = "\033[1;31m"
-    color['boldgreen'] = "\033[0;1;32m"
-    color['boldyellow'] = "\033[0;1;33m"
-    color['boldblue'] = "\033[0;1;34m"
-    color['boldmagenta'] = "\033[0;1;35m"
-    color['boldcyan'] = "\033[0;1;36m"
-    color['boldwhite'] = "\033[0;1;37m"
-    color['boldbgblack'] = "\033[1;40m"
-    color['boldbgred'] = "\033[1;41m"
-    color['boldbggreen'] = "\033[1;42m"
-    color['boldbgyellow'] = "\033[1;43m"
-    color['boldbgblue'] = "\033[1;44m"
-    color['boldbgmagenta'] = "\033[1;45m"
-    color['boldbgcyan'] = "\033[1;46m"
-    color['boldbgwhite'] = "\033[1;47m"
-    color['softpurple'] = "\033[0;35;40m"
-    color['hotpants'] = "\033[7;34;40m"
-    color['knightrider'] = "\033[7;30;40m"
-    color['flamingo'] = "\033[7;31;47m"
-    color['yeller'] = "\033[1;37;43m"
-    color['whiteboard'] = "\033[1;30;47m"
-    color['default'] = "\033[0;39m"
-    color
-  end
 
-  ##
-  ## @brief      Show all entries from the current day
-  ##
-  ## @param      times   (Boolean) show times
-  ## @param      output  (String) output format
-  ## @param      opt     (Hash) Options
-  ##
-  def today(times = true, output = nil, opt = {})
-    opt[:totals] ||= false
-    opt[:sort_tags] ||= false
-
-    cfg = @config['templates']['today']
-    options = {
-      after: opt[:after],
-      before: opt[:before],
-      count: 0,
-      format: cfg['date_format'],
-      order: 'asc',
-      output: output,
-      section: opt[:section],
-      sort_tags: opt[:sort_tags],
-      template: cfg['template'],
-      times: times,
-      today: true,
-      totals: opt[:totals],
-      wrap_width: cfg['wrap_width']
-    }
-    list_section(options)
-  end
+      logger.debug('Autotag:', "Whitelisted tags: #{whitelisted.join(', ')}") unless whitelisted.empty?
+      new_tags = whitelisted
+      unless tail_tags.empty?
+        tags = tail_tags.uniq.map { |t| "@#{t}".cyan }.join(' ')
+        logger.debug('Autotag:', "Synonym tags: #{tags}")
+        tags_a = tail_tags.map { |t| "@#{t}" }
+        text.add_tags!(tags_a.join(' '))
+        new_tags.concat(tags_a)
+      end
 
-  ##
-  ## @brief      Display entries within a date range
-  ##
-  ## @param      dates    (Array) [start, end]
-  ## @param      section  (String) The section
-  ## @param      times    (Bool) Show times
-  ## @param      output   (String) Output format
-  ## @param      opt      (Hash) Additional Options
-  ##
-  def list_date(dates, section, times = nil, output = nil, opt = {})
-    opt[:totals] ||= false
-    opt[:sort_tags] ||= false
-    section = guess_section(section)
-    # :date_filter expects an array with start and end date
-    dates = [dates, dates] if dates.instance_of?(String)
-
-    list_section({ section: section, count: 0, order: 'asc', date_filter: dates, times: times,
-                   output: output, totals: opt[:totals], sort_tags: opt[:sort_tags] })
-  end
+      unless text == original
+        logger.info('Autotag:', "added #{new_tags.join(', ')} to \"#{text}\"")
+      else
+        logger.debug('Autotag:', "no change to \"#{text}\"")
+      end
 
-  ##
-  ## @brief      Show entries from the previous day
-  ##
-  ## @param      section  (String) The section
-  ## @param      times    (Bool) Show times
-  ## @param      output   (String) Output format
-  ## @param      opt      (Hash) Additional Options
-  ##
-  def yesterday(section, times = nil, output = nil, opt = {})
-    opt[:totals] ||= false
-    opt[:sort_tags] ||= false
-    section = guess_section(section)
-    y = (Time.now - (60 * 60 * 24)).strftime('%Y-%m-%d')
-    opt[:after] = "#{y} #{opt[:after]}" if opt[:after]
-    opt[:before] = "#{y} #{opt[:before]}" if opt[:before]
-
-    options = {
-      after: opt[:after],
-      before: opt[:before],
-      count: 0,
-      order: 'asc',
-      output: output,
-      section: section,
-      sort_tags: opt[:sort_tags],
-      tag_order: opt[:tag_order],
-      times: times,
-      totals: opt[:totals],
-      yesterday: true
-    }
-
-    list_section(options)
-  end
+      text
+    end
 
-  ##
-  ## @brief      Show recent entries
-  ##
-  ## @param      count    (Integer) The number to show
-  ## @param      section  (String) The section to show from, default Currently
-  ## @param      opt      (Hash) Additional Options
-  ##
-  def recent(count = 10, section = nil, opt = {})
-    times = opt[:t] || true
-    opt[:totals] ||= false
-    opt[:sort_tags] ||= false
-
-    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], tags_color: opt[:tags_color] })
-  end
+    ##
+    ## @brief      Get total elapsed time for all tags in
+    ##             selection
+    ##
+    ## @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)
+    ##
+    def tag_times(format: :text, sort_by_name: false, sort_order: 'asc')
+      return '' if @timers.empty?
 
-  ##
-  ## @brief      Show the last entry
-  ##
-  ## @param      times    (Bool) Show times
-  ## @param      section  (String) Section to pull from, default Currently
-  ##
-  def last(times: true, section: nil, options: {})
-    section = section.nil? || section =~ /all/i ? 'All' : guess_section(section)
-    cfg = @config['templates']['last']
-
-    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
+      max = @timers.keys.sort_by { |k| k.length }.reverse[0].length + 1
 
-    opts[:search] = options[:search] if options[:search]
+      total = @timers.delete('All')
 
-    list_section(opts)
-  end
+      tags_data = @timers.delete_if { |_k, v| v == 0 }
+      sorted_tags_data = if sort_by_name
+                           tags_data.sort_by { |k, _v| k }
+                         else
+                           tags_data.sort_by { |_k, v| v }
+                         end
 
-  ##
-  ## @brief      Get total elapsed time for all tags in
-  ##             selection
-  ##
-  ## @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)
-  ##
-  def tag_times(format: 'text', sort_by_name: false, sort_order: 'asc')
-    return '' if @timers.empty?
-
-    max = @timers.keys.sort_by { |k| k.length }.reverse[0].length + 1
-
-    total = @timers.delete('All')
-
-    tags_data = @timers.delete_if { |_k, v| v == 0 }
-    sorted_tags_data = if sort_by_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
-
-    if format == 'html'
-      output = <<EOS
-        <table>
-        <caption id="tagtotals">Tag Totals</caption>
-        <colgroup>
-        <col style="text-align:left;"/>
-        <col style="text-align:left;"/>
-        </colgroup>
-        <thead>
+      sorted_tags_data.reverse! if sort_order =~ /^asc/i
+      case format
+      when :html
+
+        output = <<EOS
+          <table>
+          <caption id="tagtotals">Tag Totals</caption>
+          <colgroup>
+          <col style="text-align:left;"/>
+          <col style="text-align:left;"/>
+          </colgroup>
+          <thead>
+          <tr>
+            <th style="text-align:left;">project</th>
+            <th style="text-align:left;">time</th>
+          </tr>
+          </thead>
+          <tbody>
+EOS
+        sorted_tags_data.reverse.each do |k, v|
+          if v > 0
+            output += "<tr><td style='text-align:left;'>#{k}</td><td style='text-align:left;'>#{'%02d:%02d:%02d' % fmt_time(v)}</td></tr>\n"
+          end
+        end
+        tail = <<EOS
         <tr>
-          <th style="text-align:left;">project</th>
-          <th style="text-align:left;">time</th>
+          <td style="text-align:left;" colspan="2"></td>
         </tr>
-        </thead>
-        <tbody>
+        </tbody>
+        <tfoot>
+        <tr>
+          <td style="text-align:left;"><strong>Total</strong></td>
+          <td style="text-align:left;">#{'%02d:%02d:%02d' % fmt_time(total)}</td>
+        </tr>
+        </tfoot>
+        </table>
 EOS
-      sorted_tags_data.reverse.each do |k, v|
-        if v > 0
-          output += "<tr><td style='text-align:left;'>#{k}</td><td style='text-align:left;'>#{'%02d:%02d:%02d' % fmt_time(v)}</td></tr>\n"
+        output + tail
+      when :markdown
+        pad = sorted_tags_data.map {|k, v| k }.group_by(&:size).max.last[0].length
+        output = <<~EOS
+  | #{' ' * (pad - 7) }project | time     |
+  | #{'-' * (pad - 1)}: | :------- |
+        EOS
+        sorted_tags_data.reverse.each do |k, v|
+          if v > 0
+            output += "| #{' ' * (pad - k.length)}#{k} | #{'%02d:%02d:%02d' % fmt_time(v)} |\n"
+          end
         end
-      end
-      tail = <<EOS
-      <tr>
-        <td style="text-align:left;" colspan="2"></td>
-      </tr>
-      </tbody>
-      <tfoot>
-      <tr>
-        <td style="text-align:left;"><strong>Total</strong></td>
-        <td style="text-align:left;">#{'%02d:%02d:%02d' % fmt_time(total)}</td>
-      </tr>
-      </tfoot>
-      </table>
-EOS
-      output + tail
-    elsif format == 'json'
-      output = []
-      sorted_tags_data.reverse.each do |k, v|
-        output << {
-          'tag' => k,
-          'seconds' => v,
-          'formatted' => '%02d:%02d:%02d' % fmt_time(v)
-        }
-      end
-      output
-    else
-      output = []
-      sorted_tags_data.reverse.each do |k, v|
-        spacer = ''
-        (max - k.length).times do
-          spacer += ' '
+        tail = "[Tag Totals]"
+        output + tail
+      when :json
+        output = []
+        sorted_tags_data.reverse.each do |k, v|
+          d, h, m = fmt_time(v)
+          output << {
+            'tag' => k,
+            'seconds' => v,
+            'formatted' => format('%<d>02d:%<h>02d:%<m>02d', d: d, h: h, m: m)
+          }
+        end
+        output
+      else
+        output = []
+        sorted_tags_data.reverse.each do |k, v|
+          spacer = ''
+          (max - k.length).times do
+            spacer += ' '
+          end
+          d, h, m = fmt_time(v)
+          output.push("#{k}:#{spacer}#{format('%<d>02d:%<h>02d:%<m>02d', d: d, h: h, m: m)}")
         end
-        output.push("#{k}:#{spacer}#{'%02d:%02d:%02d' % fmt_time(v)}")
-      end
-
-      output = output.empty? ? '' : "\n--- Tag Totals ---\n" + output.join("\n")
-      output += "\n\nTotal tracked: #{'%02d:%02d:%02d' % fmt_time(total)}\n"
-      output
-    end
-  end
 
-  # @brief Uses 'autotag' configuration to turn keywords into tags for time tracking.
-  # Does not repeat tags in a title, and only converts the first instance of an
-  # untagged keyword
-  #
-  # @param      text  (String) The text to tag
-  #
-  def autotag(text)
-    return unless text
-    return text unless @auto_tag
-
-    current_tags = text.scan(/@\w+/)
-    whitelisted = []
-    @config['autotag']['whitelist'].each do |tag|
-      next if text =~ /@#{tag}\b/i
-
-      text.sub!(/(?<!@)(#{tag.strip})\b/i) do |m|
-        m.downcase! if tag =~ /[a-z]/
-        whitelisted.push("@#{m}")
-        "@#{m}"
+        output = output.empty? ? '' : "\n--- Tag Totals ---\n#{output.join("\n")}"
+        d, h, m = fmt_time(total)
+        output += "\n\nTotal tracked: #{format('%<d>02d:%<h>02d:%<m>02d', d: d, h: h, m: m)}\n"
+        output
       end
     end
-    tail_tags = []
-    @config['autotag']['synonyms'].each do |tag, v|
-      v.each do |word|
-        next unless text =~ /\b#{word}\b/i
 
-        tail_tags.push(tag) unless current_tags.include?("@#{tag}") || whitelisted.include?("@#{tag}")
+    ##
+    ## @brief      Gets the interval between entry's start
+    ##             date and @done date
+    ##
+    ## @param      item       (Hash) The entry
+    ## @param      formatted  (Bool) Return human readable
+    ##                        time (default seconds)
+    ## @param      record     (Bool) Add the interval to the
+    ##                        total for each tag
+    ##
+    ## @return     Interval in seconds, or [d, h, m] array if
+    ##             formatted is true. False if no end date or
+    ##             interval is 0
+    ##
+    def get_interval(item, formatted: true, record: true)
+      if item.interval
+        seconds = item.interval
+        record_tag_times(item, seconds) if record
+        return seconds.positive? ? seconds : false unless formatted
+
+        return seconds.positive? ? format('%02d:%02d:%02d', *fmt_time(seconds)) : false
       end
-    end
-    if @config['autotag'].key? 'transform'
-      @config['autotag']['transform'].each do |tag|
-        next unless tag =~ /\S+:\S+/
-
-        rx, r = tag.split(/:/)
-        r.gsub!(/\$/, '\\')
-        rx.sub!(/^@/, '')
-        regex = Regexp.new('@' + rx + '\b')
-
-        matches = text.scan(regex)
-        next unless matches
-
-        matches.each do |m|
-          new_tag = r
-          if m.is_a?(Array)
-            index = 1
-            m.each do |v|
-              new_tag = new_tag.gsub('\\' + index.to_s, v)
-              index += 1
-            end
-          end
-          tail_tags.push(new_tag)
+
+      false
+    end
+
+    ##
+    ## @brief      Record times for item tags
+    ##
+    ## @param      item  The item
+    ##
+    def record_tag_times(item, seconds)
+      item_hash = "#{item.date.strftime('%s')}#{item.title}#{item.section}"
+      return if @recorded_items.include?(item_hash)
+      item.title.scan(/(?mi)@(\S+?)(\(.*\))?(?=\s|$)/).each do |m|
+        k = m[0] == 'done' ? 'All' : m[0].downcase
+        if @timers.key?(k)
+          @timers[k] += seconds
+        else
+          @timers[k] = seconds
         end
+        @recorded_items.push(item_hash)
       end
     end
-    @results.push("Whitelisted tags: #{whitelisted.join(', ')}") if whitelisted.length > 0
-    if tail_tags.length > 0
-      tags = tail_tags.uniq.map { |t| '@' + t }.join(' ')
-      @results.push("Synonym tags: #{tags}")
-      text + ' ' + tags
-    else
-      text
-    end
-  end
 
-  private
+    ##
+    ## @brief      Format human readable time from seconds
+    ##
+    ## @param      seconds  The seconds
+    ##
+    def fmt_time(seconds)
+      return [0, 0, 0] if seconds.nil?
 
-  ##
-  ## @brief      Gets the interval between entry's start date and @done date
-  ##
-  ## @param      item       (Hash) The entry
-  ## @param      formatted  (Bool) Return human readable time (default seconds)
-  ##
-  def get_interval(item, formatted: true, record: true)
-    done = nil
-    start = nil
-
-    if @interval_cache.keys.include? item['title']
-      seconds = @interval_cache[item['title']]
-      record_tag_times(item, seconds) if record
-      return seconds > 0 ? '%02d:%02d:%02d' % fmt_time(seconds) : false
+      if seconds.class == String && seconds =~ /(\d+):(\d+):(\d+)/
+        h = Regexp.last_match(1)
+        m = Regexp.last_match(2)
+        s = Regexp.last_match(3)
+        seconds = (h.to_i * 60 * 60) + (m.to_i * 60) + s.to_i
+      end
+      minutes = (seconds / 60).to_i
+      hours = (minutes / 60).to_i
+      days = (hours / 24).to_i
+      hours = (hours % 24).to_i
+      minutes = (minutes % 60).to_i
+      [days, hours, minutes]
     end
 
-    if item['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/
-      done = Time.parse(Regexp.last_match(1))
-    else
-      return false
-    end
+    private
 
-    start = if item['title'] =~ /@start\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/
-              Time.parse(Regexp.last_match(1))
-            else
-              item['date']
-            end
+    def run_after
+      return unless @config.key?('run_after')
 
-    seconds = (done - start).to_i
+      _, stderr, status = Open3.capture3(@config['run_after'])
+      return unless status.exitstatus.positive?
 
-    if record
-      record_tag_times(item, seconds)
+      logger.log_now(:error, 'Script error:', "Error running #{@config['run_after']}")
+      logger.log_now(:error, 'STDERR output:', stderr)
     end
 
-    @interval_cache[item['title']] = seconds
-
-    return seconds > 0 ? seconds : false unless formatted
-
-    seconds > 0 ? '%02d:%02d:%02d' % fmt_time(seconds) : false
-  end
-
-  ##
-  ## @brief      Record times for item tags
-  ##
-  ## @param      item  The item
-  ##
-  def record_tag_times(item, seconds)
-    return if @recorded_items.include?(item)
-
-    item['title'].scan(/(?mi)@(\S+?)(\(.*\))?(?=\s|$)/).each do |m|
-      k = m[0] == 'done' ? 'All' : m[0].downcase
-      if @timers.key?(k)
-        @timers[k] += seconds
+    def log_change(tags_added: [], tags_removed: [], count: 1)
+      if tags_added.empty? && tags_removed.empty?
+        logger.count(:skipped, level: :debug, message: '%count %items with no change', count: count)
       else
-        @timers[k] = seconds
-      end
-      @recorded_items.push(item)
-    end
-  end
 
-  ##
-  ## @brief      Format human readable time from seconds
-  ##
-  ## @param      seconds  The seconds
-  ##
-  def fmt_time(seconds)
-    return [0, 0, 0] if seconds.nil?
-
-    if seconds =~ /(\d+):(\d+):(\d+)/
-      h = Regexp.last_match(1)
-      m = Regexp.last_match(2)
-      s = Regexp.last_match(3)
-      seconds = (h.to_i * 60 * 60) + (m.to_i * 60) + s.to_i
-    end
-    minutes = (seconds / 60).to_i
-    hours = (minutes / 60).to_i
-    days = (hours / 24).to_i
-    hours = (hours % 24).to_i
-    minutes = (minutes % 60).to_i
-    [days, hours, minutes]
-  end
+        if tags_added.empty?
+          logger.count(:skipped, level: :debug, message: 'no tags added to %count %items')
+          # logger.debug('No tags added:', %("#{item.title}" in #{item.section}))
+        else
+          logger.count(:added_tags, tag: tags_added, message: '%tags added to %count %items')
+          # logger.info('Added tags:', %(#{did_add} to "#{item.title}" in #{item.section}))
+        end
 
-  def exec_available(cli)
-    if File.exists?(File.expand_path(cli))
-      File.executable?(File.expand_path(cli))
-    else
-      system "which #{cli}", :out => File::NULL, :err => File::NULL
+        if tags_removed.empty?
+          logger.count(:skipped, level: :debug, message: 'no tags removed from %count %items')
+        else
+          logger.count(:removed_tags, tag: tags_removed, message: '%tags removed from %count %items')
+        end
+      end
     end
   end
 end