icalPal 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6fac725e88ea9664672d6a52877cb99c2278fe851516316cf51e9e264bb4cd1
-  data.tar.gz: 7332400d9ee46f3aeebad92c2c2098e90e64b721d1cf455ab74a1e231365686c
+  metadata.gz: c08ab4aaf0558f9648fbefbb9eaea1aac9c50de2770e1897699b619ba92ef6b6
+  data.tar.gz: '087d14b6e855bdbf2681e526941baec600fed607a6e6760b09f4361bb33735d8'
 SHA512:
-  metadata.gz: db8c28fdeeba37d4a7b3a10dffc1651fd2c8f1b1ede100eceb00e3ee99e853aa2b797e8421fa9bfaab0579775e0ded38ed7e18909f342a682a24540dc0f589a1
-  data.tar.gz: dc7aa7cc84b653929904a2eeb33407a576bff18a78fb5b58f38b7ffda9d6cc6b4afd3e267977a32f66f13baf2788b1bff4ca9f43ed037aff9e71179cbf01143d
+  metadata.gz: 70934664b432d1b99e0f200bd1e78a2b142f9b1b9b405c8763913aa9d414a83171f4876e0145ff741854abd1b643fdb4a72031b564af14a2a4f1764cc494a13f
+  data.tar.gz: '0580e0d9556919516b1c2d4a4ea11306a2a8786ea80ee5ccc5821c97f899d7bc95c3499c7f5d9dc05ac091dba53867b01a7b676e0bd20881563d7529e16a1a31'

data/bin/icalPal

@@ -59,45 +59,91 @@ q = klass::QUERY
 $log.debug(q.gsub(/\n/, ' '))
 
 # Get it
-stmt = $db.prepare(q)
-abort(stmt.columns.sort.join(' ')) if $opts[:props].any? 'list'
-$opts[:props] = stmt.columns - $opts[:eep] if $opts[:props].any? 'all'
+begin
+  stmt = $db.prepare(q)
+  abort(stmt.columns.sort.join(' ')) if $opts[:props].any? 'list'
+  $opts[:props] = stmt.columns - $opts[:eep] if $opts[:props].any? 'all'
+
+  # Iterate the SQLite3::ResultSet once
+  stmt.execute.each_with_index { |i, j| $rows[j] = i }
+  stmt.close
 
-# Iterate the SQLite3::ResultSet once
-stmt.execute.each_with_index { |i, j| $rows[j] = i }
-stmt.close
+  # Close the database
+  $db.close
+  $log.debug("Closed #{$opts[:db]}")
 
-$log.info("Loaded #{$rows.count} rows from #{$db.filename}")
-$db.close
+rescue SQLite3::BusyException => e
+  $log.error("Non-fatal error closing database #{$db.filename}")
+
+rescue SQLite3::SQLException => e
+  abort(e.message)
+end
+
+$log.info("Loaded #{$rows.count} rows from #{$opts[:db]}")
 
 
 ##################################################
 # Process the data
 
 # Add rows
-$rows.each do |row|
+$rows.each_with_index do |row, i|
+  $log.debug("Row #{i}: #{row['ROWID']}:#{row['UUID']} - #{row['account']}/#{row['calendar']}/#{row['title']}")
+
   # --es/--is
-  next if $opts[:es].any? row['account']
-  next unless $opts[:is].empty? or $opts[:is].any? row['account']
+  if $opts[:es].any? row['account'] then
+    $log.debug(":es")
+    next
+  end
+
+  unless $opts[:is].empty? or $opts[:is].any? row['account']
+    $log.debug(":is");
+    next
+  end
 
   # --ec/--ic
-  next if $opts[:ec].any? row['calendar']
-  next unless $opts[:ic].empty? or $opts[:ic].any? row['calendar']
+  if $opts[:ec].any? row['calendar'] then
+    $log.debug(":ec")
+    next
+  end
+
+  unless $opts[:ic].empty? or $opts[:ic].any? row['calendar']
+    $log.debug(":ic")
+    next
+  end
 
   item = klass.new(row)
 
   # --et/--it
-  next if $opts[:et].any? item['type']
-  next unless $opts[:it].empty? or $opts[:it].any? item['type']
+  if $opts[:et].any? item['type'] then
+    $log.debug(":et")
+    next
+  end
+
+  unless $opts[:it].empty? or $opts[:it].any? item['type']
+    $log.debug(":it")
+    next
+  end
 
   unless ICalPal::Event === item
     # Always add non-event items
+    $log.debug("Adding non-event #{item}")
     add(item)
   else
     # Check for all-day and cancelled events
