♻️ Pull up event selector

Author: oschrenk

Sources/Cli/Main.swift

@@ -6,7 +6,7 @@ enum Main {
     start: Date,
     end: Date,
     opts: SharedOptions,
-    eventSelector: ([EKEvent]) -> [EKEvent]
+    eventSelector: ([Event]) -> [Event]
   ) {
     Log.setDebug(opts.debug)
 
@@ -26,13 +26,12 @@ enum Main {
       maxNumAttendees: opts.maxNumAttendees
     )
 
-    let events = EventStore().fetch(
+    let events = eventSelector(EventStore().fetch(
       start: start,
       end: end,
       calendarFilter: calendarFilter,
-      eventFilter: eventFilter,
-      eventSelector: eventSelector
-    ).sorted { $0.schedule.end.inMinutes > $1.schedule.end.inMinutes }
+      eventFilter: eventFilter
+    )).sorted { $0.schedule.end.inMinutes > $1.schedule.end.inMinutes }
 
     if opts.templatePath.isEmpty {
       events.printAsJson()

Sources/EventStore.swift

@@ -44,15 +44,13 @@ struct EventStore {
   ///     - end: Maximum start date of event
   ///     - calendarFilter: A filter to select certain calendars
   ///     - eventFilter: A filter to select certain events
-  ///     - eventSelector: Manipulate array of events after fetching and filtering; e.g. for sorting
   ///
   /// - Returns: a list of events
   func fetch(
     start: Date,
     end: Date,
     calendarFilter: (PlanCalendar) -> Bool,
-    eventFilter: (Event) -> Bool,
-    eventSelector: ([EKEvent]) -> [EKEvent]
+    eventFilter: (Event) -> Bool
   ) -> [Event] {
     let eventStore = grantAccess()
 
@@ -73,7 +71,7 @@ struct EventStore {
       calendars: calendars
     )
 
-    return eventSelector(eventStore.events(matching: predicate))
+    return eventStore.events(matching: predicate)
       .map { event in
         event.asEvent()
       }

Sources/Filters/EventSelector.swift

@@ -1,13 +1,11 @@
-import EventKit
-
 class EventSelector {
-  static func all() -> (([EKEvent]) -> [EKEvent]) {
+  static func all() -> (([Event]) -> [Event]) {
     { events in
       events
     }
   }
 
-  static func prefix(count: Int) -> (([EKEvent]) -> [EKEvent]) {
+  static func prefix(count: Int) -> (([Event]) -> [Event]) {
     { events in
       Array(events.prefix(count))
     }