♻️ Use new Selector

oschrenk · Jan 19, 2025 · e1e82d3 · e1e82d3
1 parent acc6765
commit e1e82d3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/Sources/Cli/Main.swift b/Sources/Cli/Main.swift
@@ -6,7 +6,7 @@ enum Main {
     start: Date,
     end: Date,
     opts: SharedOptions,
-    eventSelector: EventSelectorI
+    postSortingEventSelector: EventSelectorI
   ) {
     Log.setDebug(opts.debug)
 
@@ -28,13 +28,18 @@ enum Main {
 
     let service = EventService(repo: EventRepo())
 
-    let events = eventSelector.select(events: service.fetch(
+    let unsortedEvents = service.fetch(
       start: start,
       end: end,
       calendarFilter: calendarFilter,
       eventFilter: eventFilter
-    )).sorted { $0.schedule.end.inMinutes > $1.schedule.end.inMinutes }
+    )
+
+    let selectors = EventSelector.Combined(selectors:
+      [EventSelector.Sorted(sorting: Sorting()), postSortingEventSelector]
+    )
 
+    let events = selectors.select(events: unsortedEvents)
     if opts.templatePath.isEmpty {
       events.printAsJson()
     } else {

diff --git a/Sources/Cli/Next.swift b/Sources/Cli/Next.swift
@@ -25,6 +25,6 @@ struct Next: ParsableCommand {
     let end = FCalendar.current.date(byAdding: .minute, value: within, to: today)!
     let eventSelector = EventSelector.Prefix(count: 1)
 
-    Main.run(start: start, end: end, opts: opts, eventSelector: eventSelector)
+    Main.run(start: start, end: end, opts: opts, postSortingEventSelector: eventSelector)
   }
 }
diff --git a/Sources/Cli/Today.swift b/Sources/Cli/Today.swift
@@ -18,6 +18,6 @@ struct Today: ParsableCommand {
     let end = FCalendar.current.date(byAdding: .day, value: 1, to: today)!
     let eventSelector = EventSelector.All()
 
-    Main.run(start: start, end: end, opts: opts, eventSelector: eventSelector)
+    Main.run(start: start, end: end, opts: opts, postSortingEventSelector: eventSelector)
   }
 }