doing 2.1.7 → 2.1.11

data/lib/doing/wwid.rb

@@ -114,6 +114,8 @@ module Doing
       filename = @doing_file if filename.nil?
       return if File.exist?(filename) && File.stat(filename).size.positive?
 
+      FileUtils.mkdir_p(File.dirname(filename)) unless File.directory?(File.dirname(filename))
+
       File.open(filename, 'w+') do |f|
         f.puts "#{@config['current_section']}:"
       end
@@ -338,7 +340,8 @@ module Doing
     ## @option opt :back [Date] backdate
     ## @option opt :timed [Boolean] new item is timed entry, marks previous entry as @done
     ##
-    def add_item(title, section = nil, opt = {})
+    def add_item(title, section = nil, opt)
+      opt ||= {}
       section ||= @config['current_section']
       @content.add_section(section, log: false)
       opt[:back] ||= opt[:date] ? opt[:date] : Time.now
@@ -371,9 +374,13 @@ module Doing
         end
       end
 
+      Hooks.trigger :pre_entry_add, self, entry
+
       @content.push(entry)
       # logger.count(:added, level: :debug)
       logger.info('New entry:', %(added "#{entry.title}" to #{section}))
+
+      Hooks.trigger :post_entry_added, self, entry.dup
     end
 
     ##
@@ -401,7 +408,8 @@ module Doing
     ## @param      paths  [String] Path to JSON report file
     ## @param      opt    [Hash] Additional Options
     ##
-    def import(paths, opt = {})
+    def import(paths, opt)
+      opt ||= {}
       Plugins.plugins[:import].each do |_, options|
         next unless opt[:type] =~ /^(#{options[:trigger].normalize_trigger})$/i
 
@@ -461,13 +469,15 @@ module Doing
     #
     # @return     nothing
     #
-    def repeat_item(item, opt = {})
+    def repeat_item(item, opt)
+      opt ||= {}
       if item.should_finish?
         if item.should_time?
           item.title.tag!('done', value: Time.now.strftime('%F %R'))
         else
           item.title.tag!('done')
         end
+        Hooks.trigger :post_entry_updated, self, item
       end
 
       # Remove @done tag
@@ -501,7 +511,8 @@ module Doing
     ##
     ## @param      opt   [Hash] Additional Options
     ##
-    def repeat_last(opt = {})
+    def repeat_last(opt)
+      opt ||= {}
       opt[:section] ||= 'all'
       opt[:section] = guess_section(opt[:section])
       opt[:note] ||= []
@@ -523,7 +534,8 @@ module Doing
     ##
     ## @param      opt   [Hash] Additional Options
     ##
-    def last_entry(opt = {})
+    def last_entry(opt)
+      opt ||= {}
       opt[:tag_bool] ||= :and
       opt[:section] ||= @config['current_section']
 
@@ -615,19 +627,19 @@ module Doing
     ## @param      items  [Array] The items to filter (if empty, filters all items)
     ## @param      opt    [Hash] The filter parameters
     ##
-    ## @option opt [String] :section
-    ## @option opt [Boolean] :unfinished
-    ## @option opt [Array or String] :tag  (Array or comma-separated string)
-    ## @option opt [Symbol] :tag_bool  (:and, :or, :not)
-    ## @option opt [String] :search  (string, optional regex with //)
-    ## @option opt [Array] :date_filter  [[Time]start, [Time]end]
-    ## @option opt [Boolean] :only_timed
-    ## @option opt [String] :before  (Date/Time string, unparsed)
-    ## @option opt [String] :after  (Date/Time string, unparsed)
-    ## @option opt [Boolean] :today
-    ## @option opt [Boolean] :yesterday
-    ## @option opt [Number] :count  (Number to return)
-    ## @option opt [String] :age  ('old' or 'new')
+    ## @option opt [String] :section ('all')
+    ## @option opt [Boolean] :unfinished (false)
+    ## @option opt [Array or String] :tag ([]) Array or comma-separated string
+    ## @option opt [Symbol] :tag_bool (:and) :and, :or, :not
+    ## @option opt [String] :search ('') string, optional regex with `/string/`
+    ## @option opt [Array] :date_filter (nil) [[Time]start, [Time]end]
+    ## @option opt [Boolean] :only_timed (false)
+    ## @option opt [String] :before (nil) Date/Time string, unparsed
+    ## @option opt [String] :after  (nil) Date/Time string, unparsed
+    ## @option opt [Boolean] :today (false) limit to entries from today
+    ## @option opt [Boolean] :yesterday (false) limit to entries from yesterday
+    ## @option opt [Number] :count (0) max entries to return
+    ## @option opt [String] :age (new) 'old' or 'new'
     ##
     def filter_items(items = Items.new, opt: {})
       time_rx = /^(\d{1,2}+(:\d{1,2}+)?( *(am|pm))?|midnight|noon)$/
@@ -784,7 +796,7 @@ module Doing
 
       output = Items.new
 
-      if opt[:age] =~ /^o/i
+      if opt[:age] && opt[:age].normalize_age == :oldest
         output.concat(filtered_items.slice(0, count).reverse)
       else
         output.concat(filtered_items.reverse.slice(0, count))
@@ -793,6 +805,65 @@ module Doing
       output
     end
 
+    def delete_items(items, force: false)
+      res = force ? true : Prompt.yn("Delete #{items.size} #{items.size == 1 ? 'item' : 'items'}?", default_response: 'y')
+      if res
+        items.each do |i|
+          deleted = @content.delete_item(i, single: items.count == 1)
+          Hooks.trigger :post_entry_removed, self, deleted
+        end
+        write(@doing_file)
+      end
+    end
+
+    def edit_items(items)
+      editable_items = []
+
+      items.each do |i|
+        editable = "#{i.date.strftime('%F %R')} | #{i.title}"
+        old_note = i.note ? i.note.strip_lines.join("\n") : nil
+        editable += "\n#{old_note}" unless old_note.nil?
+        editable_items << editable
+      end
+      divider = "\n-----------\n"
+      notice =<<~EONOTICE
+      # - You may delete entries, but leave all divider lines (---) in place.
+      # - Start and @done dates replaced with a time string (yesterday 3pm) will
+      #   be parsed automatically. Do not delete the pipe (|) between start date
+      #   and entry title.
+      EONOTICE
+      input =  "#{editable_items.map(&:strip).join(divider)}\n\n#{notice}"
+
+      new_items = fork_editor(input).split(/#{divider}/)
+
+      new_items.each_with_index do |new_item, i|
+        input_lines = new_item.split(/[\n\r]+/).delete_if(&:ignore?)
+        first_line = input_lines[0]&.strip
+
+        if first_line.nil? || first_line =~ /^#{divider.strip}$/ || first_line.strip.empty?
+          deleted = @content.delete_item(items[i], single: new_items.count == 1)
+          Hooks.trigger :post_entry_removed, self, deleted
+          Doing.logger.count(:deleted)
+        else
+          date, title, note = format_input(new_item)
+
+          note.map!(&:strip)
+          note.delete_if(&:ignore?)
+          item = items[i]
+          old_item = item.dup
+          item.date = date || items[i].date
+          item.title = title
+          item.note = note
+          if (item.equal?(old_item))
+            Doing.logger.count(:skipped, level: :debug)
+          else
+            Doing.logger.count(:updated)
+            Hooks.trigger :post_entry_updated, self, item
+          end
+        end
+      end
+    end
+
     ##
     ## Display an interactive menu of entries
     ##
@@ -800,7 +871,8 @@ module Doing
     ##
     ## Options hash is shared with #filter_items and #act_on
     ##
-    def interactive(opt = {})
+    def interactive(opt)
+      opt ||= {}
       opt[:section] = opt[:section] ? guess_section(opt[:section]) : 'All'
 
       search = nil
@@ -820,7 +892,11 @@ module Doing
       }
       items = filter_items(Items.new, opt: filter_options)
 
-      selection = Prompt.choose_from_items(items, include_section: opt[:section] =~ /^all$/i, **opt)
+      menu_options = %i[search query exact multiple show_if_single menu sort case].each_with_object({}) {
+        |k, hsh| hsh[k] = opt[k]
+      }
+
+      selection = Prompt.choose_from_items(items, include_section: opt[:section] =~ /^all$/i, **menu_options)
 
       raise NoResults, 'no items selected' if selection.nil? || selection.empty?
 
@@ -848,7 +924,8 @@ module Doing
     ## @option opt [Boolean] :again
     ## @option opt [Boolean] :resume
     ##
-    def act_on(items, opt = {})
+    def act_on(items, opt)
+      opt ||= {}
       actions = %i[editor delete tag flag finish cancel archive output save_to again resume]
       has_action = false
       single = items.count == 1
@@ -947,7 +1024,7 @@ module Doing
 
         item = items[0]
         if opt[:resume] && !opt[:reset]
-          repeat_item(item, { editor: opt[:editor] })
+          repeat_item(item, { editor: opt[:editor] }) # hooked
         elsif opt[:reset]
           res = Prompt.enter_text('Start date (blank for current time)', default_response: '')
           if res =~ /^ *$/
@@ -961,7 +1038,9 @@ module Doing
                 else
                   opt[:resume]
                 end
-          @content.update_item(item, reset_item(item, date: date, resume: res))
+          new_entry = reset_item(item, date: date, resume: res)
+          @content.update_item(item, new_entry)
+          Hooks.trigger :post_entry_updated, self, new_entry
         end
         write(@doing_file)
 
@@ -969,11 +1048,7 @@ module Doing
       end
 
       if opt[:delete]
-        res = opt[:force] ? true : Prompt.yn("Delete #{items.size} items?", default_response: 'y')
-        if res
-          items.each { |i| @content.delete_item(i, single: items.count == 1) }
-          write(@doing_file)
-        end
+        delete_items(items, force: opt[:force]) # hooked
         return
       end
 
@@ -981,6 +1056,7 @@ module Doing
         tag = @config['marker_tag'] || 'flagged'
         items.map! do |i|
           i.tag(tag, date: false, remove: opt[:remove], single: single)
+          Hooks.trigger :post_entry_updated, self, i
         end
       end
 
@@ -990,6 +1066,7 @@ module Doing
           if i.should_finish?
             should_date = !opt[:cancel] && i.should_time?
             i.tag(tag, date: should_date, remove: opt[:remove], single: single)
+            Hooks.trigger :post_entry_updated, self, i
           end
         end
       end
@@ -998,61 +1075,22 @@ module Doing
         tag = opt[:tag]
         items.map! do |i|
           i.tag(tag, date: false, remove: opt[:remove], single: single)
+          Hooks.trigger :post_entry_updated, self, i
         end
       end
 
       if opt[:archive] || opt[:move]
         section = opt[:archive] ? 'Archive' : guess_section(opt[:move])
-        items.map! { |i| i.move_to(section, label: true) }
+        items.map! do |i|
+          i.move_to(section, label: true)
+          Hooks.trigger :post_entry_updated, self, i
+        end
       end
 
       write(@doing_file)
 
       if opt[:editor]
-
-        editable_items = []
-
-        items.each do |i|
-          editable = "#{i.date.strftime('%F %R')} | #{i.title}"
-          old_note = i.note ? i.note.strip_lines.join("\n") : nil
-          editable += "\n#{old_note}" unless old_note.nil?
-          editable_items << editable
-        end
-        divider = "\n-----------\n"
-        notice =<<~EONOTICE
-        # - You may delete entries, but leave all divider lines (---) in place.
-        # - Start and @done dates replaced with a time string (yesterday 3pm) will
-        #   be parsed automatically. Do not delete the pipe (|) between start date
-        #   and entry title.
-        EONOTICE
-        input =  "#{editable_items.map(&:strip).join(divider)}\n\n#{notice}"
-
-        new_items = fork_editor(input).split(/#{divider}/)
-
-        new_items.each_with_index do |new_item, i|
-          input_lines = new_item.split(/[\n\r]+/).delete_if(&:ignore?)
-          first_line = input_lines[0]&.strip
-
-          if first_line.nil? || first_line =~ /^#{divider.strip}$/ || first_line.strip.empty?
-            @content.delete_item(items[i], single: new_items.count == 1)
-            Doing.logger.count(:deleted)
-          else
-            date, title, note = format_input(new_item)
-
-            note.map!(&:strip)
-            note.delete_if(&:ignore?)
-            item = items[i]
-            old_item = item.dup
-            item.date = date || items[i].date
-            item.title = title
-            item.note = note
-            if (item.equal?(old_item))
-              Doing.logger.count(:skipped, level: :debug)
-            else
-              Doing.logger.count(:updated)
-            end
-          end
-        end
+        edit_items(items) # hooked
 
         write(@doing_file)
       end
@@ -1077,7 +1115,7 @@ module Doing
         options[:template] = opt[:template] || nil
       end
 
-      output = list_section(options)
+      output = list_section(options) # hooked
 
       if opt[:save_to]
         file = File.expand_path(opt[:save_to])
@@ -1105,7 +1143,8 @@ module Doing
     ##
     ## @see        #filter_items
     ##
-    def tag_last(opt = {})
+    def tag_last(opt) # hooked
+      opt ||= {}
       opt[:count] ||= 1
       opt[:archive] ||= false
       opt[:tags] ||= ['done']
@@ -1215,6 +1254,8 @@ module Doing
         elsif opt[:archive] && opt[:count].zero?
           logger.warn('Skipped:', 'Archiving is skipped when operating on all entries')
         end
+
+        Hooks.trigger :post_entry_updated, self, item
       end
 
       write(@doing_file)
@@ -1229,7 +1270,8 @@ module Doing
     ##
     ## @return     [Item] the next chronological item in the index
     ##
-    def next_item(item, options = {})
+    def next_item(item, options)
+      options ||= {}
       items = filter_items(Items.new, opt: options)
 
       idx = items.index(item)
@@ -1267,6 +1309,7 @@ module Doing
         item.title = title
         item.note.add(note, replace: true)
         logger.info('Edited:', item.title)
+        Hooks.trigger :post_entry_updated, self, item.dup
 
         write(@doing_file)
       end
@@ -1287,7 +1330,8 @@ module Doing
     ## @option opt :back [Date] backdate new item
     ## @option opt :new_item [String] content to use for new item
     ## @option opt :note [Array] note content for new item
-    def stop_start(target_tag, opt = {})
+    def stop_start(target_tag, opt)
+      opt ||= {}
       tag = target_tag.dup
       opt[:section] ||= @config['current_section']
       opt[:archive] ||= false
@@ -1320,8 +1364,10 @@ module Doing
           logger.count(:completed)
           logger.info('Completed:', item.title)
         end
+        Hooks.trigger :post_entry_updated, self, item
       end
 
+
       logger.debug('Skipped:', "No active @#{tag} tasks found.") if found_items.zero?
 
       if opt[:new_item]
@@ -1354,7 +1400,8 @@ module Doing
     ##
     ## Rename doing file with date and start fresh one
     ##
-    def rotate(opt = {})
+    def rotate(opt)
+      opt ||= {}
       keep = opt[:keep] || 0
       tags = []
       tags.concat(opt[:tag].split(/ *, */).map { |t| t.sub(/^@/, '').strip }) if opt[:tag]
@@ -1369,7 +1416,7 @@ module Doing
       counter = 0
       new_content = Items.new
 
-      @content.each do |item|
+      section_items.each do |item|
         break if counter >= max
         if opt[:before]
           time_string = opt[:before]
@@ -1378,6 +1425,7 @@ module Doing
 
         unless ((!tags.empty? && !item.tags?(tags, bool)) || (opt[:search] && !item.search(opt[:search].to_s)) || (opt[:before] && item.date >= cutoff))
           new_item = @content.delete(item)
+          Hooks.trigger :post_entry_removed, self, item.dup
           raise DoingRuntimeError, "Error deleting item: #{item}" if new_item.nil?
 
           new_content.add_section(new_item.section, log: false)
@@ -1482,13 +1530,13 @@ module Doing
     ##
     ## @param      opt   [Hash] Additional Options
     ##
-    def list_section(opt = {}, items: Items.new)
+    def list_section(opt, items: Items.new)
       opt[:config_template] ||= 'default'
 
       tpl_cfg = @config.dig('templates', opt[:config_template])
 
       cfg = if opt[:view_template]
-              @config.dig('views', opt[:view_template]).deep_merge(tpl_cfg)
+              @config.dig('views', opt[:view_template]).deep_merge(tpl_cfg, { extend_existing_arrays: true, sort_merged_arrays: true })
             else
               tpl_cfg
             end
@@ -1500,11 +1548,12 @@ module Doing
                        'tags_color' => @config['tags_color'],
                        'duration' => @config['duration'],
                        'interval_format' => @config['interval_format']
-                     })
+                     }, { extend_existing_arrays: true, sort_merged_arrays: true })
       opt[:duration] ||= cfg['duration'] || false
       opt[:interval_format] ||= cfg['interval_format'] || 'text'
       opt[:count] ||= 0
