Fix for #38

Author: ajrosen

lib/EventKit.rb

@@ -30,7 +30,7 @@ class EventKit
     yearly
   ].freeze
 
-  EKReminderProperty = [
+  EKReminderPriority = [
     'none',                     # 0
     'high', nil, nil, nil,      # 1
     'medium', nil, nil, nil,    # 5

lib/defaults.rb

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

lib/options.rb

@@ -282,9 +282,11 @@ def parse_options
         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]

lib/reminder.rb

@@ -12,7 +12,7 @@ def [](k)
         (@self['notes'].empty?)? nil : @self['notes']
 
       when 'priority'           # Integer -> String
-        EventKit::EKReminderProperty[@self['priority']] if @self['priority'].positive?
+        EventKit::EKReminderPriority[@self['priority']] if @self['priority'].positive?
 
       when 'sdate'              # For sorting
         @self['title']