doing 1.0.64 → 1.0.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e6ebff7b78368227b7642297b5b88c8f018f0a9049f42478fc070f545421b1c
-  data.tar.gz: bff5c3852e60db87cacaba489f30fcf93fbdb01a8b7e4cba5fd06b6fc23db936
+  metadata.gz: acf8a6f7fcc6e38684720c4a4f28c00b03ad5e7d0d51a92c734f84254eeb6c1a
+  data.tar.gz: 4cf29822709042f2744718ce5e525582408295f2300df8f962e32c9a788c339e
 SHA512:
-  metadata.gz: 3c987d7c4a54bb331a3d9db464c5e35b86b1bcc777418547067b8f3bf609756663990c42b53b12d0f36a536f86b3041943eacd539d4d0cf8d1610ff7f3333801
-  data.tar.gz: 514fa3c1e8acefc9ebfde3e71e517918648b57c6b52c6d2c86bc9fe79d555d158edae4a9a2dc54c91bbfc32962280e328d97e26875114d4e1b0c98f693923b04
+  metadata.gz: 9a76904bdca84e0bbc77694d0864d01a419ae6cd5c13aa42404b199bcb60d7421fcc58b02dd1373f1a81c8645815dbf43f958f43d52510f574fa9147c04cbfb3
+  data.tar.gz: 1edaa81995c4b1ab77f5a0b4413b7961d47e67974a7201b623eb7d1727b274076e26a8a86a6ad1811ee6c2f8c9d3ac0786579097783eb5069feb045097527da2

data/README.md

@@ -29,7 +29,7 @@ _Side note:_ I actually use the library behind this utility as part of another s
 
 ## Installation
 
-The current version of `doing` is <!--VER-->1.0.63<!--END VER-->.
+The current version of `doing` is <!--VER-->1.0.67<!--END VER-->.
 
     $ [sudo] gem install doing
 
@@ -595,6 +595,29 @@ Example: Archive all Currently items for _@client_ that are marked _@done_
 
     doing archive @client @done
 
+##### Importing
+
+Doing can currently only import tasks from Timing.app reports. If you want to sync up your Doing file with Timing's tracking:
+
+1. Open Timing and go to Reports
+2. Set the date span you want to import into doing
+3. Group by Project, Then by None
+4. Include Tasks with Title, (not as subgroup), Timespan, and Notes
+5. Uncheck App Usage
+6. Set File Format to JSON and Duration format to "XX:YY:ZZ"
+7. Include short entries if desired
+8. Export the report to a new file
+
+Now you can run `doing import --type timing -s SECTION PATH`, where SECTION is the name of the section you want to import the entries to (defauts to Currently), and PATH is the path to the JSON file. You can also add a tag (or tags) to all entries, or a custom prefix.
+
+(`--type timing` is the only option right now, so it doesn't need to be included)
+
+    # Import entries to Projects section and add @timing to all new entries
+    doing import -s Projects --tag=timing "~/Desktop/All Activities.json"
+
+    # Import to default section (Currently) and prefix entries with '[Imported]'
+    doing import --prefix="[Imported]" "~/Desktop/All Activities.json"
+
 ---
 
 ## Extras

data/bin/doing

@@ -52,7 +52,7 @@ flag %i[f doing_file]
 
 desc 'Add an entry'
 arg_name 'ENTRY'
-command [:now, :next] do |c|
+command %i[now next] do |c|
   c.desc 'Section'
   c.arg_name 'NAME'
   c.flag %i[s section], default_value: wwid.current_section
@@ -105,7 +105,8 @@ command [:now, :next] do |c|
       wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:f] })
       wwid.write(wwid.doing_file)
     elsif $stdin.stat.size.positive?
-      title, note = wwid.format_input($stdin.read)
+      input = $stdin.read
+      title, note = wwid.format_input(input)
       note.push(options[:n]) if options[:n]
       wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:f] })
       wwid.write(wwid.doing_file)
@@ -239,7 +240,7 @@ long_desc %(
 
   Example `doing template HAML > ~/styles/my_doing.haml`
 )