-      opt[:age] ||= 'newest'
+      opt[:age] ||= :newest
+      opt[:age] = opt[:age].normalize_age
       opt[:format] ||= cfg['date_format']
       opt[:order] ||= cfg['order'] || 'asc'
       opt[:tag_order] ||= 'asc'
@@ -1535,7 +1584,13 @@ module Doing
 
       items.reverse! unless opt[:order] =~ /^d/i
 
-      if opt[:interactive]
+      if opt[:delete]
+        delete_items(items, force: opt[:force])
+        return
+      elsif opt[:editor]
+        edit_items(items)
+        return
+      elsif opt[:interactive]
         opt[:menu] = !opt[:force]
         opt[:query] = '' # opt[:search]
         opt[:multiple] = true
@@ -1559,7 +1614,8 @@ module Doing
     ## @param      section      [String] The source section
     ## @param      options      [Hash] Options
     ##
-    def archive(section = @config['current_section'], options = {})
+    def archive(section = @config['current_section'], options)
+      options ||= {}
       count       = options[:keep] || 0
       destination = options[:destination] || 'Archive'
       tags        = options[:tags] || []
@@ -1589,18 +1645,19 @@ module Doing
     ## @param      output  [String] output format
     ## @param      opt     [Hash] Options
     ##
-    def today(times = true, output = nil, opt = {})
+    def today(times = true, output = nil, opt)
+      opt ||= {}
       opt[:totals] ||= false
       opt[:sort_tags] ||= false
 
