icalPal 3.7.1 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3334419bc5644203db9bde2b96e1cb3d213bf767150a58e9adabc7238755b76
-  data.tar.gz: 8dfa347e6bf5bd9ef02a4512a72573719a4a241d2d8660954c3b9c286e02445a
+  metadata.gz: 5f6b4e0abaf6ebfaceb51c92f393411df9f5edf2669bdef2121a2c6a09f7443f
+  data.tar.gz: 68297ddc631da32b6d4bdd5d25726892ce271b50a122a922f84ff4839e0f9500
 SHA512:
-  metadata.gz: ca0cd2fc4f82278fe2ff9a09f3aebf7f6a24ad9c548fb4810e3368454fc51aa4c964da2751fb29ee2ff4bdb65ea62462259ceb47cc96e86cb861d01c9c2ca3c9
-  data.tar.gz: efc907d25a32059e1b99920f608acae7233808072d5a946c6df7daa78fc182bb8749720b2aa1130997d0f04fb07bca5629a1c619d49d406a17f399c76919c59e
+  metadata.gz: db0d030f84bd00891f3bd3fbece35dabb6d43b429e94bfe04aa6323979a0382b8ea0bcaceddb662faa55f6008f813af004f3f2778a1d029ae99d037bb8fb7bb0
+  data.tar.gz: e4fc2f8e55ac0db6a9175c836499fe1cc3b5e24d10d2d71964c033e18904d9beb24f3731da2e94feddd1797d8059e09b0f9685f383684f4df1492236fcc35c78

data/README.md

