doing 2.1.45 → 2.1.48

data/lib/doing/completion.rb

@@ -6,6 +6,7 @@ require_relative 'completion/completion_string'
 require_relative 'completion/fish_completion'
 require_relative 'completion/zsh_completion'
 require_relative 'completion/bash_completion'
+require_relative 'completion/fig_completion'
 
 module Doing
   # Completion script generator
@@ -15,8 +16,8 @@ module Doing
     COMMAND_RX = /^(?<cmd>[^, \t]+)(?<alias>(?:, [^, \t]+)*)?\s+- (?<desc>.*?)$/.freeze
 
     class << self
-      def get_help_sections(command = '')
-        res = `doing help #{command}`.strip
+      def get_help_sections(command = "")
+        res = `doing help #{command}|command cat`.strip
         scanned = res.scan(SECTIONS_RX)
         sections = {}
         scanned.each do |sect|
@@ -85,7 +86,7 @@ module Doing
         type = normalize_type(type)
         raise InvalidArgument, 'Unrecognized shell specified' if type == :invalid
 
-        return %i[zsh bash fish].each { |t| link_default(t) } if type == :all
+        return %i[zsh bash fish fig].each { |t| link_default(t) } if type == :all
 
         install_builtin(type)
 
@@ -98,6 +99,7 @@ module Doing
 
         if File.exist?(File.join(default_dir, default_filenames[type]))
           return unless Doing::Prompt.yn("Update #{type} completion script", default_response: 'n')
+
         end
 
         FileUtils.cp(src, default_dir)
@@ -106,6 +108,8 @@ module Doing
 
       def normalize_type(type)
         case type.to_s
+        when /^fig/i
+          :fig
         when /^f/i
           :fish
         when /^b/i
@@ -123,6 +127,8 @@ module Doing
 
       def generate_type(type)
         generator = case type.to_s
+                    when /^fig/i
+                      FigCompletions.new
                     when /^f/i
                       FishCompletions.new
                     when /^b/i
@@ -149,7 +155,7 @@ module Doing
       end
 
       def default_filenames
-        { zsh: '_doing.zsh', bash: 'doing.bash', fish: 'doing.fish' }
+        { zsh: '_doing.zsh', bash: 'doing.bash', fish: 'doing.fish', fig: 'doing.ts' }
       end
 
       def default_file(type)
@@ -188,6 +194,8 @@ module Doing
         Doing.logger.warn('File written:', 'zsh completions written to lib/completion/_doing.zsh')
         generate_completion(type: 'bash', file: 'lib/completion/doing.bash', link: false)
         Doing.logger.warn('File written:', 'bash completions written to lib/completion/doing.bash')
+        generate_completion(type: 'fig', file: 'lib/completion/doing.ts', link: false)
+        Doing.logger.warn('File written:', 'Fig completions written to lib/completion/doing.ts')
       end
 
       def link_completion_type(type, file)
@@ -197,6 +205,7 @@ module Doing
           unless dir =~ %r{(\.bash_it/completion|bash_completion/completions)}
             link_completion(file, ['~/.bash_it/completion/enabled', '/usr/share/bash_completion/completions'], 'doing.bash')
           end
+        when /^fig/i
         when /^f/i
           link_completion(file, ['~/.config/fish/completions'], 'doing.fish') unless dir =~ %r{.config/fish/completions}
         when /^z/i
@@ -214,6 +223,7 @@ module Doing
 
         targets.each do |target|
           next unless File.directory?(File.expand_path(target))
+
           found = true
 
           target_file = File.join(File.expand_path(target), filename)

data/lib/doing/item/item.rb

@@ -15,7 +15,7 @@ module Doing
     include ItemState
     include ItemTags
 
-    attr_accessor :date, :title, :section, :note
+    attr_accessor :date, :title, :section, :note, :id
 
     # attr_reader :id
 
@@ -31,19 +31,18 @@ module Doing
     ##                      the item belongs
     ## @param      note     [Array or String] The note
     ##                      (optional)
+    ## @param      id       MD5 identifier
     ##
-    def initialize(date, title, section, note = nil)
+    def initialize(date, title, section, note = nil, id = nil)
       @date = date.is_a?(Time) ? date : Time.parse(date)
       @title = title
       @section = section
       @note = Note.new(note)