-    next if $opts[:ea] && item['all_day'].positive?
-    next if $opts[:ia] && !item['all_day'].positive?
-    next if item['status'] == :canceled
+    if $opts[:ea] && item['all_day'].positive? then
+      $log.debug(":ea")
+      next
+    end
+
+    if $opts[:ia] && !item['all_day'].positive? then
+      $log.debug(":ia")
+      next
+    end
+
+    if item['status'] == :canceled then
+      $log.debug(":canceled")
+      next
+    end
 
     (item['has_recurrences'].positive?)?
       item.recurring.each { |i| add(i) } :
@@ -111,12 +157,14 @@ if $opts[:sed] && $opts[:sd] && klass == ICalPal::Event
 
   $opts[:days].times do |n|
     day = $opts[:from] + n
-    $items.push(klass.new(day)) unless days.any? { |i| i == day }
+    $items.push(klass.new(day)) unless days.any? { |i| i.to_s == day.to_s }
   end
 end
 
 # Sort the rows
 begin
+  $log.debug("Sorting/uniqing #{$items.count} items by #{[ $opts[:sep], $opts[:sort], 'sdate' ]}, reverse #{$opts[:reverse].inspect}")
+
   $items.sort_by! { |i| [ i[$opts[:sep]], i[$opts[:sort]], i['sdate'] ] }
   $items.reverse! if $opts[:reverse]
   $items.uniq!
@@ -124,6 +172,8 @@ rescue ArgumentError => e
   $log.warn("Sorting failed, results may be unexpected\n")
 end
 
+$log.debug("#{$items.count} items remain")
+
 # Configure formatting
 mu = case $opts[:output]
      when 'ansi' then RDoc::Markup::ToAnsi.new
@@ -145,15 +195,20 @@ mu = case $opts[:output]
 items = $items[0..$opts[:li] - 1]
 
 unless mu
+  $log.debug("Output in #{$opts[:output]} format")
+
   puts case $opts[:output]
        when 'csv' then
-         o = {
-           headers: items[0].keys,
-           write_converters: proc { |f| f.respond_to?(:gsub)? f.gsub(/\n/, '\n') : f },
-           write_headers: true,
-         }
+         # Get all headers
+         headers = []
+         items.each { |i| headers += i.keys }
+         headers.uniq!
 
-         CSV.generate(**o) { |k| items.each { |i| k << i.values.map { |v| v.to_s } } }
+         # Populate a CSV::Table
+         table = CSV::Table.new([], headers: headers)
+         items.each { |i| table << i.to_csv(headers) }
+
+         table
        when 'hash' then items.map { |i| i.self }
        when 'json' then items.map { |i| i.self }.to_json
        when 'yaml' then items.map { |i| i.self }.to_yaml
@@ -168,9 +223,13 @@ unless mu
   exit
 end
 
+$log.debug("Formatting with #{mu.inspect}")
+
 section = nil if $opts[:sep]
 
 items.each_with_index do |i, j|
+  $log.debug("Print #{j}: #{i.inspect}")
+
   # --li
   break if $opts[:li].positive? && j >= $opts[:li]
 
@@ -178,7 +237,7 @@ items.each_with_index do |i, j|
 
   # Sections
   if $opts[:sep] && section != i[$opts[:sep]]
-    $log.debug("Section: #{i[$opts[:sep]]}")
+    $log.debug("New section '#{$opts[:sep]}': #{i[$opts[:sep]]}")
 
     v = RDoc::Markup::Verbatim.new
     v.format = { item: i, prop: $opts[:sep] }
@@ -210,7 +269,7 @@ items.each_with_index do |i, j|
       props << RDoc::Markup::Heading.new(2, i[prop].to_s)
     else
       props << RDoc::Markup::BlankLine.new unless (i['placeholder'] || $opts[:ps])
-      props << RDoc::Markup::ListItem.new(prop, RDoc::Markup::Paragraph.new(i[prop]))
+      props << RDoc::Markup::ListItem.new(prop, RDoc::Markup::Paragraph.new(i[prop])) unless(i['placeholder'])
     end
   end
 

data/icalPal.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name	= "icalPal"
-  s.version	= "1.2.0"
+  s.version	= "1.2.1"
   s.summary	= "Command-line tool to query the macOS Calendar"
   s.description	= <<-EOF
 Inspired by icalBuddy and maintains close compatability.  Includes

data/lib/event.rb

@@ -3,6 +3,11 @@ module ICalPal
   class Event
     include ICalPal
 
+    # Standard accessor with special handling for +sdate+.  Setting
+    # +sdate+ will also set +sday+.
+    #
+    # @param k [String] Key/property name
+    # @param v [Object] Key/property value
     def []=(k, v)
       @self[k] = v
       @self['sday'] = ICalPal::RDT.new(*self['sdate'].to_a[0..2]) if k == 'sdate'
@@ -27,7 +32,7 @@ module ICalPal
           t += ' at ' unless @self['all_day'].positive?
         end
 
-        unless @self['all_day'] && @self['all_day'].positive?
+        unless @self['all_day'] && @self['all_day'].positive? || @self['placeholder']
           t ||= ''
           t += "#{@self['sdate'].strftime($opts[:tf])}" if @self['sdate']
           t += " - #{@self['edate'].strftime($opts[:tf])}" unless $opts[:eed] || !@self['edate']
