doing 1.0.64 → 1.0.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e6ebff7b78368227b7642297b5b88c8f018f0a9049f42478fc070f545421b1c
-  data.tar.gz: bff5c3852e60db87cacaba489f30fcf93fbdb01a8b7e4cba5fd06b6fc23db936
+  metadata.gz: a774718572df78395293b6294bcfa4bac94cfe2cde0ffec43e8bbea60b874534
+  data.tar.gz: fba4b65439084eae5b291bd65f5a1d14d49e5b5c4c8b70abd5e8f73fa39b3545
 SHA512:
-  metadata.gz: 3c987d7c4a54bb331a3d9db464c5e35b86b1bcc777418547067b8f3bf609756663990c42b53b12d0f36a536f86b3041943eacd539d4d0cf8d1610ff7f3333801
-  data.tar.gz: 514fa3c1e8acefc9ebfde3e71e517918648b57c6b52c6d2c86bc9fe79d555d158edae4a9a2dc54c91bbfc32962280e328d97e26875114d4e1b0c98f693923b04
+  metadata.gz: 01bf52dbc6e7077e6ff2a67ab22504dda4be927f31da8be7e5383136b5cac500cd7920203b7383ebe302af5ddce375e0ee7389273a275edfde27971de8ae87bb
+  data.tar.gz: 79e7b8dcf00223118a0e3f5bb648ed33e920dc915909f62d1c21f2a19332f3d35336d3e5ca85a31632416b9fb9364d58db2fb6a4f90e7a200bc7cb706f76e14b

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.64<!--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

@@ -1394,10 +1394,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 +1405,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 +1420,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/version.rb

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

data/lib/doing/wwid.rb

@@ -7,7 +7,7 @@ require 'pp'
 ##
 ## @brief      Hash helpers
 ##
-class Hash
+class ::Hash
   def has_tags?(tags, bool = 'AND')
     tags = tags.split(/ *, */) if tags.is_a? String
     item = self
@@ -667,6 +667,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 +710,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 +726,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 +749,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.64
+  version: 1.0.65
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-22 00:00:00.000000000 Z
+date: 2021-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake