Skip to content

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

more info for events

rorycleard5cebc655614
diff --git a/SegmentsModel.xcdatamodeld/SegmentsModel.xcdatamodel/contents b/SegmentsModel.xcdatamodeld/SegmentsModel.xcdatamodel/contents
index a4cdbb3..e847c81 100644
--- a/SegmentsModel.xcdatamodeld/SegmentsModel.xcdatamodel/contents
+++ b/SegmentsModel.xcdatamodeld/SegmentsModel.xcdatamodel/contents
@@ -5,6 +5,8 @@
<relationship name="segments" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="SegmentEntity" inverseName="day" inverseEntity="SegmentEntity"/>
</entity>
<entity name="EventEntity" representedClassName="EventEntity" syncable="YES" codeGenerationType="class">
+ <attribute name="classType" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+ <attribute name="quantity" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="timeStamp" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
</entity>
<entity name="FrameEntity" representedClassName="FrameEntity" syncable="YES" codeGenerationType="class">
diff --git a/clearcam/FileServer.m b/clearcam/FileServer.m
index d1e5865..62eebd3 100644
--- a/clearcam/FileServer.m
+++ b/clearcam/FileServer.m
@@ -374,9 +374,9 @@
}
if ([filePath hasPrefix:@"get-events"]) {
- NSArray *eventTimestamps = [self fetchEventTimestampsFromCoreData:self.context];
+ NSArray *eventDataArray = [self fetchEventDataFromCoreData:self.context];
- if (eventTimestamps.count == 0) {
+ if (eventDataArray.count == 0) {
NSString *httpHeader = @"HTTP/1.1 404 Not Found\r\nContent-Type: application/json\r\n\r\n";
NSString *errorMessage = @"{\"error\": \"No events found\"}";
send(clientSocket, [httpHeader UTF8String], httpHeader.length, 0);
@@ -384,12 +384,13 @@
return;
}
- NSData *jsonData = [NSJSONSerialization dataWithJSONObject:eventTimestamps options:0 error:nil];
+ NSData *jsonData = [NSJSONSerialization dataWithJSONObject:eventDataArray options:0 error:nil];
NSString *httpHeader = [NSString stringWithFormat:@"HTTP/1.1 200 OK\r\nContent-Type: application/json\r\nContent-Length: %lu\r\n\r\n", (unsigned long)jsonData.length];
send(clientSocket, [httpHeader UTF8String], httpHeader.length, 0);
send(clientSocket, jsonData.bytes, jsonData.length, 0);
}
+
NSString *fullPath = [basePath stringByAppendingPathComponent:filePath];
NSRange queryRange = [fullPath rangeOfString:@"?"];
@@ -484,25 +485,33 @@
fclose(file);
}
-- (NSArray *)fetchEventTimestampsFromCoreData:(NSManagedObjectContext *)context {
+- (NSArray *)fetchEventDataFromCoreData:(NSManagedObjectContext *)context {
NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:@"EventEntity"];
- fetchRequest.resultType = NSDictionaryResultType;
- fetchRequest.propertiesToFetch = @[@"timeStamp"];
-
NSError *error = nil;
- NSArray *results = [context executeFetchRequest:fetchRequest error:&error];
+ NSArray *fetchedEvents = [context executeFetchRequest:fetchRequest error:&error];
if (error) {
- NSLog(@"Error fetching events: %@", error);
+ NSLog(@"Error fetching events: %@, %@", error, error.userInfo);
return @[];
}
- NSMutableArray *timestamps = [NSMutableArray arrayWithCapacity:results.count];
- for (NSDictionary *event in results) {
- [timestamps addObject:event[@"timeStamp"]];
+ NSMutableArray *eventDataArray = [NSMutableArray arrayWithCapacity:fetchedEvents.count];
+ NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+ [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
+
+ for (NSManagedObject *event in fetchedEvents) {
+ NSTimeInterval timestamp = [[event valueForKey:@"timeStamp"] doubleValue];
+ NSString *readableDate = [dateFormatter stringFromDate:[NSDate dateWithTimeIntervalSince1970:timestamp]];
+
+ NSDictionary *eventDict = @{
+ @"timeStamp": readableDate, // Readable date format
+ @"classType": [event valueForKey:@"classType"] ?: @"unknown",
+ @"quantity": [event valueForKey:@"quantity"] ?: @(0)
+ };
+ [eventDataArray addObject:eventDict];
}
- return timestamps;
+ return eventDataArray;
}
- (void)sendFileData:(FILE *)file toSocket:(int)socket withContentLength:(NSUInteger)contentLength {
diff --git a/clearcam/SceneState.m b/clearcam/SceneState.m
index 6d15a2d..1850321 100644
--- a/clearcam/SceneState.m
+++ b/clearcam/SceneState.m
@@ -76,7 +76,10 @@
[self.backgroundContext performBlockAndWait:^{
NSManagedObject *newEvent = [NSEntityDescription insertNewObjectForEntityForName:@"EventEntity"
inManagedObjectContext:self.backgroundContext];
+
[newEvent setValue:@([date timeIntervalSince1970]) forKey:@"timeStamp"]; // Float value of timestamp
+ [newEvent setValue:self.events[i] forKey:@"classType"]; // Class type
+ [newEvent setValue:@(current_state) forKey:@"quantity"]; // Quantity (current state)
NSError *saveError = nil;
if (![self.backgroundContext save:&saveError]) {
diff --git a/clearcam/SettingsManager.m b/clearcam/SettingsManager.m
index 0cc0078..cdfa7e2 100644
--- a/clearcam/SettingsManager.m
+++ b/clearcam/SettingsManager.m
@@ -61,8 +61,8 @@
- (NSArray<NSNumber *> *)generateDefaultEvents {
NSMutableArray<NSNumber *> *defaultEvents = [NSMutableArray array];
- //[defaultEvents addObject:@0]; // 1 person for now
- //[defaultEvents addObject:@2];
+ [defaultEvents addObject:@0]; // 1 person for now
+ [defaultEvents addObject:@2];
[defaultEvents addObject:@63]; // laptop for now
return [defaultEvents copy];
}