@@ -65,10 +70,11 @@ module ICalPal
     def initialize(obj)
       # Placeholder for days with no events
       return @self = {
-        $opts[:sep] => obj,
-        'placeholder' => true,
-        'title' => 'Nothing.',
-      } if DateTime === obj
+               $opts[:sep] => obj,
+               'sdate' => obj,
+               'placeholder' => true,
+               'title' => 'Nothing.',
+             } if DateTime === obj
 
       @self = {}
       obj.keys.each { |k| @self[k] = obj[k] }
@@ -108,6 +114,7 @@ module ICalPal
 
       # Repeat for multi-day events
       ((self['duration'] / 86400).to_i + 1).times do |i|
+        $log.debug("multi-day event #{i + 1}") if (i > 0)
         self['daynum'] = i + 1
         retval.push(clone) if in_window?(self['sdate'])
         self['sdate'] += 1
@@ -126,14 +133,20 @@ module ICalPal
 
       # See if event ends before we start
       stop = [ $opts[:to], (self['rdate'] || $opts[:to]) ].min
-      return(retval) if stop < $opts[:from]
+      if stop < $opts[:from] then
+        $log.debug("#{stop} < #{$opts[:from]}")
+        return(retval)
+      end
 
       # Get changes to series
       changes = $rows.select { |r| r['orig_item_id'] == self['ROWID'] }
 
       i = 1
       while self['sdate'] <= stop
-        return(retval) if self['count'].positive? && i > self['count']
+        if self['count'].positive? && i > self['count'] then
+          $log.debug("count exceeded: #{i} > #{self['count']}")
+          return(retval)
+        end
         i += 1
 
         unless @self['xdate'].any?(@self['sdate']) # Exceptions?
@@ -179,6 +192,9 @@ module ICalPal
           when 'O' then ndate = RDT.new(ndate.year, j[1].to_i, ndate.day)
           when 'S' then @self['specifier'].sub!(/D=0/, "D=+#{j[1].to_i}")
           end
+
+          # No time travel!
+          ndate = self['sdate'] if ndate <= self['sdate']
         end
 
         # D=Day of the week
@@ -236,9 +252,23 @@ module ICalPal
     # @param e [RDT] Event end
     # @return [Boolean]
     def in_window?(s, e = s)
-      $opts[:n]?
-        ($now >= s && $now < e) :
-        ([ s, e ].max >= $opts[:from] && s < $opts[:to])
+      if $opts[:n] then
+        if ($now >= s && $now < e) then
+          $log.debug("now: #{s} to #{e} vs. #{$now}")
+          return(true)
+        else
+          $log.debug("not now: #{s} to #{e} vs. #{$now}")
+          return(false)
+        end
+      else
+        if ([ s, e ].max >= $opts[:from] && s < $opts[:to]) then
+          $log.debug("in window: #{s} to #{e} vs. #{$opts[:from]} to #{$opts[:to]}")
+          return(true)
+        else
+          $log.debug("not in window: #{s} to #{e} vs. #{$opts[:from]} to #{$opts[:to]}")
+          return(false)
+        end
+      end
     end
 
     QUERY = <<~SQL

data/lib/icalPal.rb

@@ -43,6 +43,18 @@ module ICalPal
     @self = obj
   end
 
+  # Create a new CSV::Row with values from +self+.  Newlines are
+  # replaced with '\n' to ensure each Row is a single line of text.
+  #
+  # @param headers [Array] Key names used as the header row in a CSV::Table
+  # @return [CSV::Row] The +Store+, +Calendar+, or +CalendarItem+ as a CSV::Row
+  def to_csv(headers)
+    values = []
+    headers.each { |h| values.push(@self[h].respond_to?(:gsub)? @self[h].gsub(/\n/, '\n') : @self[h]) }
+
+    CSV::Row::new(headers, values)
+  end
+
   # Get the +n+'th +dow+ in month +m+
   #
   # @param n [Integer] Integer between -4 and +4

data/lib/options.rb

@@ -23,7 +23,7 @@ module ICalPal
       @op = OptionParser.new
       @op.summary_width = 23
       @op.banner += " [-c] COMMAND"
-      @op.version = '1.2.0'
+      @op.version = '1.2.1'
 
       @op.accept(ICalPal::RDT) { |s| ICalPal::RDT.conv(s) }
 

data/lib/rdt.rb

@@ -52,5 +52,12 @@ module ICalPal
     def to_i
       to_time.to_i
     end
+
+    # @see ICalPal::RDT.to_s
+    #
+    # @return [Boolean]
+    def ==(obj)
+      self.to_s == obj.to_s
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalPal
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Andy Rosen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-05 00:00:00.000000000 Z
+date: 2024-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3