-      cfg = @config['templates']['today'].deep_merge(@config['templates']['default']).deep_merge({
+      cfg = @config['templates']['today'].deep_merge(@config['templates']['default'], { extend_existing_arrays: true, sort_merged_arrays: true }).deep_merge({
         'wrap_width' => @config['wrap_width'] || 0,
         'date_format' => @config['default_date_format'],
         'order' => @config['order'] || 'asc',
         'tags_color' => @config['tags_color'],
         'duration' => @config['duration'],
         'interval_format' => @config['interval_format']
-      })
+      }, { extend_existing_arrays: true, sort_merged_arrays: true })
 
       opt[:duration] ||= cfg['duration'] || false
       opt[:interval_format] ||= cfg['interval_format'] || 'text'
@@ -1637,7 +1694,8 @@ module Doing
     ## @param      output   [String] Output format
     ## @param      opt      [Hash] Additional Options
     ##
-    def list_date(dates, section, times = nil, output = nil, opt = {})
+    def list_date(dates, section, times = nil, output = nil, opt)
+      opt ||= {}
       opt[:totals] ||= false
       opt[:sort_tags] ||= false
       section = guess_section(section)
@@ -1666,7 +1724,8 @@ module Doing
     ## @param      output   [String] Output format
     ## @param      opt      [Hash] Additional Options
     ##
