icalPal 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dab143a05d8a63ae36b721ca6ba53180c75d8b4dd0f0cebdc84fb533968c248
-  data.tar.gz: 8d243a120762c90059e4206a2deb5e79b821e558cf9ad9a437ad84fbfbb6a21b
+  metadata.gz: 76513daaf66f3c4aa8b2a9e1703f275ba5d5a65ef9e8b71a86b263c59d409fdd
+  data.tar.gz: c06430cfbdd5c415dae2d154b774c1ba1feb210534e6511f9fbb1cf12052cbfd
 SHA512:
-  metadata.gz: 24f4b88c592e59f2ffbc116761d6da41b60a7e5d4554feea9bdb023450967eaa7921f5c4708a66bf76554926ab4e0ca52965470f7576cef1cce5aec9a6112cbb
-  data.tar.gz: d69cc1d2cd63072020a4059a352ccdb2262a189e10c3c4e1891bd1c953ea2cb60a577fc83bd2ab55b561d0a752b0fb4198495bc2a5f57909d4216101cc7ea012
+  metadata.gz: 290f75e744ea88673f474c478565ec281a2b8eae8dcfc730ccb7abf88f33b5fdc8c10baf53b971c336d48a3a4abc3f311e02973e9f2295fea2d134e3d987a499
+  data.tar.gz: af3d7eec48d408f2c7ff15af7cdddcf581fa60574e1ab3602efb32e6625bfa61833919194108fe012fbae35a312c14af6ffbf628be4921d7cd11651e67717151

data/bin/icalPal

@@ -130,6 +130,18 @@ $rows.each_with_index do |row, i|
     next
   end
 
+  # --regexp
+  if $opts[:match]
+    r = $opts[:match].split('=')
+
+    if item[r[0]].to_s.respond_to?(:match)
+      unless item[r[0]].to_s.match(Regexp.new(r[1].to_s, Regexp::IGNORECASE)) then
+        $log.debug(":regex")
+        next
+      end
+    end
+  end
+
   if ICalPal::Event === item
     # Check for all-day and cancelled events
     if $opts[:ea] && item['all_day'].positive? then

data/lib/defaults.rb

