Add object detection, tracking, mobile notifications, and search to any security camera.
fix float timestamp, use double
roryclearc8800d0039c5
diff --git a/SegmentsModel.xcdatamodeld/SegmentsModel.xcdatamodel/contents b/SegmentsModel.xcdatamodeld/SegmentsModel.xcdatamodel/contentsindex e847c81..9718a95 100644--- a/SegmentsModel.xcdatamodeld/SegmentsModel.xcdatamodel/contents+++ b/SegmentsModel.xcdatamodeld/SegmentsModel.xcdatamodel/contents@@ -7,7 +7,7 @@<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"/>+ <attribute name="timeStamp" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/></entity><entity name="FrameEntity" representedClassName="FrameEntity" syncable="YES" codeGenerationType="class"><attribute name="aspect_ratio" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>diff --git a/clearcam/FileServer.m b/clearcam/FileServer.mindex 232a96c..71c0c15 100644--- a/clearcam/FileServer.m+++ b/clearcam/FileServer.m@@ -528,8 +528,11 @@return NO;}- NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:@"EventEntity"]; // Updated entity name- fetchRequest.predicate = [NSPredicate predicateWithFormat:@"timeStamp == %lf", timeStamp]; // Matching timeStamp+ NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:@"EventEntity"];++ // TODO, this delete everything within a second of the rounded timestamp, fine for now+ double epsilon = 1;+ fetchRequest.predicate = [NSPredicate predicateWithFormat:@"(timeStamp >= %lf) AND (timeStamp <= %lf)", timeStamp - epsilon, timeStamp + epsilon];NSError *error = nil;NSArray *events = [self.context executeFetchRequest:fetchRequest error:&error];@@ -557,7 +560,6 @@return YES;}-- (NSArray *)fetchEventDataFromCoreData:(NSManagedObjectContext *)context {NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:@"EventEntity"];NSError *error = nil;