-    def yesterday(section, times = nil, output = nil, opt = {})
+    def yesterday(section, times = nil, output = nil, opt)
+      opt ||= {}
       opt[:totals] ||= false
       opt[:sort_tags] ||= false
       section = guess_section(section)
@@ -1701,19 +1760,20 @@ module Doing
     ## @param      section  [String] The section to show from, default Currently
     ## @param      opt      [Hash] Additional Options
     ##
-    def recent(count = 10, section = nil, opt = {})
+    def recent(count = 10, section = nil, opt)
+      opt ||= {}
       times = opt[:t] || true
       opt[:totals] ||= false
       opt[:sort_tags] ||= false
 
-      cfg = @config['templates']['recent'].deep_merge(@config['templates']['default']).deep_merge({
+      cfg = @config['templates']['recent'].deep_merge(@config['templates']['default'], { extend_existing_arrays: true, sort_merged_arrays: true }).deep_merge({
         'wrap_width' => @config['wrap_width'] || 0,
         'date_format' => @config['default_date_format'],
         'order' => @config['order'] || 'asc',
         'tags_color' => @config['tags_color'],
         'duration' => @config['duration'],
         'interval_format' => @config['interval_format']
-      })
+      }, { extend_existing_arrays: true, sort_merged_arrays: true })
       opt[:duration] ||= cfg['duration'] || false
       opt[:interval_format] ||= cfg['interval_format'] || 'text'
 
