Improve JSON output and add display options to ShowAll (#69)

- Add `displayOptions` to `ShowAll` command
- Set correct `location` and `locationTitle` (new). Fix formatting of
`completionDate`.

Author: kolsha

Sources/RemindersLibrary/CLI.swift

@@ -19,6 +19,12 @@ private struct ShowLists: ParsableCommand {
 private struct ShowAll: ParsableCommand {
     static let configuration = CommandConfiguration(
         abstract: "Print all reminders")
+    
+    @Flag(help: "Show completed items only")
+    var onlyCompleted = false
+
+    @Flag(help: "Include completed items in output")
+    var includeCompleted = false
 
     @Option(
         name: .shortAndLong,
@@ -30,8 +36,23 @@ private struct ShowAll: ParsableCommand {
         help: "format, either of 'plain' or 'json'")
     var format: OutputFormat = .plain
 
+    func validate() throws {
+        if self.onlyCompleted && self.includeCompleted {
+            throw ValidationError(
+                "Cannot specify both --show-completed and --only-completed")
+        }
+    }
+    
     func run() {
-        reminders.showAllReminders(dueOn: self.dueDate, outputFormat: format)
+        var displayOptions = DisplayOptions.incomplete
+        if self.onlyCompleted {
+            displayOptions = .complete
+        } else if self.includeCompleted {
+            displayOptions = .all
+        }
+        
+        reminders.showAllReminders(
+            dueOn: self.dueDate, displayOptions: displayOptions, outputFormat: format)
     }
 }
 

Sources/RemindersLibrary/EKReminder+Encodable.swift

@@ -7,6 +7,7 @@ extension EKReminder: Encodable {
         case notes
         case url
         case location
+        case locationTitle
         case completionDate
         case isCompleted
         case priority
@@ -23,24 +24,37 @@ extension EKReminder: Encodable {
         try container.encode(self.priority, forKey: .priority)
         try container.encode(self.calendar.title, forKey: .list)
         try container.encodeIfPresent(self.notes, forKey: .notes)
+        
+        // url field is nil
+        // https://developer.apple.com/forums/thread/128140
         try container.encodeIfPresent(self.url, forKey: .url)
-        try container.encodeIfPresent(self.location, forKey: .location)
-        try container.encodeIfPresent(self.completionDate, forKey: .completionDate)
+        try container.encodeIfPresent(format(self.completionDate), forKey: .completionDate)
 
-        if let startDateComponents = self.startDateComponents {
-            if #available(macOS 12.0, *) {
-                try container.encode(startDateComponents.date?.ISO8601Format(), forKey: .startDate)
-            } else {
-                try container.encode(startDateComponents.date?.description(with: .current), forKey: .startDate)
+        for alarm in self.alarms ?? [] {
+            if let location = alarm.structuredLocation {
+                try container.encodeIfPresent(location.title, forKey: .locationTitle)
+                if let geoLocation = location.geoLocation {
+                    let geo = "\(geoLocation.coordinate.latitude), \(geoLocation.coordinate.longitude)"
+                    try container.encode(geo, forKey: .location)
+                }
+                break
             }
         }
 
+        if let startDateComponents = self.startDateComponents {
+            try container.encodeIfPresent(format(startDateComponents.date), forKey: .startDate)
+        }
+
         if let dueDateComponents = self.dueDateComponents {
-            if #available(macOS 12.0, *) {
-                try container.encode(dueDateComponents.date?.ISO8601Format(), forKey: .dueDate)
-            } else {
-                try container.encode(dueDateComponents.date?.description(with: .current), forKey: .dueDate)
-            }
+            try container.encodeIfPresent(format(dueDateComponents.date), forKey: .dueDate)
+        }
+    }
+    
+    private func format(_ date: Date?) -> String? {
+        if #available(macOS 12.0, *) {
+            return date?.ISO8601Format()
+        } else {
+            return date?.description(with: .current)
         }
     }
 }

Sources/RemindersLibrary/Reminders.swift

@@ -90,11 +90,12 @@ public final class Reminders {
         }
     }
 
-    func showAllReminders(dueOn dueDate: DateComponents?, outputFormat: OutputFormat) {
+    func showAllReminders(dueOn dueDate: DateComponents?,
+                          displayOptions: DisplayOptions, outputFormat: OutputFormat) {
         let semaphore = DispatchSemaphore(value: 0)
         let calendar = Calendar.current
 
-        self.reminders(on: self.getCalendars(), displayOptions: .incomplete) { reminders in
+        self.reminders(on: self.getCalendars(), displayOptions: displayOptions) { reminders in
             var matchingReminders = [(EKReminder, Int, String)]()
             for (i, reminder) in reminders.enumerated() {
                 let listName = reminder.calendar.title