+      @id = id&.valid_id? ? id.strip : gen_id
     end
 
-    # Generate a hash that represents the entry
-    #
-    # @return [String] entry hash
-    def id
-      @id ||= (@date.to_s + @title + @section).hash
+    def gen_id
+      Digest::MD5.hexdigest(to_s)
     end
 
     ##
@@ -91,7 +90,7 @@ module Doing
 
     # outputs item in Doing file format, including leading tab
     def to_s
-      "\t- #{@date.strftime('%Y-%m-%d %H:%M')} | #{@title}#{@note.good? ? "\n#{@note}" : ''}"
+      "\t- #{@date.strftime('%Y-%m-%d %H:%M')} | #{@title} <#{@id}>#{@note.good? ? "\n#{@note}" : ''}"
     end
 
     ##

data/lib/doing/items/items.rb

@@ -35,6 +35,30 @@ module Doing
       includes
     end
 
+    # Find an item by ID
+    #
+    # @param      id    The identifier to match
+    #
+    def find_id(id)
+      select { |item| item.id == id }[0]
+    end
+
+    ##
+    ## Return the index for an entry matching ID
+    ##
+    ## @param      id    The identifier to match
+    ##
+    def index_for_id(id)
+      i = nil
+      each_with_index do |item, idx|
+        if item.id == id
+          i = idx
+          break
+        end
+      end
+      i
+    end
+
     # Output sections and items in Doing file format
     def to_s
       out = []

data/lib/doing/plugin_manager.rb

@@ -201,7 +201,7 @@ module Doing
         plugins[type].each do |_, options|
           pattern << options[:trigger].normalize_trigger
         end
-        Regexp.new("^(?:#{pattern.join('|')})$", true)
+        Regexp.new("^(?:#{pattern.sort.uniq.join('|')})$", true)
       end
 
       ##

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+# title: Doing File Export
+# description: Export Doing format data
+# author: Brett Terpstra
+# url: https://brettterpstra.com
+module Doing
+  class DoingExport
+    def self.settings
+      {
+        trigger: 'doing'
+      }
+    end
+
+    def self.render(wwid, items, variables: {})
+      return if items.nil?
+
+      content = Doing::Items.new
+      items.each do |item|
+        content.add_section(item.section, log: false)
+        content.push(item)
+      end
+
+      out = []
+      content.sections.each do |section|
+        out.push(section.original)
+        is = content.in_section(section.title).sort_by { |i| [i.date, i.title] }
+        is.reverse! if Doing.setting('doing_file_sort').normalize_order == :desc
+        is.each { |item| out.push(item.to_s) }
+      end
+
+      Doing::Pager.page out.join("\n")
+    end
+
+    Doing::Plugins.register 'doing', :export, self
+  end
+end

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

@@ -15,7 +15,18 @@ module Doing
     end
 
     def self.render(wwid, items, variables: {})
-      return if items.nil?
+      if items.nil? || items.empty?
+        return case variables[:options][:output]
+               when 'json'
+                 {
+                   'section' => '',
+                   'items' => [],
+                   'timers' => ""
+                 }.to_json
+               when 'timeline'
+                "<html></html>"
+               end
+      end
 
       opt = variables[:options]
       opt[:output] =  case opt[:output]
@@ -25,6 +36,7 @@ module Doing
                         'json'
                       end
       items_out = []
+
       last_date = items[-1].date + (60 * 60 * 24)
       max = last_date.strftime('%F')
       min = items[0].date.strftime('%F')
@@ -51,10 +63,12 @@ module Doing
             date: i.date,
             end_date: end_date,
             title: title.strip, #+ " #{note}"
+            section: i.section,
             note: note.to_s(prefix: ''),
             time: interval.time_string(format: :clock),
             duration: duration.time_string(format: :clock),
-            tags: tags
+            tags: tags,
+            id: i.id
           }
 
           attributes.each { |attr, val| i[attr.to_sym] = val }

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

@@ -12,7 +12,7 @@ module Doing
 
     def self.settings
       {
-        trigger: 'template|doing'
+        trigger: 'template'
       }
     end
 
