Choose the event closest to 'now' even if it's in the past

Author: pjrobertson

Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0</string>
+	<string>1.5.1</string>
 	<key>CFBundleVersion</key>
-	<string>145</string>
+	<string>146</string>
 	<key>NSCalendarsUsageDescription</key>
 	<string>Create and view calendar items from within Quicksilver</string>
 	<key>NSPrincipalClass</key>
@@ -141,28 +141,28 @@
 		<string>&lt;h2&gt;Calendar &amp;amp; Reminders Plugin&lt;/h2&gt;
 &lt;p&gt;This plugin adds actions for creating Calendar Events (Calendar.app) and Reminders (Reminders.app) from within Quicksilver&lt;/p&gt;
 &lt;h3&gt;Permissions&lt;/h3&gt;
-&lt;p&gt;This plugin requires access to your Calendar and Reminders. Make sure you have granted Quicksilver permissions by adding it to the &lt;a href="x-apple.systempreferences:com.apple.preference.security?Privacy_Calendars"&gt;Calendars list&lt;/a&gt; and &lt;a href="x-apple.systempreferences:com.apple.preference.security?Privacy_Reminders"&gt;Reminders list&lt;/a&gt; in the System Preferences.&lt;/p&gt;
+&lt;p&gt;This plugin requires access to your Calendar and Reminders. Make sure you have granted Quicksilver permissions by adding it to the &lt;a href=&quot;x-apple.systempreferences:com.apple.preference.security?Privacy_Calendars&quot;&gt;Calendars list&lt;/a&gt; and &lt;a href=&quot;x-apple.systempreferences:com.apple.preference.security?Privacy_Reminders&quot;&gt;Reminders list&lt;/a&gt; in the System Preferences.&lt;/p&gt;
 &lt;h3&gt;Actions&lt;/h3&gt;
 &lt;p&gt;&lt;strong&gt;Create Calendar Event&lt;/strong&gt;&lt;/p&gt;
-&lt;p&gt;This action takes text from Quicksilver's 1st pane, and adds it as an event to your selected Calendar in Quicksilver's 3rd pane.&lt;br&gt;
+&lt;p&gt;This action takes text from Quicksilver&apos;s 1st pane, and adds it as an event to your selected Calendar in Quicksilver&apos;s 3rd pane.&lt;br&gt;
 Examples of text could be &lt;code&gt;Dinner with Tom next Tuesday&lt;/code&gt; or &lt;code&gt;Visit mum at 3pm&lt;/code&gt;.&lt;/p&gt;
 &lt;p&gt;You can improve how an event displays in your Calendar by separating the name of the event and the time it takes place with two dashes &lt;code&gt;--&lt;/code&gt;&lt;br&gt;
-Using &lt;code&gt;Next Tuesday -- Dinner with Tom&lt;/code&gt; will create an event called just &lt;code&gt;Dinner with Tom&lt;/code&gt; in your calendar. Supported languages include English, Japanese, French, Dutch, Russian, English (UK) with partial support for German, Portuguese and Chinese, thanks to the &lt;a href="https://github.com/wanasit/chrono"&gt;Chrono project&lt;/a&gt;&lt;/p&gt;
+Using &lt;code&gt;Next Tuesday -- Dinner with Tom&lt;/code&gt; will create an event called just &lt;code&gt;Dinner with Tom&lt;/code&gt; in your calendar. Supported languages include English, Japanese, French, Dutch, Russian, English (UK) with partial support for German, Portuguese and Chinese, thanks to the &lt;a href=&quot;https://github.com/wanasit/chrono&quot;&gt;Chrono project&lt;/a&gt;&lt;/p&gt;
 &lt;p&gt;&lt;strong&gt;Create Reminder&lt;/strong&gt;&lt;/p&gt;
-&lt;p&gt;This action takes text from Quicksilver's 1st pane, and adds it as a Reminder to your selected Reminders List in Quicksilver's 3rd pane.&lt;/p&gt;
+&lt;p&gt;This action takes text from Quicksilver&apos;s 1st pane, and adds it as a Reminder to your selected Reminders List in Quicksilver&apos;s 3rd pane.&lt;/p&gt;
 &lt;p&gt;Examples of text could be &lt;code&gt;Do the shopping&lt;/code&gt; or &lt;code&gt;Pick up the kids from school&lt;/code&gt;.&lt;/p&gt;
 &lt;p&gt;You can set the priority of an event by prefixing your event with any number of exclamation marks &lt;code&gt;!&lt;/code&gt;&lt;br&gt;
 &lt;em&gt;One&lt;/em&gt; exclamantion mark gives the Reminder a &lt;em&gt;low&lt;/em&gt; priority, &lt;em&gt;two&lt;/em&gt; give the Reminder a &lt;em&gt;medium&lt;/em&gt; priority and &lt;em&gt;three&lt;/em&gt; gives it a &lt;em&gt;high&lt;/em&gt; priority.&lt;/p&gt;
 &lt;p&gt;&lt;code&gt;!! This is a medium priority reminder&lt;/code&gt;&lt;br&gt;
 &lt;code&gt;This reminder has no priority set&lt;/code&gt;&lt;/p&gt;
 &lt;h3&gt;Next Online Meeting Object&lt;/h3&gt;