@@ -10,14 +10,13 @@ on any system with [Ruby](https://www.ruby-lang.org/) and access to a
 Calendar or Reminders database.
 
 <!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc-refresh-toc -->
-
 **Table of Contents**
 
 - [Installation](#installation)
 - [Features](#features)
-  - [Compatability with icalBuddy](#compatability-with-icalbuddy)
   - [Additional commands](#additional-commands)
   - [Additional options](#additional-options)
+  - [Additional properties](#additional-properties)
 - [Usage](#usage)
 - [Output formats](#output-formats)
 - [History](#history)
@@ -67,24 +66,61 @@ as *Stores*; you can run ```icalPal stores``` instead.
 
 Shows only reminders that have a due date.
 
+```icalPal reminders```
+
+*reminders*, *datedReminders*, and *undatedReminders* can be used instead of *tasks*
+
 ### Additional options
 
 * Options can be abbreviated, so long as they are unique.  Eg., ```icalPal -c ev --da 3``` is the same as ```icalPal -c events --days 3```.
 * The ```-c``` part is optional, but you cannot abbreviate the command if you leave it off.
 * Use ```-o``` to print the output in different formats.  CSV or JSON are intertesting choices.
-* Copy your Calendar database file and use ```--db``` on it.
+* Copy your Calendar or Reminders database file and use ```--db``` on it.
 * ```--it``` and ```--et``` will filter by Calendar *type*.  Types are **Local**, **Exchange**, **CalDAV**, **MobileMe**, **Subscribed**, **Birthdays**, and **Reminders**
 * ```--il``` and ```-el``` will filter by Reminder list
 * ```--ia``` includes *only* all-day events (opposite of ```--ea```)
 * ```--aep``` is like ```--iep```, but *adds* to the default property list instead of replacing it.
 * ```--sep``` to separate by any property, not just calendar (```--sc```) or date (```--sd```)
-* ```--color``` uses a wider color palette.  Calendar colors are what you have chosen in the Calendar app.  Not supported in all terminals, but looks great in [iTerm2](https://iterm2.com/).
+* ```--color``` uses a wider color palette.  Colors are what you have chosen in the Calendar and Reminders apps, including custom colors
 * ```--match``` lets you filter the results of any command to items where a *FIELD* matches a regular expression.  Eg., ```--match notes=zoom.us``` to show only Zoom meeetings
 
 Because icalPal is written in Ruby, and not a native Mac application,
 you can run it just about anywhere.  It's been tested with the
-versions of Ruby included with macOS Sequoia (2.6.10) and
-[Homebrew](https://brew.sh/) (3.4.4).
+versions of Ruby included with macOS Sequoia and Tahoe (2.6.10) and
+[Homebrew](https://brew.sh/) (3.4.x).
+
+### Additional properties
+
+Several additional properties are available for each command.
+
+* Accounts
+  * account
+  * notes
+  * owner
+  * type
+  * delegations
+
+* Calendar
+  * account
+  * shared\_owner_name, shared\_owner_address
+  * self\_identity_email, owner\_identity_email
+  * subcal_account_id, subcal_url
+  * published_URL
+  * notes
+  * locale
+
+* Tasks
+	* id
+	* group
+	* section
+	* tags
+	* assignee
+	* timezone
+	* Notifications
+	  * due (due_date formatted with --df and --tf options)
+	  * alert (Early Reminder)
+	  * location, proximity (arriving or leaving), radius (in meters)
+	  * messaging (email addresses and phone numbers from "When Messaging")
 
 ## Usage
 
@@ -109,16 +145,16 @@ Global options:
 ```
     -c, --cmd=COMMAND       Command to run
         --db=DB             Use DB file instead of Calendar
-                            (default: ["/Users/user/Library/Group Containers/group.com.apple.calendar/Calendar.sqlitedb", "/Users/user/Library/Calendars/Calendar.sqlitedb"]
+                            (default: ["$HOME/Library/Group Containers/group.com.apple.calendar/Calendar.sqlitedb", "/Users/user/Library/Calendars/Calendar.sqlitedb"]
                             For the tasks commands this should be a directory containing .sqlite files
-                            (default: /Users/user/Library/Group Containers/group.com.apple.reminders/Container_v1/Stores)
-        --cf=FILE           Set config file path (default: /Users/user/.icalpal)
+                            (default: $HOME/Library/Group Containers/group.com.apple.reminders/Container_v1/Stores)
+        --cf=FILE           Set config file path (default: $HOME/.icalpal)
         --norc              Ignore ICALPAL and ICALPAL_CONFIG environment variables
     -o, --output=FORMAT     Print as FORMAT (default: default)
                             [ansi, csv, default, hash, html, json, md, rdoc, remind, toc, xml, yaml]
 ```
 
-Including/excluding calendars and reminders:
+Including/excluding accounts, calendars, reminders and items:
 ```
         --is=ACCOUNTS       List of accounts to include
         --es=ACCOUNTS       List of accounts to exclude
@@ -133,8 +169,7 @@ Including/excluding calendars and reminders:
         --il=LISTS          List of reminder lists to include
         --el=LISTS          List of reminder lists to exclude
 
-        --match=FIELD=REGEXP
-                            Include only items whose FIELD matches REGEXP (ignoring case)
+        --match=FIELD=REGEX Include only items whose FIELD matches REGEXP (ignoring case)
 ```
 
 Choosing dates:

data/bin/icalPal

@@ -56,6 +56,7 @@ end
 $opts = ICalPal::Options.new.parse_options
 
 $rows = []                      # Rows from the database
+$sections = []                  # Calendar list sections
 $items = []                     # Items to be printed
 
 
@@ -93,19 +94,31 @@ $opts[:db].each do |db|
       # Load all .sqlite files
       $log.debug("Loading *.sqlite in #{db}")
       Dir.glob("#{db}/*.sqlite").each do |d|
-        $rows += ICalPal.load_data(d, klass::QUERY)
         success = true
 
+        rows = klass.load_data(d, klass::QUERY)
+        $rows += rows
+
+        sections = klass.load_data(d, klass::SECTIONS_QUERY)
+        $sections += sections
+
+        $log.info("Loaded #{rows.length} rows and #{sections.length} sections from #{d}")
       rescue SQLite3::CantOpenException
         # Non-fatal exception, try the next one
       end
+
+    rescue Errno::EPERM
+      # Probably need Full Disk Access
     end
   else
     # Load database
     begin
-      $rows += ICalPal.load_data(db, klass::QUERY)
+      rows = ICalPal.load_data(db, klass::QUERY)
+      $rows += rows
+
       success = true
 
+      $log.info("Loaded #{rows.length} rows from #{db}")
     rescue SQLite3::CantOpenException
       # Non-fatal exception, try the next one
     end
@@ -140,8 +153,7 @@ unless success
   abort
 end
 
-$log.info("Loaded #{$rows.count} #{klass} rows")
-$log.info("Window is #{$opts[:from]} to #{$opts[:to]}")
+$log.info("Window is #{$opts[:from]} to #{$opts[:to]}") if $opts[:from]
 
 
 ##################################################
@@ -191,8 +203,8 @@ $rows.each do |row|
   else
     # Check for dated reminders
     if ICalPal::Reminder === item
-      next if $opts[:dated] == 1 && item['due_date'].positive?
-      next if $opts[:dated] == 2 && item['due_date'].zero?
+      next if $opts[:dated] == 1 && item['due_date'] && item['due_date'].positive?
+      next if $opts[:dated] == 2 && (!item['due_date'] || item['due_date'].zero?)
     end
 
     add(item)
@@ -211,9 +223,14 @@ end
 
 # Sort the rows
 begin
-  $log.info("Sorting #{$items.count} items by #{[ $opts[:sep], $opts[:sort], 'sdate' ]}, reverse #{$opts[:reverse].inspect}")
+  sort = []
+  sort.push $opts[:sep] if $opts[:sep]
+  sort.push $opts[:sort] if $opts[:sort]
+  sort.push 'sdate'
+
+  $log.info("Sorting #{$items.count} items by #{sort}, reverse #{$opts[:reverse].inspect}")
 
-  $items.sort_by! { |i| [ i[$opts[:sep]], i[$opts[:sort]], i['sdate'] ] }
+  $items.sort_by! { |i| sort }
   $items.reverse! if $opts[:reverse]
 rescue Exception => e
   $log.info("Sorting failed: #{e}\n")

data/bin/icalpal

@@ -56,6 +56,7 @@ end
 $opts = ICalPal::Options.new.parse_options
 
 $rows = []                      # Rows from the database
+$sections = []                  # Calendar list sections
 $items = []                     # Items to be printed
 
 
@@ -93,19 +94,31 @@ $opts[:db].each do |db|
       # Load all .sqlite files
       $log.debug("Loading *.sqlite in #{db}")
       Dir.glob("#{db}/*.sqlite").each do |d|
-        $rows += ICalPal.load_data(d, klass::QUERY)
         success = true
 
+        rows = klass.load_data(d, klass::QUERY)
+        $rows += rows
+
+        sections = klass.load_data(d, klass::SECTIONS_QUERY)
+        $sections += sections
+
+        $log.info("Loaded #{rows.length} rows and #{sections.length} sections from #{d}")
       rescue SQLite3::CantOpenException
         # Non-fatal exception, try the next one
       end
+
+    rescue Errno::EPERM
+      # Probably need Full Disk Access
     end
   else
     # Load database
     begin
-      $rows += ICalPal.load_data(db, klass::QUERY)
+      rows = ICalPal.load_data(db, klass::QUERY)
+      $rows += rows
+
       success = true
 
+      $log.info("Loaded #{rows.length} rows from #{db}")
     rescue SQLite3::CantOpenException
       # Non-fatal exception, try the next one
     end
@@ -140,8 +153,7 @@ unless success
   abort
 end
 
-$log.info("Loaded #{$rows.count} #{klass} rows")
-$log.info("Window is #{$opts[:from]} to #{$opts[:to]}")
+$log.info("Window is #{$opts[:from]} to #{$opts[:to]}") if $opts[:from]
 
 
 ##################################################
@@ -191,8 +203,8 @@ $rows.each do |row|
   else
     # Check for dated reminders
     if ICalPal::Reminder === item
-      next if $opts[:dated] == 1 && item['due_date'].positive?
-      next if $opts[:dated] == 2 && item['due_date'].zero?
+      next if $opts[:dated] == 1 && item['due_date'] && item['due_date'].positive?
+      next if $opts[:dated] == 2 && (!item['due_date'] || item['due_date'].zero?)
     end
 
     add(item)
@@ -211,9 +223,14 @@ end
 
 # Sort the rows
 begin
-  $log.info("Sorting #{$items.count} items by #{[ $opts[:sep], $opts[:sort], 'sdate' ]}, reverse #{$opts[:reverse].inspect}")
+  sort = []
+  sort.push $opts[:sep] if $opts[:sep]
+  sort.push $opts[:sort] if $opts[:sort]
+  sort.push 'sdate'
+
+  $log.info("Sorting #{$items.count} items by #{sort}, reverse #{$opts[:reverse].inspect}")
 
-  $items.sort_by! { |i| [ i[$opts[:sep]], i[$opts[:sort]], i['sdate'] ] }
+  $items.sort_by! { |i| sort }
   $items.reverse! if $opts[:reverse]
 rescue Exception => e
   $log.info("Sorting failed: #{e}\n")

data/lib/EventKit.rb

@@ -30,13 +30,36 @@ class EventKit
     yearly
   ].freeze
 
-  EKReminderProperty = [
+  EKReminderPriority = [
     'none',                     # 0
     'high', nil, nil, nil,      # 1
     'medium', nil, nil, nil,    # 5
     'low',                      # 9
   ].freeze
 
+  EKReminderDueDateDeltaUnit = %w[
+    minutes
+    hours
+    days
+    weeks
+    months
+  ].freeze
+
+  EKReminderProximity = [
+    nil,
+    'arriving',
+    'leaving'
+  ].freeze
+
+  EKReminderAccessLevel = [
+    { value: 2, level: 'can add' }
+  ].freeze
+
+  EKReminderSharingStatus = [
+    { value: 1, status: 'accepted' },
+    { value: 5, status: 'invited' }
+  ].freeze
+
   # EKSourceType (with color)
   EKSourceType = [
     { name: 'Local',      color: '#FFFFFF' }, # White

data/lib/calendar.rb

@@ -3,20 +3,41 @@ module ICalPal
   class Calendar
     include ICalPal
 
+    def [](k)
+      case k
+      when 'name', 'title'      # Aliases
+        @self['calendar']
+
+      else @self[k]
+      end
+    end
+
     QUERY = <<~SQL.freeze
 SELECT DISTINCT
 
-Store.name AS account,
-Calendar.title AS calendar,
-*
+s1.name AS account,
+
+c1.UUID,
+c1.title AS calendar,
+
+c1.shared_owner_name,
+c1.shared_owner_address,
+
+c1.published_URL,
+c1.self_identity_email,
+c1.owner_identity_email,
+c1.notes,
+c1.subcal_account_id,
+c1.subcal_url,
+c1.locale
 
-FROM #{self.name.split('::').last}
+FROM #{self.name.split('::').last} c1
 
-JOIN Store ON store_id = Store.rowid
+JOIN Store s1 ON c1.store_id = s1.rowid
 
-WHERE Store.disabled IS NOT 1
-AND Store.display_order IS NOT -1
-AND Calendar.flags IS NOT 519
+WHERE s1.disabled IS NOT 1
+AND s1.display_order IS NOT -1
+AND c1.flags IS NOT 519
 SQL
 
   end

data/lib/defaults.rb

@@ -8,7 +8,6 @@ $defaults = {
   common: {
     ab: '!',
     aep: [],
-    atp: [],
     bullet: '•',
     cf: "#{Dir.home}/.icalpal",
     color: false,
@@ -20,7 +19,6 @@ $defaults = {
     df: '%b %-d, %Y',
     ec: [],
     eep: [],
-    etp: [],
     el: [],
     es: [],
     et: [],
@@ -45,25 +43,28 @@ $defaults = {
   tasks: {
     dated: 0,
     db: [ ICalPal::Reminder::DB_PATH ],
-    itp: %w[ title notes due priority ],
+    iep: %w[ title notes due priority ],
+    ps: [ "\n    " ],
     sort: 'prio',
   },
 
   undatedTasks: {
     dated: 1,
     db: [ ICalPal::Reminder::DB_PATH ],
-    itp: %w[ title notes due priority ],
+    iep: %w[ title notes due priority ],
+    ps: [ "\n    " ],
     sort: 'prio',
   },
 
   datedTasks: {
     dated: 2,
     db: [ ICalPal::Reminder::DB_PATH ],
-    itp: %w[ title notes due priority ],
+    iep: %w[ title notes due priority ],
+    ps: [ "\n    " ],
     sort: 'prio',
   },
 
-  stores: {
+  accounts: {
     iep: %w[ account type ],
     sort: 'account',
   },

data/lib/event.rb

@@ -55,7 +55,7 @@ module ICalPal
       when 'status'             # Integer -> String
         EventKit::EKEventStatus.select { |_k, v| v == @self['status'] }.keys[0]
 
-      when 'title'              # title[ (age N)]
+      when 'event', 'name', 'title' # title[ (age N)]
         @self['title'] + ((@self['calendar'] == 'Birthdays')? " (age #{self['age']})" : '')
 
       when 'uid'                # for icalBuddy
@@ -80,8 +80,7 @@ module ICalPal
         'title' => 'Nothing.',
       } if DateTime === obj
 
-      @self = {}
-      obj.each_key { |k| @self[k] = obj[k] }
+      super
 
       # Convert JSON arrays to Arrays
       @self['attendees'] = JSON.parse(obj['attendees'])
@@ -106,12 +105,7 @@ module ICalPal
         @self["#{k[0]}date"] = RDT.from_time(Time.at(ctime, in: zone))
       end
 
-      # Type of calendar event is from
-      obj['type'] = EventKit::EKSourceType.find_index { |i| i[:name] == 'Subscribed' } if obj['subcal_url']
-      type = EventKit::EKSourceType[obj['type']]
-
-      @self['symbolic_color_name'] ||= @self['color']
-      @self['type'] = type[:name]
+      @self.delete('unique_identifier')
     end
 
     # Check non-recurring events

data/lib/icalPal.rb

@@ -1,7 +1,7 @@
 %w[ EventKit ToICalPal calendar event rdt reminder store ].each { |l| rr l }
 
 # Encapsulate the _Store_ (accounts), _Calendar_ and _CalendarItem_
-# tables of a Calendar database, and the _Reminder_ table of a
+# tables of a Calendar database, and _Reminders_ (tasks) of a
 # Reminders database
 module ICalPal
   attr_reader :self
@@ -9,11 +9,11 @@ module ICalPal
   # Dynamic instantiation of our classes based on the command being
   # run
   #
-  # @param klass [String] One of +accounts+, +stores+, +calendars+, +events+, or +tasks+
+  # @param klass [String] One of +accounts+, +calendars+, +events+, or +tasks+
   # @return [Class] The subclass of ICalPal
   def self.call(klass)
     case klass
-    when 'accounts', 'stores' then Store
+    when 'accounts' then Store
     when 'calendars' then Calendar
     when 'events' then Event
     when 'tasks' then Reminder
@@ -23,7 +23,11 @@ module ICalPal
     end
   end
 
-  # Load data
+  # Load data from a database
+  #
+  # @param db_file [String] Path to the database file
+  # @param q [String] The query to run
+  # @return [Array<Hash>] Array of rows returned by the query
   def self.load_data(db_file, q)
     $log.debug(q.gsub("\n", ' '))
 
@@ -40,7 +44,7 @@ module ICalPal
       $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.execute.each { |i| rows.push(i) }
       stmt.close
 
       # Close the database
@@ -66,25 +70,30 @@ module ICalPal
     rows
   end
 
-  # @param obj [ICalPal] A +Store+ or +Calendar+
+  # Initialize fields common to all ICalPal classes
+  #
+  # @param obj [ICalPal] An +Store+, +Calendar+, +Event+, or +Reminder+
   def initialize(obj)
-    obj['type'] = EventKit::EKSourceType.find_index { |i| i[:name] == 'Subscribed' } if obj['subcal_url']
-    type = EventKit::EKSourceType[obj['type']]
+    @self = obj
 
     obj['store'] = obj['account']
 
+    obj['type'] = EventKit::EKSourceType.find_index { |i| i[:name] == 'Subscribed' } if obj['subcal_url']
+    return unless obj['type']
+
+    type = EventKit::EKSourceType[obj['type']]
+
     obj['type'] = type[:name]
     obj['color'] ||= type[:color]
     obj['symbolic_color_name'] ||= type[:color]
-
-    @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
+  # @return [CSV::Row] The +Store+, +Calendar+, +CalendarItem+, or
+  # +Reminder+ as a CSV::Row
   def to_csv(headers)
     values = headers.map { |h| (@self[h].respond_to?(:gsub))? @self[h].gsub("\n", '\n') : @self[h] }
 

data/lib/options.rb

@@ -79,7 +79,7 @@ module ICalPal
       @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)')
+      @op.on('--match=FIELD=REGEX', String, 'Include only items whose FIELD matches REGEX (ignoring case)')
 
       # dates
       @op.separator("\nChoosing dates:\n\n")
@@ -233,10 +233,15 @@ module ICalPal
         rescue StandardError
         end unless cli[:norc]
 
+        # Find command
         cli[:cmd] ||= @op.default_argv[0]
         cli[:cmd] ||= env[:cmd] if env[:cmd]
         cli[:cmd] ||= cf[:cmd] if cf[:cmd]
-        cli[:cmd] = 'stores' if cli[:cmd] == 'accounts'
+
+        # Handle command aliases
+        cli[:cmd] = 'accounts' if cli[:cmd] == 'stores'
+        cli[:cmd] = cli[:cmd].sub('reminders', 'tasks')
+        cli[:cmd] = cli[:cmd].sub('datedReminders', 'datedTasks')
 
         # Parse eventsNow and eventsToday commands
         cli[:cmd].match('events(Now|Today|Remaining)(\+[0-9]+)?') do |m|
@@ -282,9 +287,11 @@ module ICalPal
         opts[:version] = @op.version
 
         # From the Department of Redundancy Department
-        (opts[:cmd].include? 'tasks')?
-          opts[:props] = (opts[:itp] + opts[:atp] - opts[:etp]).uniq :
-          opts[:props] = (opts[:iep] + opts[:aep] - opts[:eep]).uniq
+        opts[:iep] = opts[:itp] if opts[:itp]
+        opts[:eep] = opts[:etp] if opts[:etp]
+        opts[:aep] = opts[:atp] if opts[:atp]
+
+        opts[:props] = (opts[:iep] + opts[:aep] - opts[:eep]).uniq
 
         # From, to, days
         if opts[:from]
@@ -325,7 +332,7 @@ module ICalPal
     end
 
     # Commands that can be run
-    COMMANDS = %w[events eventsToday eventsNow eventsRemaining tasks datedTasks undatedTasks calendars accounts stores].freeze
+    COMMANDS = %w[events eventsToday eventsNow eventsRemaining tasks datedTasks undatedTasks calendars accounts].freeze
 
     # Supported output formats
     OUTFORMATS = %w[ansi csv default hash html json md rdoc remind toc xml yaml].freeze

data/lib/reminder.rb

@@ -1,20 +1,59 @@
-r 'open3'
-r 'plist'
+r 'timezone'
+
+# Images
+# Section
 
 module ICalPal
   # Class representing items from the <tt>Reminders</tt> database
   class Reminder
     include ICalPal
 
+    def self.load_data(db_file, q)
+      # Load items
+      ICalPal.load_data(db_file, q)
+    end
+
     def [](k)
       case k
-      when 'notes'              # Skip empty notes
-        (@self['notes'].empty?)? nil : @self['notes']
+      when 'alert'              # -N (minutes|hours|days|weeks|months)
+        if @self['alert']
+          alert = JSON.parse(@self['alert'])['dueDateDeltaAlerts'][0]
+          count = alert['dueDateDeltaCount'] * -1
+          unit = EventKit::EKReminderDueDateDeltaUnit[alert['dueDateDeltaUnit']]
+          "#{count} #{unit}"
+        end
+
+      when 'assignee'           # [ nickname, firstname, lastname, address ]
+        if @self['assignee']
+          a = @self['assignee']
+          t = (a[0])? a[0] : "#{a[1]} #{a[2]}"
+          t += " (#{a[3][7..]})" if a[3]
+          t
+        end
+
+      when 'due'                # date[ at time]
+        if @self['due']
+          t = @self['due'].to_s
+          t += " at #{@self['due'].strftime($opts[:tf])}" unless @self['all_day'] == 1
+          t
+        end
+
+      when 'group'              # (group|"(no group)")
+        (@self['group'])? @self['group'] : '(no group)'
 
       when 'priority'           # Integer -> String
-        EventKit::EKReminderProperty[@self['priority']] if @self['priority'].positive?
+        EventKit::EKReminderPriority[@self['priority']] if @self['priority'].positive?
+
+      when 'proximity'          # (arriving|leaving)
+        EventKit::EKReminderProximity[@self['proximity']] if @self['proximity']
+
+      when 'radius'             # Float -> Integer
+        "#{Integer(@self['radius'])}m" if @self['radius']
 
       when 'sdate'              # For sorting
+        @self['due_date']
+
+      when 'name', 'reminder', 'task' # Aliases
         @self['title']
 
       else @self[k]
@@ -22,8 +61,24 @@ module ICalPal
     end
 
     def initialize(obj)
-      @self = {}
-      obj.each_key { |k| @self[k] = obj[k] }
+      super
+
+      # Convert JSON arrays to Arrays
+      @self['tags'] = JSON.parse(obj['tags']) if obj['tags']
+      @self['location'] = JSON.parse(obj['location']).compact.uniq[0] if obj['location']
+      @self['proximity'] = JSON.parse(obj['proximity']).compact.uniq[0] if obj['proximity']
+      @self['radius'] = JSON.parse(obj['radius']).compact.uniq[0] if obj['radius']
+      @self['assignee'] = JSON.parse(obj['assignee']) if obj['assignee']
+
+      # Section
+      if @self['members']
+        j = JSON.parse(@self['members']).select { |i| i['memberID'] == @self['id'] }
+        s = $sections.select { |i| i['id'] == j[0]['groupID'] } if j[0]
+        @self['section'] = s[0]['name'] if s && s[0]
+
+        @self.delete('members')
+        @self.delete('id')
+      end
 
       # Priority
       # rubocop: disable Style/NumericPredicate
@@ -33,14 +88,21 @@ module ICalPal
       @self['prio'] = 3 if @self['priority'] == 0 # none
       # rubocop: enable Style/NumericPredicate
 
-      @self['long_priority'] = LONG_PRIORITY[@self['prio']]
+      @self['long_priority'] = LONG_PRIORITY[@self['prio']] if @self['prio']
 
       # For sorting
       @self['sdate'] = (@self['title'])? @self['title'] : ''
 
       # Due date
-      @self['due'] = RDT.new(*Time.at(@self['due_date'] + ITIME).to_a.reverse[4..]) if @self['due_date']
-      @self['due_date'] = 0 unless @self['due_date']
+      if @self['due_date']
+        begin
+          zone = Timezone.fetch(@self['timezone'])
+        rescue Timezone::Error::InvalidZone
+          zone = '+00:00'
+        end
+
+        @self['due'] = RDT.from_time(Time.at(@self['due_date'] + ITIME, in: zone))
+      end
 
       # Notes
       @self['notes'] = '' unless @self['notes']
@@ -49,22 +111,33 @@ module ICalPal
       @self['color'] = nil unless $opts[:palette]
 
       if @self['color']
-        # Run command
-        stdin, stdout, _stderr, _e = Open3.popen3(PL_CONVERT)
-
-        # Send color bplist
-        stdin.write(@self['color'])
-        stdin.close
+        plist = plconvert(@self['color'])
 
-        # Read output
-        plist = Plist.parse_xml(stdout.read)['$objects']
-
-        @self['color'] = plist[3]
-        @self['symbolic_color_name'] = (plist[2] == 'custom')? plist[4] : plist[2]
+        # Get color and symbolic color name
+        plist.each do |p|
+          @self['color'] = plist[p['daHexString']['CF$UID']] if p['daHexString']
+          @self['symbolic_color_name'] = plist[p['ckSymbolicColorName']['CF$UID']] if p['ckSymbolicColorName']
+        end
       else
         @self['color'] = DEFAULT_COLOR
         @self['symbolic_color_name'] = DEFAULT_SYMBOLIC_COLOR
       end
+
+      # Contacts
+      messaging = []
+
+      plist = plconvert(@self['messaging'])
+      plist.each do |p|
+        %w[ emails phones ].each do |field|
+          next unless p[field]
+
+          offset = p[field].values[0]
+          targets = plist[offset]['NS.objects']
+          targets.each { |t| messaging.push(plist[t['CF$UID']]) }
+        end
+      end if plist
+
+      @self['messaging'] = messaging
     end
 
     DEFAULT_COLOR = '#1BADF8'.freeze
@@ -77,32 +150,105 @@ module ICalPal
       'No priority',
     ].freeze
 
-    PL_CONVERT = '/usr/bin/plutil -convert xml1 -o - -'.freeze
-
     DB_PATH = "#{Dir.home}/Library/Group Containers/group.com.apple.reminders/Container_v1/Stores".freeze
 
     QUERY = <<~SQL.freeze
 SELECT DISTINCT
 
-zremcdReminder.zAllday as all_day,
-zremcdReminder.zDuedate as due_date,
-zremcdReminder.zFlagged as flagged,
-zremcdReminder.zNotes as notes,
-zremcdReminder.zPriority as priority,
-zremcdReminder.zTitle as title,
+r1.zTitle as title,
+r1.zAllday as all_day,
+r1.zDueDate as due_date,
+r1.zFlagged as flagged,
+r1.zNotes as notes,
+r1.zPriority as priority,
+r1.zContactHandles as messaging,
+r1.zDueDateDeltaAlertsData as alert,
+r1.zTimezone as timezone,
+r1.zckIdentifier as id,
+
+bl1.zBadgeEmblem as badge,
+bl1.zColor as color,
+bl1.zName as list_name,
+bl1.zParentList as parent,
+bl1.zSharingStatus as shared,
+
+-- section members
+json(bl1.ZMembershipsOfRemindersInSectionsAsData) -> '$.memberships' AS members,
+
+-- group
+(SELECT zName
+ FROM zremcdBaseList bl2
+ WHERE bl2.z_pk = bl1.zParentList) AS 'group',
+
+-- location
+(SELECT json_group_array(zremcdObject.zTitle)
+FROM zremcdObject
+WHERE zremcdObject.z_pk IN (
+ SELECT zTrigger
+ FROM zremcdObject
+ WHERE zremcdObject.zReminder = r1.z_pk
+)) AS location,
+
+-- proximity
+(SELECT json_group_array(zremcdObject.zProximity)
+ FROM zremcdObject
+ WHERE zremcdObject.z_pk IN (
+  SELECT zTrigger
+  FROM zremcdObject
+  WHERE zremcdObject.zReminder = r1.z_pk
+ )) AS proximity,
 
-zremcdBaseList.zBadgeEmblem as badge,
-zremcdBaseList.zColor as color,
-zremcdBaseList.zName as list_name,
-zremcdBaseList.zParentList as parent,
-zremcdBaseList.zSharingStatus as shared
+-- radius
+(SELECT json_group_array(zremcdObject.zRadius)
+ FROM zremcdObject
+ WHERE zremcdObject.z_pk IN (
+  SELECT zTrigger
+  FROM zremcdObject
+  WHERE zremcdObject.zReminder = r1.z_pk
+ )) AS radius,
 
-FROM zremcdReminder
+-- tags
+(SELECT json_group_array(zName)
+ FROM zremcdHashtagLabel
+ WHERE zremcdHashtagLabel.z_pk IN (
+	SELECT zremcdObject.zHashtagLabel
+	FROM zremcdObject
+	JOIN zremcdreminder ON zremcdObject.zReminder3 = r1.z_pk
+	WHERE zremcdObject.zReminder3 = r1.z_pk
+ )) AS tags,
+
+-- assignee
+(SELECT
+ json_array(zNickname, zFirstName, zLastName, zAddress1)
+ FROM zremcdObject
+ WHERE z_pk = (
+  SELECT zAssignee
+  FROM zremcdObject
+  WHERE zReminder1 = r1.z_pk
+)) AS assignee,
+
+-- url
+(SELECT zURL
+ FROM zremcdObject
+ WHERE zReminder2 = r1.z_pk) AS url
+
+FROM zremcdReminder r1
+
+LEFT OUTER JOIN zremcdBaseList bl1 ON r1.zList = bl1.z_pk
+
+WHERE r1.zCompleted = 0
+AND r1.zMarkedForDeletion = 0
+
+SQL
+
+    # Load sections
+    SECTIONS_QUERY = <<~SQL.freeze
+SELECT DISTINCT
 
-JOIN zremcdBaseList ON zremcdReminder.zList = zremcdBaseList.z_pk
+zckIdentifier AS id,
+zDisplayName AS name
 
-WHERE zremcdReminder.zCompleted = 0
-AND zremcdReminder.zMarkedForDeletion = 0
+FROM zremcdBaseSection
 
 SQL
 

data/lib/store.rb

@@ -3,16 +3,42 @@ module ICalPal
   class Store
     include ICalPal
 
+    def [](k)
+      case k
+      when 'name', 'title'      # Aliases
+        @self['account']
+
+      when 'owner'              # Owner iff there is an account
+        (@self['owner'] == @self['account'])? nil : @self['owner']
+
+      else @self[k]
+      end
+    end
+
+    def initialize(obj)
+      super
+
+      # Convert JSON arrays to Arrays
+      @self['delegations'] = JSON.parse(obj['delegations']).sort if obj['delegations']
+    end
+
     QUERY = <<~SQL.freeze
 SELECT DISTINCT
 
-Store.name AS account,
-*
+s1.name AS account,
+s1.owner_name AS owner,
+s1.notes,
+s1.type,
+
+(SELECT json_group_array(name)
+ FROM #{self.name.split('::').last} s2
+ WHERE s2.delegated_account_owner_store_id == s1.external_id
+) AS delegations
+
+FROM #{self.name.split('::').last} s1
 
-FROM #{self.name.split('::').last}
+WHERE s1.delegated_account_owner_store_id IS NULL
 
-WHERE Store.disabled IS NOT 1
-AND Store.display_order IS NOT -1
 SQL
 
   end

data/lib/utils.rb

@@ -1,3 +1,29 @@
+PL_CONVERT = '/usr/bin/plutil -convert xml1 -o - -'.freeze
+
+# Load a plist
+#
+# @param obj [String] Data that can be converted by +/usr/bin/plutil+
+# @return [Array] Objects representing nodes in the plist
+def plconvert(obj)
+  r 'open3'
+  r 'plist'
+
+  # Run PL_CONVERT command
+  sin, sout, _serr, _e = Open3.popen3(PL_CONVERT)
+
+  # Send obj
+  sin.write(obj)
+  sin.close
+
+  # Read output
+  begin
+    plist = Plist.parse_xml(sout.read)
+    plist['$objects'] if plist
+  rescue Plist::UnimplementedElementError
+    nil
+  end
+end
+
 # Convert a key/value pair to XML.  The value should be +nil+, +String+,
 # +Integer+, +Array+, or +ICalPal::RDT+
 #

data/lib/version.rb

@@ -1,4 +1,4 @@
 module ICalPal
   NAME = 'icalPal'.freeze
-  VERSION = '3.7.1'.freeze
+  VERSION = '3.8.0'.freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: icalPal
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.8.0
 platform: ruby
 authors:
 - Andy Rosen
 bindir: bin
 cert_chain: []
-date: 2025-07-27 00:00:00.000000000 Z
+date: 2025-08-06 00:00:00.000000000 Z
 dependencies: []
 description: |
   Inspired by icalBuddy and maintains close compatability.  Includes