@@ -50,6 +50,8 @@ module Doing
           note = []
         end
 
+        placeholders['id'] = item.id
+
         placeholders['tags'] = item.tags
 
         placeholders['date'] = item.date.strftime(opt[:format])
@@ -141,6 +143,6 @@ module Doing
       out
     end
 
-    Doing::Plugins.register ['template', 'doing'], :export, self
+    Doing::Plugins.register 'template', :export, self
   end
 end

data/lib/doing/plugins/import/doing_import.rb

@@ -29,6 +29,7 @@ module Doing
       exit_now! 'File not found' unless File.exist?(File.expand_path(path))
 
       options[:no_overlap] ||= false
+
       options[:autotag] ||= Doing.auto_tag
 
       tags = options[:tag] ? options[:tag].split(/[ ,]+/).map { |t| t.sub(/^@?/, '') } : []
@@ -47,6 +48,7 @@ module Doing
       Doing.logger.debug('Skipped:', %(#{skipped} items that didn't match filter criteria)) if skipped.positive?
 
       imported = []
+      updated = 0
 
       new_items.each do |item|
         next if duplicate?(item)
@@ -65,8 +67,7 @@ module Doing
         section = options[:section] || item.section
         section ||= Doing.setting('current_section')
 
-        new_item = Item.new(item.date, title, section)
-        new_item.note = item.note
+        new_item = Item.new(item.date, title, section, item.note, item.id)
 
         is_match = true
 
@@ -79,13 +80,21 @@ module Doing
           is_match = options[:not] ? !is_match : is_match
         end
 
-        imported.push(new_item) if is_match
+        if wwid.content.find_id(new_item.id)
+          old_index = wwid.content.index_for_id(new_item.id)
+          old_item = wwid.content[old_index].clone
+          wwid.content[old_index] = new_item
+          Hooks.trigger :post_entry_updated, self, new_item, old_item
+          updated += 1
+        else
+          imported.push(new_item) if is_match
+        end
       end
 
       dups = new_items.count - imported.count
       Doing.logger.info('Skipped:', %(#{dups} duplicate items)) if dups.positive?
 
-      imported = wwid.dedup(imported, no_overlap: !options[:overlap])
+      imported = wwid.dedup(imported, no_overlap: options[:no_overlap])
       overlaps = new_items.count - imported.count - dups
       Doing.logger.debug('Skipped:', "#{overlaps} items with overlapping times") if overlaps.positive?
 
@@ -96,6 +105,7 @@ module Doing
         Hooks.trigger :post_entry_added, self, item
       end
 
+      Doing.logger.info('Updated:', %(#{updated} items))
       Doing.logger.info('Imported:', "#{imported.count} items")
     end
 
@@ -128,10 +138,11 @@ module Doing
         when /^(\S[\S ]+):(\s+@[\w\-_.]+(?= |$))*\s*$/
           section = Regexp.last_match(1)
           current = 0
-        when /^\s*- (\d{4}-\d\d-\d\d \d\d:\d\d) \| (.*)/
+        when /^\s*- (\d{4}-\d\d-\d\d \d\d:\d\d) \| (.*?)(?: <([a-z0-9]{32})>)? *$/
           date = Regexp.last_match(1).strip
           title = Regexp.last_match(2).strip
-          item = Item.new(date, title, section)
+          id = Regexp.last_match(3)
+          item = Item.new(date, title, section, nil, id)
           items.push(item)
           current += 1
         when /^\S/

data/lib/doing/plugins/import/json_import.rb

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+# title: JSON Import
+# description: Import entries from a Doing JSON export
+# author: Brett Terpstra
+# url: https://brettterpstra.com
+module Doing
+  # JSON importer
+  class JSONImport
+    include Doing::Util
+
+    def self.settings
+      {
+        trigger: 'json'
+      }
+    end
+
+    ##
+    ## Imports a Timing report
+    ##
+    ## @param      wwid     [WWID] The wwid object
+    ## @param      path     [String] Path to JSON report
+    ##                      file
+    ## @param      options  [Hash] Additional Options
+    ##
+    def self.import(wwid, path, options: {})
+      exit_now! 'Path to JSON export required' if path.nil?
+      options[:no_overlap] ||= false
+      options[:autotag] ||= Doing.auto_tag
+
+      exit_now! 'File not found' unless File.exist?(File.expand_path(path))
+
+      updated = 0
+      added = 0
+      skipped = 0
+
+      data = JSON.parse(IO.read(File.expand_path(path)))
+      new_items = []
+      new_section = options[:section] || Doing.setting('current_section')
+
+      data['items'].each do |entry|
+        title = entry['title']
+        date = Time.parse(entry['date'])
+        date ||= entry['date'].chronify
+        note = Doing::Note.new(entry['note'])
+        section = if entry['section'].empty?
+                    new_section
+                  else
+                    entry['section']
+                  end
+        id = entry.key?('id') ? entry['id'] : nil
+
+        new_item = Doing::Item.new(date, title, section, note, id)
+
+        is_match = true
+
+        if options[:search]
+          is_match = new_item.search(options[:search], case_type: options[:case], negate: options[:not])
+        end
+
+        if is_match && options[:date_filter]
+          is_match = start_time > options[:date_filter][0] && start_time < options[:date_filter][1]
+          is_match = options[:not] ? !is_match : is_match
+        end
+
+        unless is_match
+          skipped += 1
+          next
+
+        end
+
+        if wwid.content.find_id(new_item.id)
+          old_index = wwid.content.index_for_id(entry['id'])
+          old_item = wwid.content[old_index].clone
+          wwid.content[old_index] = new_item
+          Hooks.trigger :post_entry_updated, self, new_item, old_item
+          updated += 1
+        else
+          Hooks.trigger :pre_entry_add, self, item
+          wwid.content << new_entry
+          Hooks.trigger :post_entry_added, self, item
+          added += 1
+        end
+      end
+      total = new_items.count
+      skipped = data.count - total
+      Doing.logger.debug('Skipped:', %(#{skipped} items)) if skipped.positive?
+      Doing.logger.info('Updated:', %(#{updated} items))
+      Doing.logger.info('Imported:', %(#{added} new items to #{new_section}))
+    end
+
+    Doing::Plugins.register 'json', :import, self
+  end
+end

data/lib/doing/string/string.rb

@@ -16,6 +16,15 @@ class ::String
   include Doing::StringTruncate
   include Doing::StringURL
 
+  ##
+  ## Test if string is a valid 32-character MD5 id
+  ##
+  ## @return     [Boolean] string is valid identifier
+  ##
+  def valid_id?
+    strip =~ /^[a-z0-9]{32}$/ ? true : false
+  end
+
   ##
   ## Force UTF-8 encoding if available
   ##

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.45'
+  VERSION = '2.1.48'
 end

data/lib/doing/wwid/filetools.rb

@@ -40,7 +40,7 @@ module Doing
         if line =~ /^(\S[\S ]+):\s*(@[\w\-_.]+\s*)*$/
           section = Regexp.last_match(1)
           @content.add_section(Section.new(section, original: line), log: false)
-        elsif line =~ /^\s*- (\d{4}-\d\d-\d\d \d\d:\d\d) \| (.*)/
+        elsif line =~ /^\s*- (\d{4}-\d\d-\d\d \d\d:\d\d) \| (.*?)(?: +<([a-z0-9]{32})>)? *$/
           if section.nil?
             section = 'Uncategorized'
             @content.add_section(Section.new(section, original: 'Uncategorized:'), log: false)
@@ -48,7 +48,8 @@ module Doing
 
           date = Regexp.last_match(1).strip
           title = Regexp.last_match(2).strip
-          item = Item.new(date, title, section)
+          id = Regexp.last_match(3) || nil
+          item = Item.new(date, title, section, [], id)
           @content.push(item)
         elsif @content.count.zero?
           # if content[section].items.length - 1 == current

data/lib/doing/wwid/filter.rb

@@ -146,8 +146,8 @@ module Doing
         end
 
         if keep && opt[:time_filter][0] || opt[:time_filter][1]
-          opt[:time_filter][0] = '00:00' if opt[:time_filter][0] =~ /12 *am/i
-          opt[:time_filter][1] = '00:00' if opt[:time_filter][1] =~ /12 *am/i
+          opt[:time_filter].map! { |v| v =~ /(12 *am|midnight)/i ? '00:00' : v }
+
           start_string = if opt[:time_filter][0].nil?
                            "#{item.date.strftime('%Y-%m-%d')} 00:00"
                          else

data/lib/doing/wwid/interactive.rb

@@ -355,7 +355,8 @@ module Doing
     def verify_duration(date, finish_date, title: nil)
       max_elapsed = Doing.setting('interaction.confirm_longer_than', 0)
       max_elapsed = max_elapsed.chronify_qty if max_elapsed.is_a?(String)
-      date = date.chronify(guess: :end, context: :today) if finish_date.is_a?(String)
+      date = date.chronify(guess: :end, context: :today) if date.is_a?(String)
+      finish_date = finish_date.chronify(guess: :end, context: :today) if finish_date.is_a?(String)
 
       elapsed = finish_date - date
 

data/lib/doing/wwid/modify.rb

@@ -39,7 +39,8 @@ module Doing
 
       if opt[:done] && entry.should_finish?
         if entry.should_time?
-          entry.tag('done', value: opt[:done])
+          finish = opt[:done].is_a?(String) ? opt[:done].chronify(guess: :end, context: :today) : opt[:done]
+          entry.tag('done', value: finish)
         else
           entry.tag('done')
         end
@@ -47,15 +48,11 @@ module Doing
 
       entry.note = note
 
-      items = @content.clone
       if opt[:timed]
-        items.reverse!
-        items.each_with_index do |i, x|
-          next if i.title =~ / @done/
-
-          finish_date = verify_duration(i.date, opt[:back], title: i.title)
-          items[x].tag('done', value: finish_date.strftime('%F %R'))
-          break
+        last_item = last_entry({ section: section })
+        if last_item.tags?(['done'], :not)
+          finish_date = verify_duration(last_item.date, opt[:back], title: last_item.title)
+          last_item.tag('done', value: finish_date.strftime('%F %R'))
         end
       end
 

data/lib/doing.rb

@@ -16,6 +16,7 @@ require 'json'
 require 'logger'
 require 'safe_yaml/load'
 require 'fcntl'
+require 'digest'
 
 require 'chronic'
 require 'tty-link'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.45
+  version: 2.1.48
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-22 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markup
@@ -510,6 +510,7 @@ files:
 - docs/doc/Doing/Content.html
 - docs/doc/Doing/DayOneRenderer.html
 - docs/doc/Doing/DayoneExport.html
+- docs/doc/Doing/DoingExport.html
 - docs/doc/Doing/DoingImport.html
 - docs/doc/Doing/Entry.html
 - docs/doc/Doing/Errors.html
@@ -533,6 +534,7 @@ files:
 - docs/doc/Doing/ItemTags.html
 - docs/doc/Doing/Items.html
 - docs/doc/Doing/JSONExport.html
+- docs/doc/Doing/JSONImport.html
 - docs/doc/Doing/LogAdapter.html
 - docs/doc/Doing/Logger.html
 - docs/doc/Doing/MarkdownExport.html
@@ -642,6 +644,7 @@ files:
 - lib/doing/completion.rb
 - lib/doing/completion/bash_completion.rb
 - lib/doing/completion/completion_string.rb
+- lib/doing/completion/fig_completion.rb
 - lib/doing/completion/fish_completion.rb
 - lib/doing/completion/zsh_completion.rb
 - lib/doing/configuration.rb
@@ -669,6 +672,7 @@ files:
 - lib/doing/plugin_manager.rb
 - lib/doing/plugins/export/csv_export.rb
 - lib/doing/plugins/export/dayone_export.rb
+- lib/doing/plugins/export/doing_export.rb
 - lib/doing/plugins/export/html_export.rb
 - lib/doing/plugins/export/json_export.rb
 - lib/doing/plugins/export/markdown_export.rb
@@ -677,6 +681,7 @@ files:
 - lib/doing/plugins/import/cal_to_json.scpt
 - lib/doing/plugins/import/calendar_import.rb
 - lib/doing/plugins/import/doing_import.rb
+- lib/doing/plugins/import/json_import.rb
 - lib/doing/plugins/import/timing_import.rb
 - lib/doing/prompt/choose.rb
 - lib/doing/prompt/fzf.rb