Skip to content

Add object detection, tracking, mobile notifications, and search to any security camera.

use mins

roryclear47fff3fc08e9
diff --git a/clearcam/SceneState.m b/clearcam/SceneState.m
index 4d82321..38ee45d 100644
--- a/clearcam/SceneState.m
+++ b/clearcam/SceneState.m
@@ -103,8 +103,9 @@
// Get the current hour
NSDate *now = [NSDate date];
NSCalendar *calendar = [NSCalendar currentCalendar];
- NSDateComponents *components = [calendar components:(NSCalendarUnitHour | NSCalendarUnitWeekday) fromDate:now];
+ NSDateComponents *components = [calendar components:(NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitWeekday) fromDate:now];
NSInteger currentHour = components.hour;
+ NSInteger currentMinute = components.minute;
NSInteger currentWeekday = components.weekday; // Sunday = 1, Monday = 2, ..., Saturday = 7
// Map weekday number to day string
@@ -123,12 +124,19 @@
NSArray *days = schedule[@"days"];
NSNumber *startHour = schedule[@"startHour"];
+ NSNumber *startMinute = schedule[@"startMinute"];
NSNumber *endHour = schedule[@"endHour"];
+ NSNumber *endMinute = schedule[@"endMinute"];
// Check if current day is in the schedule's days
if ([days containsObject:currentDay]) {
- // Check if current hour is within the time window
- if (currentHour >= [startHour integerValue] && currentHour < [endHour integerValue]) {
+ // Convert current time and schedule times to minutes since midnight for easier comparison
+ NSInteger currentTimeInMinutes = (currentHour * 60) + currentMinute;
+ NSInteger startTimeInMinutes = ([startHour integerValue] * 60) + [startMinute integerValue];
+ NSInteger endTimeInMinutes = ([endHour integerValue] * 60) + [endMinute integerValue];
+
+ // Check if current time is within the time window
+ if (currentTimeInMinutes >= startTimeInMinutes && currentTimeInMinutes < endTimeInMinutes) {
shouldSendEmail = YES;
break; // No need to check further schedules
}