-&lt;p&gt;This plugin adds a 'Next online meeting' object to your catalog. Use it to find an upcoming meeting (within the next 30 minutes) on your calendar. It will automatically retrieve the URL from the calendar information for you to open.&lt;/p&gt;
+&lt;p&gt;This plugin adds a &apos;Next online meeting&apos; object to your catalog. Use it to find an upcoming meeting (within the next 30 minutes) on your calendar. It will automatically retrieve the URL from the calendar information for you to open.&lt;/p&gt;
 &lt;h3&gt;Default Calendars for Events/Reminders&lt;/h3&gt;
 &lt;p&gt;You can select the default calendar for Events/Reminders by going to Preferences &amp;gt; Calendars in the Quicksilver preferences&lt;/p&gt;
 &lt;h3&gt;Open Source Licenses&lt;/h3&gt;
 &lt;p&gt;This project uses code from:
-* &lt;a href="https://github.com/wanasit/chrono/blob/master/LICENSE.txt"&gt;Chrono Project&lt;/a&gt;
-* &lt;a href="https://github.com/leits/MeetingBar/blob/master/LICENSE"&gt;Meeting Bar Project&lt;/a&gt;&lt;/p&gt;</string>
+* &lt;a href=&quot;https://github.com/wanasit/chrono/blob/master/LICENSE.txt&quot;&gt;Chrono Project&lt;/a&gt;
+* &lt;a href=&quot;https://github.com/leits/MeetingBar/blob/master/LICENSE&quot;&gt;Meeting Bar Project&lt;/a&gt;&lt;/p&gt;</string>
 		<key>icon</key>
 		<string>com.apple.iCal</string>
 		<key>qsversion</key>

QSiCalModule.m

@@ -19,7 +19,7 @@ @implementation QSiCalModule
 
 - (id)init {
 	if (self = [super init]) {
-		eventStore = [[EKEventStore alloc] initWithAccessToEntityTypes:(EKEntityMaskEvent | EKEntityMaskReminder)];
+		eventStore = [[EKEventStore alloc] init];
 		_eventsCalendars = nil;
 		_remindersCalendars = nil;
 	}
@@ -331,10 +331,10 @@ - (QSObject *)resolveProxyObject:(QSProxyObject *)proxy
 	NSUInteger minutesForward = 30;
 	NSUInteger interval = minutesForward * 60;
 	NSDate *now = [NSDate date];
-	NSDate *cutoff = [NSDate dateWithTimeIntervalSinceNow:interval];
+	NSDate *cutoff = [now dateByAddingTimeInterval:interval];
 	NSPredicate *query = [eventStore predicateForEventsWithStartDate:now endDate:cutoff calendars:nil];
 	NSArray *events = [eventStore eventsMatchingPredicate:query];
-	// pick the meeting event that hasn't started
+	// pick the meeting event with a start date closest to 'now'
 	EKEvent *targetEvent = nil;
 	NSDictionary *targetData;
 	for (EKEvent *upcomingEvent in events) {
@@ -343,14 +343,16 @@ - (QSObject *)resolveProxyObject:(QSProxyObject *)proxy
 			// skip events with no meeting URL
 			continue;
 		}
-		if ([[upcomingEvent startDate] compare:now] == NSOrderedDescending) {
+		// find the event with the startDate closest to 'now'
+		if (!targetEvent || (fabs([[upcomingEvent startDate] timeIntervalSinceDate:now]) < fabs([[targetEvent startDate] timeIntervalSinceDate:now]))) {
+			// if it's an event in the past and it's already finished, ignore it
+			if ([[upcomingEvent startDate] compare:now] == NSOrderedAscending && [[upcomingEvent endDate] compare:now] == NSOrderedAscending) {
+				continue;
+			}
 			// prefer an event in the future
 			targetData = meetingData;
 			targetEvent = upcomingEvent;
-			break;
 		}
-		targetData = meetingData;
-		targetEvent = upcomingEvent;
 	}
 	if (targetEvent) {
 		return objectFromEvent(targetEvent, targetData);