-arg_name 'TYPE', must_match: /^(html|haml|css)/i
+arg_name 'TYPE', must_match: /^(?:html|haml|css)/i
 command :template do |c|
   c.action do |_global_options, options, args|
     raise 'No type specified, use `doing template [HAML|CSS]`' if args.empty?
@@ -443,7 +444,7 @@ command :cancel do |c|
 
   c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters'
   c.arg_name 'BOOLEAN'
-  c.flag [:bool], must_match: /^(and|or|not)$/i, default_value: 'AND'
+  c.flag [:bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'AND'
 
   c.action do |_global_options, options, args|
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
@@ -452,7 +453,16 @@ command :cancel do |c|
       tags = []
     else
       tags = options[:tag].split(/ *, */).map { |t| t.strip.sub(/^@/, '') }
-      options[:bool] = options[:bool] =~ /^(and|or|not)$/i ? options[:bool].upcase : 'AND'
+      options[:bool] = case options[:bool]
+                       when /(and|all)/i
+                        'AND'
+                       when /(any|or)/i
+                        'OR'
+                       when /(not|none)/i
+                        'NOT'
+                       else
+                        'AND'
+                       end
     end
 
     raise 'Only one argument allowed' if args.length > 1
@@ -500,7 +510,7 @@ command :finish do |c|
 
   c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters'
   c.arg_name 'BOOLEAN'
-  c.flag [:bool], must_match: /^(and|or|not)$/i, default_value: 'AND'
+  c.flag [:bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'AND'
 
   c.desc %(Auto-generate finish dates from next entry's start time.
   Automatically generate completion dates 1 minute before next start date.
@@ -537,7 +547,16 @@ command :finish do |c|
       tags = []
     else
       tags = options[:tag].split(/ *, */).map { |t| t.strip.sub(/^@/, '') }
-      options[:bool] = options[:bool] =~ /^(and|or|not)$/i ? options[:bool].upcase : 'AND'
+      options[:bool] = case options[:bool]
+                             when /(and|all)/i
+                              'AND'
+                             when /(any|or)/i
+                              'OR'
+                             when /(not|none)/i
+                              'NOT'
+                             else
+                              'AND'
+                             end
     end
 
     raise 'Only one argument allowed' if args.length > 1
@@ -582,7 +601,7 @@ command [:again, :resume] do |c|
 
   c.desc 'Boolean used to combine multiple tags'
   c.arg_name 'BOOLEAN'
-  c.flag [:bool], must_match: /^(and|or|not)$/i, default_value: 'AND'
+  c.flag [:bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'AND'
 
   c.desc 'Note'
   c.arg_name 'TEXT'
@@ -590,6 +609,16 @@ command [:again, :resume] do |c|
 
   c.action do |_global_options, options, _args|
     tags = options[:tag].nil? ? [] : options[:tag].split(/ *, */).map { |t| t.sub(/^@/, '').strip }
+    options[:bool] = case options[:bool]
+                     when /(and|all)/i
+                      'AND'
+                     when /(any|or)/i
+                      'OR'
+                     when /(not|none)/i
+                      'NOT'
+                     else
+                      'AND'
+                     end
     opts = {
       in: options[:in],
       note: options[:n],
@@ -694,9 +723,9 @@ command :show do |c|
   c.arg_name 'TAG'
   c.flag [:tag]
 
-  c.desc 'Tag boolean (AND,OR,NONE)'
+  c.desc 'Tag boolean (AND,OR,NOT)'
   c.arg_name 'BOOLEAN'
-  c.flag %i[b bool], must_match: /^(and|or|not)$/i, default_value: 'OR'
+  c.flag %i[b bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'OR'
 
   c.desc 'Max count to show'
   c.arg_name 'MAX'
@@ -708,7 +737,7 @@ command :show do |c|
 
   c.desc 'Sort order (asc/desc)'
   c.arg_name 'ORDER'
-  c.flag %i[s sort], must_match: /^(a|d)/i, default_value: 'ASC'
+  c.flag %i[s sort], must_match: /^[ad].*/i, default_value: 'ASC'
 
   c.desc %(
     Date range to show, or a single day to filter date on.
@@ -728,14 +757,14 @@ command :show do |c|
   default = 'time'
   default = wwid.config['tag_sort'] if wwid.config.key?('tag_sort')
   c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: /^(name|time)/i, default_value: default
+  c.flag [:tag_sort], must_match: /^(?:name|time)/i, default_value: default
 
   c.desc 'Only show items with recorded time intervals'
   c.switch [:only_timed], default_value: false, negatable: false
 
   c.desc 'Output to export format (csv|html|json|template|timeline)'
   c.arg_name 'FORMAT'
-  c.flag %i[o output], must_match: /^(template|html|csv|json|timeline)$/i
+  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
   c.action do |_global_options, options, args|
     tag_filter = false
     tags = []
@@ -757,13 +786,9 @@ command :show do |c|
       end
       if args.length.positive?
         args.each do |arg|
-          if arg =~ /,/
-            arg.split(/,/).each do |tag|
-              tags.push(tag.strip.sub(/^@/, ''))
-            end
-          else
-            tags.push(arg.strip.sub(/^@/, ''))
-          end
+          arg.split(/,/).each do |tag|
+                        tags.push(tag.strip.sub(/^@/, ''))
+                      end
         end
       end
     else
@@ -771,11 +796,21 @@ command :show do |c|
     end
 
     tags.concat(options[:tag].split(/ *, */).map { |t| t.sub(/^@/, '').strip }) if options[:tag]
+    options[:bool] = case options[:bool]
+                     when /(and|all)/i
+                      'AND'
+                     when /(any|or)/i
+                      'OR'
+                     when /(not|none)/i
+                      'NOT'
+                     else
+                      'AND'
+                     end
 
     unless tags.empty?
       tag_filter = {
         'tags' => tags,
-        'bool' => options[:b]
+        'bool' => options[:bool]
       }
     end
 
@@ -832,7 +867,7 @@ command [:grep, :search] do |c|
 
   c.desc 'Output to export format (csv|html|json|template|timeline)'
   c.arg_name 'FORMAT'
-  c.flag %i[o output], must_match: /^(template|html|csv|json|timeline)$/i
+  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
 
   c.desc 'Show time intervals on @done tasks'
   c.switch %i[t times], default_value: true
@@ -844,7 +879,7 @@ command [:grep, :search] do |c|
   default = 'time'
   default = wwid.config['tag_sort'] if wwid.config.key?('tag_sort')
   c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: /^(name|time)$/i, default_value: default
+  c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
 
   c.desc 'Only show items with recorded time intervals'
   c.switch [:only_timed], default_value: false, negatable: false
@@ -891,7 +926,7 @@ command :recent do |c|
   default = 'time'
   default = wwid.config['tag_sort'] if wwid.config.key?('tag_sort')
   c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: /^(name|time)$/i, default_value: default
+  c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
 
   c.action do |global_options, options, args|
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
@@ -931,11 +966,11 @@ command :today do |c|
   default = 'time'
   default = wwid.config['tag_sort'] if wwid.config.key?('tag_sort')
   c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: /^(name|time)$/i, default_value: default
+  c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
 
   c.desc 'Output to export format (csv|html|json|template|timeline)'
   c.arg_name 'FORMAT'
-  c.flag %i[o output], must_match: /^(template|html|csv|json|timeline)$/i
+  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
 
   c.action do |_global_options, options, _args|
     options[:t] = true if options[:totals]
@@ -966,11 +1001,11 @@ command :on do |c|
   default = 'time'
   default = wwid.config['tag_sort'] if wwid.config.key?('tag_sort')
   c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: /^(name|time)$/i, default_value: default
+  c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
 
   c.desc 'Output to export format (csv|html|json|template|timeline)'
   c.arg_name 'FORMAT'
-  c.flag %i[o output], must_match: /^(template|html|csv|json|timeline)$/i
+  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
 
   c.action do |_global_options, options, args|
     exit_now! 'Missing date argument' if args.empty?
@@ -1008,7 +1043,7 @@ command :yesterday do |c|
 
   c.desc 'Output to export format (csv|html|json|template|timeline)'
   c.arg_name 'FORMAT'
-  c.flag %i[o output], must_match: /^(template|html|csv|json|timeline)$/i
+  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
 
   c.desc 'Show time intervals on @done tasks'
   c.switch %i[t times], default_value: true
@@ -1020,7 +1055,7 @@ command :yesterday do |c|
   default = 'time'
   default = wwid.config['tag_sort'] if wwid.config.key?('tag_sort')
   c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: /^(name|time)$/i, default_value: default
+  c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
 
   c.action do |_global_options, options, _args|
     options[:sort_tags] = options[:tag_sort] =~ /^n/i
@@ -1044,7 +1079,7 @@ command :last do |c|
 
   c.desc 'Tag boolean'
   c.arg_name 'BOOLEAN'
-  c.flag [:bool], must_match: /(and|or|not)/i, default_value: 'AND'
+  c.flag [:bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'AND'
 
   c.desc 'Search filter, surround with slashes for regex (/query/)'
   c.arg_name 'QUERY'
@@ -1057,7 +1092,15 @@ command :last do |c|
       tags = []
     else
       tags = options[:tag].split(/ *, */).map { |t| t.strip.sub(/^@/, '') }
-      options[:bool] = options[:bool] =~ /^(and|or|not)$/i ? options[:bool].upcase : 'AND'
+      options[:bool] = case options[:bool]
+                       when /(any|or)/i
+                        :or
+                       when /(not|none)/i
+                        :not
+                       else
+                        :and
+                       end
+
     end
 
     if options[:e]
@@ -1130,7 +1173,7 @@ command :view do |c|
 
   c.desc 'Output to export format (csv|html|json|template|timeline)'
   c.arg_name 'FORMAT'
-  c.flag %i[o output], must_match: /^(template|html|csv|json|timeline)$/i
+  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
 
   c.desc 'Show time intervals on @done tasks'
   c.switch %i[t times], default_value: true
@@ -1145,7 +1188,7 @@ command :view do |c|
   default = 'time'
   default = wwid.config['tag_sort'] if wwid.config.key?('tag_sort')
   c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: /^(name|time)$/i, default_value: default
+  c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
 
   c.desc 'Only show items with recorded time intervals'
   c.switch [:only_timed], default_value: false, negatable: true
@@ -1178,7 +1221,7 @@ command :view do |c|
                              else
                                view['tags'].gsub(/[, ]+/, ' ').split(' ').map(&:strip)
                              end
-        tag_filter['bool'] = view.key?('tags_bool') && !view['tags_bool'].nil? ? view['tags_bool'].upcase : 'OR'
+        tag_filter['bool'] = view.key?('tags_bool') && !view['tags_bool'].nil? ? view['tags_bool'].normalize_bool : :or
       end
 
       # If the -o/--output flag was specified, override any default in the view template
@@ -1257,7 +1300,7 @@ command :archive do |c|
 
   c.desc 'Tag boolean (AND|OR|NOT)'
   c.arg_name 'BOOLEAN'
-  c.flag [:bool], must_match: /(and|or|not)/i, default_value: 'AND'
+  c.flag [:bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'AND'
 
   c.desc 'Search filter'
   c.arg_name 'QUERY'
@@ -1281,6 +1324,16 @@ command :archive do |c|
 
     tags.concat(options[:tag].split(/ *, */).map { |t| t.sub(/^@/, '').strip }) if options[:tag]
 
+    options[:bool] = case options[:bool]
+                     when /(and|all)/i
+                      'AND'
+                     when /(any|or)/i
+                      'OR'
+                     when /(not|none)/i
+                      'NOT'
+                     else
+                      'AND'
+                     end
     opts = {
       bool: options[:bool],
       destination: options[:to],
@@ -1394,10 +1447,10 @@ end
 desc 'Import entries from an external source'
 long_desc 'Imports entries from other sources. Currently only handles JSON reports exported from Timing.app.'
 arg_name 'PATH'
-command [:import] do |c|
+command :import do |c|
   c.desc 'Import type'
   c.arg_name 'TYPE'
-  c.flag [:type], default_value: 'timing'
+  c.flag :type, default_value: 'timing'
 
   c.desc 'Target section'
   c.arg_name 'NAME'
@@ -1405,11 +1458,14 @@ command [:import] do |c|
 
   c.desc 'Tag all imported entries'
   c.arg_name 'TAGS'
-  c.flag [:tag]
+  c.flag :tag
 
   c.desc 'Prefix entries with'
   c.arg_name 'PREFIX'
-  c.flag [:prefix]
+  c.flag :prefix
+
+  c.desc 'Allow entries that overlap existing times'
+  c.switch [:overlap], negatable: true
 
   c.action do |_global_options, options, args|
 
@@ -1417,7 +1473,7 @@ command [:import] do |c|
 
     if options[:type] =~ /^tim/i
       args.each do |path|
-        wwid.import_timing(path, { section: section, tag: options[:tag], prefix: options[:prefix] })
+        wwid.import_timing(path, { section: section, tag: options[:tag], prefix: options[:prefix], no_overlap: !options[:overlap] })
         wwid.write(wwid.doing_file)
       end
     else

data/lib/doing.rb

@@ -8,4 +8,5 @@ require 'tempfile'
 require 'chronic'
 require 'haml'
 require 'json'
+require 'doing/helpers.rb'
 require 'doing/wwid.rb'

data/lib/doing/helpers.rb

@@ -0,0 +1,120 @@
+##
+## @brief      Hash helpers
+##
+class ::Hash
+  def has_tags?(tags, bool = :and)
+    tags = tags.split(/ *, */) if tags.is_a? String
+    bool = bool.normalize_bool if bool.is_a? String
+    item = self
+    case bool
+    when :and
+      result = true
+      tags.each do |tag|
+        unless item['title'] =~ /@#{tag}/
+          result = false
+          break
+        end
+      end
+      result
+    when :not
+      result = true
+      tags.each do |tag|
+        if item['title'] =~ /@#{tag}/
+          result = false
+          break
+        end
+      end
+      result
+    else
+      result = false
+      tags.each do |tag|
+        if item['title'] =~ /@#{tag}/
+          result = true
+          break
+        end
+      end
+      result
+    end
+  end
+
+  def matches_search?(search)
+    item = self
+    text = item['note'] ? item['title'] + item['note'].join(' ') : item['title']
+    pattern = if search.strip =~ %r{^/.*?/$}
+                search.sub(%r{/(.*?)/}, '\1')
+              else
+                search.split('').join('.{0,3}')
+              end
+    text =~ /#{pattern}/i ? true : false
+  end
+end
+
+##
+## @brief      String helpers
+##
+class ::String
+  def cap_first
+    sub(/^\w/) do |m|
+      m.upcase
+    end
+  end
+
+
+  ##
+  ## @brief      Convert a boolean string to a symbol
+  ##
+  ## @return     Symbol :and, :or, or :not
+  ##
+  def normalize_bool!
+    replace normalize_bool
+  end
+
+  def normalize_bool(default = :and)
+    case self
+    when /(and|all)/i
+      :and
+    when /(any|or)/i
+      :or
+    when /(not|none)/i
+      :not
+    else
+      default.is_a?(Symbol) ? default : default.normalize_bool
+    end
+  end
+
+
+  ##
+  ## @brief      Turn raw urls into HTML links
+  ##
+  ## @param      opt   (Hash) Additional Options
+  ##
+  def link_urls(opt = {})
+    opt[:format] ||= :html
+    if opt[:format] == :html
+      gsub(%r{(?mi)((http|https)://)?([\w\-_]+(\.[\w\-_]+)+)([\w\-.,@?^=%&:/~+#]*[\w\-@^=%&/~+#])?}) do |_match|
+        m = Regexp.last_match
+        proto = m[1].nil? ? 'http://' : ''
+        %(<a href="#{proto}#{m[0]}" title="Link to #{m[0]}">[#{m[3]}]</a>)
+      end.gsub(/<(\w+:.*?)>/) do |match|
+        m = Regexp.last_match
+        if m[1] =~ /<a href/
+          match
+        else
+          %(<a href="#{m[1]}" title="Link to #{m[1]}">[link]</a>)
+        end
+      end
+    else
+      self
+    end
+  end
+end
+
+class ::Symbol
+  def normalize_bool!
+    replace normalize_bool
+  end
+
+  def normalize_bool
+    to_s.normalize_bool
+  end
+end

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.64'
+  VERSION = '1.0.68'
 end

data/lib/doing/wwid.rb

@@ -4,92 +4,6 @@ require 'deep_merge'
 require 'open3'
 require 'pp'
 
-##
-## @brief      Hash helpers
-##
-class Hash
-  def has_tags?(tags, bool = 'AND')
-    tags = tags.split(/ *, */) if tags.is_a? String
-    item = self
-    case bool
-    when 'AND'
-      result = true
-      tags.each do |tag|
-        unless item['title'] =~ /@#{tag}/
-          result = false
-          break
-        end
-      end
-      result
-    when 'NOT'
-      result = true
-      tags.each do |tag|
-        if item['title'] =~ /@#{tag}/
-          result = false
-          break
-        end
-      end
-      result
-    else
-      result = false
-      tags.each do |tag|
-        if item['title'] =~ /@#{tag}/
-          result = true
-          break
-        end
-      end
-      result
-    end
-  end
-
-  def matches_search?(search)
-    item = self
-    text = item['note'] ? item['title'] + item['note'].join(' ') : item['title']
-    pattern = if search.strip =~ %r{^/.*?/$}
-                search.sub(%r{/(.*?)/}, '\1')
-              else
-                search.split('').join('.{0,3}')
-              end
-    text =~ /#{pattern}/i ? true : false
-  end
-end
-
-##
-## @brief      String helpers
-##
-class String
-  def cap_first
-    sub(/^\w/) do |m|
-      m.upcase
-    end
-  end
-
-  ##
-  ## @brief      Turn raw urls into HTML links
-  ##
-  ## @param      opt   (Hash) Additional Options
-  ##
-  def link_urls(opt = {})
-    opt[:format] ||= :html
-    if opt[:format] == :html
-      gsub(%r{(?mi)((http|https)://)?([\w\-_]+(\.[\w\-_]+)+)([\w\-.,@?^=%&:/~+#]*[\w\-@^=%&/~+#])?}) do |_match|
-        m = Regexp.last_match
-        proto = m[1].nil? ? 'http://' : ''
-        %(<a href="#{proto}#{m[0]}" title="Link to #{m[0]}">[#{m[3]}]</a>)
-      end.gsub(/<(\w+:.*?)>/) do |match|
-        m = Regexp.last_match
-        if m[1] =~ /<a href/
-          match
-        else
-          %(<a href="#{m[1]}" title="Link to #{m[1]}">[link]</a>)
-        end
-      end
-    else
-      self
-    end
-  end
-end
-
 ##
 ## @brief      Main "What Was I Doing" methods
 ##
@@ -667,6 +581,40 @@ class WWID
     @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, false) == get_interval(item_b, false) : false
+  end
+
+  def overlapping_time?(item_a, item_b)
+    return true if same_time?(item_a, item_b)
+
+    start_a = item_a['date']
+    interval = get_interval(item_a, false)
+    end_a = interval ? start_a + interval.to_i : start_a
+    start_b = item_b['date']
+    interval = get_interval(item_b, 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
+
+  def dedup(items, no_overlap = false)
+
+    combined = []
+    @content.each do |_k, v|
+      combined += v['items']
+    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
+      end
+      # warn "Skipping overlapping entry: #{item['title']}" if duped
+      duped
+    end
+  end
+
   ##
   ## @brief      Imports a Timing report
   ##
@@ -676,6 +624,8 @@ class WWID
   ##
   def import_timing(path, opt = {})
     section = opt[:section] || @current_section
+    opt[:no_overlap] ||= false
+
     add_section(section) unless @content.has_key?(section)
 
     add_tags = opt[:tag] ? opt[:tag].split(/[ ,]+/).map { |t| t.sub(/^@?/, '@') }.join(' ') : ''
@@ -690,10 +640,12 @@ class WWID
       # Only process entries with a start and end date
       next unless entry.key?('startDate') && entry.key?('endDate')
 
-      start_time = Time.parse(entry['startDate'])
-      end_time = Time.parse(entry['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(/ +/, '').downcase }
+
+      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|
@@ -711,7 +663,10 @@ class WWID
       new_entry['note'] = entry['notes'].split(/\n/).map(&:chomp) if entry.key?('notes')
       new_items.push(new_entry)
     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
@@ -750,7 +705,7 @@ class WWID
     opt[:section] ||= 'all'
     opt[:note] ||= []
     opt[:tag] ||= []
-    opt[:tag_bool] ||= 'AND'
+    opt[:tag_bool] ||= :and
 
     last = last_entry(opt)
     if last.nil?
@@ -776,7 +731,7 @@ class WWID
   ## @param      opt   (Hash) Additional Options
   ##
   def last_entry(opt = {})
-    opt[:tag_bool] ||= 'AND'
+    opt[:tag_bool] ||= :and
     opt[:section] ||= @current_section
 
     sec_arr = []
@@ -1267,7 +1222,7 @@ class WWID
         @content.each do |_k, v|
           combined['items'] += v['items']
         end
-        section = if opt[:tag_filter] && opt[:tag_filter]['bool'] != 'NONE'
+        section = if opt[:tag_filter] && opt[:tag_filter]['bool'].normalize_bool != :not
                     opt[:tag_filter]['tags'].map do |tag|
                       "@#{tag}"
                     end.join(' + ')
@@ -1298,31 +1253,7 @@ class WWID
     end
 
     if opt[:tag_filter] && !opt[:tag_filter]['tags'].empty?
-      items.delete_if do |item|
-        case opt[:tag_filter]['bool']
-        when /(AND|ALL)/
-          del = false
-          opt[:tag_filter]['tags'].each do |tag|
-            unless item['title'] =~ /@#{tag}/
-              del = true
-              break
-            end
-          end
-          del
-        when /NONE/
-          del = false
-          opt[:tag_filter]['tags'].each do |tag|
-            del = true if item['title'] =~ /@#{tag}/
-          end
-          del
-        when /(OR|ANY)/
-          del = true
-          opt[:tag_filter]['tags'].each do |tag|
-            del = false if item['title'] =~ /@#{tag}/
-          end
-          del
-        end
-      end
+      items.select! { |item| item.has_tags?(opt[:tag_filter]['tags'], opt[:tag_filter]['bool']) }
     end
 
     if opt[:search]
@@ -1614,7 +1545,7 @@ class WWID
     count       = options[:keep] || 0
     destination = options[:destination] || 'Archive'
     tags        = options[:tags] || []
-    bool        = options[:bool] || 'AND'
+    bool        = options[:bool] || :and
 
     section = choose_section if section.nil? || section =~ /choose/i
     archive_all = section =~ /^all$/i # && !(tags.nil? || tags.empty?)
@@ -1642,7 +1573,7 @@ class WWID
   def do_archive(sect, destination, opt = {})
     count = opt[:count] || 0
     tags  = opt[:tags] || []
-    bool  = opt[:bool] || 'AND'
+    bool  = opt[:bool] || :and
     label = opt[:label] || true
 
     if sect =~ /^all$/i
@@ -1655,7 +1586,7 @@ class WWID
     counter = 0
 
     all_sections.each do |section|
-      items = @content[section]['items']
+      items = @content[section]['items'].dup
 
       moved_items = []
       if !tags.empty? || opt[:search]
@@ -1679,13 +1610,7 @@ class WWID
         @content[destination]['items'].concat(moved_items)
         @results.push("Archived #{moved_items.length} items from #{section} to #{destination}")
       else
-        count = items.length if count == 0 || items.length < count
-
-        @content[section]['items'] = if count.zero?
-                                       []
-                                     else
-                                       items[0..count - 1]
-                                     end
+        count = items.length if items.length < count
 
         items.map! do |item|
           if label && section != 'Currently'
@@ -1694,12 +1619,19 @@ class WWID
           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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.64
+  version: 1.0.68
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-22 00:00:00.000000000 Z
+date: 2021-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -165,6 +165,7 @@ files:
 - README.md
 - bin/doing
 - lib/doing.rb
+- lib/doing/helpers.rb
 - lib/doing/version.rb
 - lib/doing/wwid.rb
 - lib/templates/doing.css