@@ -1740,14 +1800,14 @@ module Doing
     ##
     def last(times: true, section: nil, options: {})
       section = section.nil? || section =~ /all/i ? 'All' : guess_section(section)
-      cfg = @config['templates']['last'].deep_merge(@config['templates']['default']).deep_merge({
+      cfg = @config['templates']['last'].deep_merge(@config['templates']['default'], { extend_existing_arrays: true, sort_merged_arrays: true }).deep_merge({
         'wrap_width' => @config['wrap_width'] || 0,
         'date_format' => @config['default_date_format'],
         'order' => @config['order'] || 'asc',
         'tags_color' => @config['tags_color'],
         'duration' => @config['duration'],
         'interval_format' => @config['interval_format']
-      })
+      }, { extend_existing_arrays: true, sort_merged_arrays: true })
       options[:duration] ||= cfg['duration'] || false
       options[:interval_format] ||= cfg['interval_format'] || 'text'
 
@@ -1762,7 +1822,8 @@ module Doing
         interval_format: options[:interval_format],
         case: options[:case],
         not: options[:negate],
-        config_template: 'last'
+        config_template: 'last',
+        delete: options[:delete]
       }
 
       if options[:tag]
@@ -1782,13 +1843,14 @@ module Doing
     ## Does not repeat tags in a title, and only converts the first instance of an
     ## untagged keyword
     ##