@@ -26,6 +26,7 @@ $defaults = {
     output: 'default',
     ps: [ "\n  " ],
     r: false,
+    match: nil,
     sc: false,
     sd: false,
     sep: false,

data/lib/event.rb

@@ -110,20 +110,22 @@ module ICalPal
     #   If an event spans multiple days, the return value will contain
     #   a unique {Event} for each day that falls within our window
     def non_recurring
-      retval = []
+      events = []
 
       # Repeat for multi-day events
       ((self['duration'] / 86400).to_i + 1).times do |i|
         break if self['sdate'] > $opts[:to]
 
         $log.debug("multi-day event #{i + 1}") if (i > 0)
+
         self['daynum'] = i + 1
-        retval.push(clone) if in_window?(self['sdate'])
+        events.push(clone) if in_window?(self['sdate'])
+
         self['sdate'] += 1
         self['edate'] += 1
       end
 
-      retval
+      events
     end
 
     # Check recurring events
@@ -131,35 +133,49 @@ module ICalPal
     # @return [Array<Event>]
     #   All occurrences of a recurring event that are within our window
     def recurring
-      retval = []
+      stop = [ $opts[:to], (self['rdate'] || $opts[:to]) ].min
 
       # See if event ends before we start
-      stop = [ $opts[:to], (self['rdate'] || $opts[:to]) ].min
       if stop < $opts[:from] then
         $log.debug("#{stop} < #{$opts[:from]}")
-        return(retval)
+        return(Array.new)
       end
 
       # Get changes to series
-      changes = $rows.select { |r| r['orig_item_id'] == self['ROWID'] }
+      changes = [ { 'orig_date' => -1 } ]
+      changes += $rows.select { |r| r['orig_item_id'] == self['ROWID'] }
+
+      events = []
+      count = 1
 
-      i = 1
       while self['sdate'] <= stop
-        if self['count'].positive? && i > self['count'] then
-          $log.debug("count exceeded: #{i} > #{self['count']}")
-          return(retval)
+        # count
+        break if self['count'].positive? and count > self['count']
+        count += 1
+
+        # Handle specifier or clone self
+        if self['specifier'] and self['specifier'].length.positive?
+          occurrences = get_occurrences(changes)
+        else
+          occurrences = [ clone ]
         end
-        i += 1
 
-        unless @self['xdate'].any?(@self['sdate']) # Exceptions?
-          o = get_occurrences(changes)
-          o.each { |r| retval.push(r) if in_window?(r['sdate'], r['edate']) }
+        # Check for changes
+        occurrences.each do |occurrence|
+          changes.each do |change|
+            next if change['orig_date'] == self['sdate'].to_i - ITIME
+            events.push(occurrence) if in_window?(occurrence['sdate'], occurrence['edate'])
+          end
         end
 
+        break if self['specifier']
         apply_frequency!
       end
 
-      retval
+      # Remove exceptions
+      events.delete_if { |event| event['xdate'].any?(event['sdate']) }
+
+      return(events)
     end
 
     private
@@ -168,67 +184,72 @@ module ICalPal
 
     # @return a deep clone of self
     def clone()
-      self['stime'] = @self['sdate'].to_i
-      self['etime'] = @self['edate'].to_i
-
       Marshal.load(Marshal.dump(self))
     end
 
-    # Get next occurences of a recurring event
+    # Get next occurences of a recurring event from a specifier
     #
     # @param changes [Array] Recurrence changes for the event
     # @return [Array<IcalPal::Event>]
     def get_occurrences(changes)
-      ndate = self['sdate']
-      odays = []
-      retval = []
-
-      # Deconstruct specifier(s)
-      if self['specifier']
-        self['specifier'].split(';').each do |k|
-          j = k.split('=')
-
-          # M=Day of the month, O=Month of the year, S=Nth
-          case j[0]
-          when 'M' then ndate = RDT.new(ndate.year, ndate.month, j[1].to_i)
-          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']
+      occurrences = []
+
+      dow = DOW.keys
+      dom = [ nil ]
+      moy = 1..12
+      nth = nil
+
+      specifier = self['specifier']? self['specifier'] : []
+
+      # Deconstruct specifier
+      specifier.split(';').each do |k|
+        j = k.split('=')
+
+        # D=Day of the week, M=Day of the month, O=Month of the year, S=Nth
+        case j[0]
+        when 'D' then dow = j[1].split(',')
+        when 'M' then dom = j[1].split(',')
+        when 'O' then moy = j[1].split(',')
+        when 'S' then nth = j[1].to_i
+        else $log.warn("Unknown specifier: #{k}")
         end
+      end
 
-        # D=Day of the week
-        self['specifier'].split(';').each do |k|
-          j = k.split('=')
+      # Build array of DOWs
+      dows = [ nil ]
+      dow.each { |d| dows.push(DOW[d[-2..-1].to_sym]) }
 
-          odays = j[1].split(',') if j[0] == 'D'
-        end
-      end
+      # Months of the year (O)
+      moy.each do |m|
+        next unless m
 
-      # Deconstruct occurence day(s)
-      odays.each do |n|
-        dow = DOW[n[-2..-1].to_sym]
-        ndate += 1 until ndate.wday == dow
-        ndate = ICalPal.nth(Integer(n[0..1]), n[-2..-1], ndate) unless (n[0] == '0')
+        nsdate = RDT.new(self['sdate'].year, m.to_i, 1)
+        nedate = RDT.new(self['edate'].year, m.to_i, 1)
 
-        # Check for changes
-        changes.detect(
-          proc {
-            self['sdate'] = RDT.new(*ndate.to_a[0..2], *self['sdate'].to_a[3..])
-            self['edate'] = RDT.new(*ndate.to_a[0..2], *self['edate'].to_a[3..])
-            retval.push(clone)
-          }) { |i| @self['sday'] == i['sday'] }
-      end
+        # Days of the month (M)
+        dom.each do |x|
+          next unless x
 
-      # Check for changes
-      changes.detect(
-        proc {
-          retval.push(clone)
-        }) { |i| @self['sday'] == i['sday'] } unless retval.count.positive?
+          self['sdate'] = RDT.new(nsdate.year, nsdate.month, x.to_i)
+          self['edate'] = RDT.new(nedate.year, nedate.month, x.to_i)
+          occurrences.push(clone)
+        end
+
+        # Days of the week (D)
+        if nth
+          self['sdate'] = ICalPal.nth(nth, dows, nsdate)
+          self['edate'] = ICalPal.nth(nth, dows, nedate)
+          occurrences.push(clone)
+        else
+          if dows[0]
+            self['sdate'] = RDT.new(nsdate.year, m.to_i, nsdate.wday)
+            self['edate'] = RDT.new(nedate.year, m.to_i, nedate.wday)
+            occurrences.push(clone)
+          end
+        end
+      end
 
-      retval
+      return(occurrences)
     end
 
     # Apply frequency and interval
@@ -243,6 +264,7 @@ module ICalPal
         when 'weekly'  then self[d] +=  self['interval'] * 7
         when 'monthly' then self[d] >>= self['interval']
         when 'yearly'  then self[d] >>= self['interval'] * 12
+        else $log.error("Unknown frequency: #{self['frequency']}")
         end
       end if self['frequency'] && self['interval']
     end

data/lib/icalPal.rb

@@ -141,7 +141,7 @@ module ICalPal
   # Get the +n+'th +dow+ in month +m+
   #
   # @param n [Integer] Integer between -4 and +4
-  # @param dow [String] Day of the week abbreviation from ICalPal::DOW
+  # @param dow [Array] Days of the week
   # @param m [RDT] The RDT with the year and month we're searching
   # @return [RDT] The resulting day
   def self.nth(n, dow, m)
@@ -155,7 +155,7 @@ module ICalPal
 
     j = 0
     a[0].step(a[1], step) do |i|
-      j += step if i.wday == DOW[dow.to_sym]
+      j += step if dow.any?(i.wday)
       return i if j == n
     end
   end

data/lib/options.rb

@@ -55,7 +55,7 @@ module ICalPal
             "Print as FORMAT (default: #{$defaults[:common][:output]})", "[#{OUTFORMATS.join(', ')}]")
       
       # include/exclude
-      @op.separator("\nIncluding/excluding calendars:\n\n")
+      @op.separator("\nIncluding/excluding accounts, calendars, items:\n\n")
 
       @op.on('--is=ACCOUNTS', Array, 'List of accounts to include')
       @op.on('--es=ACCOUNTS', Array, 'List of accounts to exclude')
@@ -73,6 +73,9 @@ module ICalPal
       @op.on('--il=LISTS', Array, 'List of reminder lists to include')
       @op.on('--el=LISTS', Array, 'List of reminder lists to exclude')
 
+      @op.separator('')
+      @op.on('--match=FIELD=REGEXP', String, 'Include only items whose FIELD matches REGEXP (ignoring case)')
+
       # dates
       @op.separator("\nChoosing dates:\n\n")
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module ICalPal
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

metadata

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