-    ## @param      text  [String] The text to tag
+    ## @param      string  [String] The text to tag
     ##
-    def autotag(text)
-      return unless text
-      return text unless @auto_tag
+    def autotag(string)
+      return unless string
+      return string unless @auto_tag
 
-      original = text.dup
+      original = string.dup
+      text = string.dup
 
       current_tags = text.scan(/@\w+/).map { |t| t.sub(/^@/, '') }
       tagged = {
@@ -1810,6 +1872,7 @@ module Doing
 
       @config['autotag']['synonyms'].each do |tag, v|
         v.each do |word|
+          word = word.wildcard_to_rx
           next unless text =~ /\b#{word}\b/i
 
           unless current_tags.include?(tag) || tagged[:whitelisted].include?(tag)
@@ -1823,7 +1886,12 @@ module Doing
         @config['autotag']['transform'].each do |tag|
           next unless tag =~ /\S+:\S+/
 
-          rx, r = tag.split(/:/)
+          if tag =~ /::/
+            rx, r = tag.split(/::/)
+          else
+            rx, r = tag.split(/:/)
+          end
+
           flag_rx = %r{/([r]+)$}
           if r =~ flag_rx
             flags = r.match(flag_rx)[1].split(//)
@@ -2065,6 +2133,36 @@ EOS
       end
     end
 
+    def configure(filename = nil)
+      if filename
+        Doing.config_with(filename, { ignore_local: true })
+      elsif ENV['DOING_CONFIG']
+        Doing.config_with(ENV['DOING_CONFIG'], { ignore_local: true })
+      end
+
+      Doing.logger.benchmark(:configure, :start)
+      config = Doing.config
+      Doing.logger.benchmark(:configure, :finish)
+
+      config.settings['backup_dir'] = ENV['DOING_BACKUP_DIR'] if ENV['DOING_BACKUP_DIR']
+      @config = config.settings
+    end
+
+    def get_diff(filename = nil)
+      configure if @config.nil?
+
+      filename ||= @config['doing_file']
+      init_doing_file(filename)
+      current_content = @content.dup
+      backup_file = Util::Backup.last_backup(filename, count: 1)
+      raise DoingRuntimeError, 'No undo history to diff' if backup_file.nil?
+
+      backup = WWID.new
+      backup.config = @config
+      backup.init_doing_file(backup_file)
+      current_content.diff(backup.content)
+    end
+
     private
 
     ##
@@ -2097,13 +2195,16 @@ EOS
     ## @return     [String] formatted output based on opt[:output]
     ##             template trigger
     ##
-    def output(items, title, is_single, opt = {})
+    def output(items, title, is_single, opt)
+      opt ||= {}
       out = nil
 
       raise InvalidArgument, 'Unknown output format' unless opt[:output] =~ Plugins.plugin_regex(type: :export)
 
       export_options = { page_title: title, is_single: is_single, options: opt }
 
+      Hooks.trigger :pre_export, self, opt[:output], items
+
       Plugins.plugins[:export].each do |_, options|
         next unless opt[:output] =~ /^(#{options[:trigger].normalize_trigger})$/i
 
@@ -2141,7 +2242,8 @@ EOS
     ##                          section
     ## @param      opt          [Hash] Additional Options
     ##
-    def do_archive(section, destination, opt = {})
+    def do_archive(section, destination, opt)
+      opt ||= {}
       count = opt[:count] || 0
       tags  = opt[:tags] || []
       bool  = opt[:bool] || :and
@@ -2152,10 +2254,11 @@ EOS
 
       section_items = @content.in_section(section)
       max = section_items.count - count.to_i
+      moved_items = []
 
       counter = 0
 
-      @content.map! do |item|
+      @content.map do |item|
         break if counter >= max
         if opt[:before]
           time_string = opt[:before]
@@ -2169,6 +2272,8 @@ EOS
         else
           counter += 1
           item.move_to(destination, label: label, log: false)
+          Hooks.trigger :post_entry_updated, self, item.dup
+          item
         end
       end