Skip to content

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

add hardcoded DayEntity

roryclear7eba67346ae3
diff --git a/SegmentsModel.xcdatamodeld/SegmentsModel.xcdatamodel/contents b/SegmentsModel.xcdatamodeld/SegmentsModel.xcdatamodel/contents
index 1ac0817..fe8c24b 100644
--- a/SegmentsModel.xcdatamodeld/SegmentsModel.xcdatamodel/contents
+++ b/SegmentsModel.xcdatamodeld/SegmentsModel.xcdatamodel/contents
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23605" systemVersion="24D60" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithSwiftData="YES" userDefinedModelVersionIdentifier="">
+ <entity name="DayEntity" representedClassName="DayEntity" syncable="YES" codeGenerationType="class">
+ <attribute name="date" optional="YES" attributeType="String"/>
+ <relationship name="segments" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="SegmentEntity" inverseName="day" inverseEntity="SegmentEntity"/>
+ </entity>
<entity name="FrameEntity" representedClassName="FrameEntity" syncable="YES" codeGenerationType="class">
<attribute name="aspect_ratio" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
<attribute name="frame_timeStamp" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
@@ -14,6 +18,7 @@
<attribute name="duration" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
<attribute name="timeStamp" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
<attribute name="url" optional="YES" attributeType="String"/>
+ <relationship name="day" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="DayEntity" inverseName="segments" inverseEntity="DayEntity"/>
<relationship name="frames" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="FrameEntity" inverseName="segment" inverseEntity="FrameEntity"/>
</entity>
<entity name="SquareEntity" representedClassName="SquareEntity" syncable="YES" codeGenerationType="class">
diff --git a/clearcam/FileServer.m b/clearcam/FileServer.m
index 934b3f4..437b914 100644
--- a/clearcam/FileServer.m
+++ b/clearcam/FileServer.m
@@ -56,7 +56,7 @@
// Save a new string
NSLog(@"core data segments?:");
//[self fetchAllSegmentsInContext:self.context];
- [self deleteAllSegmentsInContext:self.context]; //to delete all, not thread safe yet!
+ [self deleteAllDayEntitiesInContext:self.context]; //to delete all, not thread safe yet!
// Fetch all saved strings
// coredata stuff
@@ -82,16 +82,27 @@
backgroundContext.parentContext = context; // Link it to the main context
[backgroundContext performBlock:^{
- NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] initWithEntityName:@"SegmentEntity"];
-
NSError *error = nil;
- NSArray *segments = [backgroundContext executeFetchRequest:fetchRequest error:&error];
+ // Fetch the DayEntity for the given date
+ NSFetchRequest *dayFetchRequest = [[NSFetchRequest alloc] initWithEntityName:@"DayEntity"];
+ dayFetchRequest.predicate = [NSPredicate predicateWithFormat:@"date == %@", @"2025-02-13"];
+
+ NSArray *fetchedDays = [backgroundContext executeFetchRequest:dayFetchRequest error:&error];
+
if (error) {
- NSLog(@"Failed to fetch segments: %@", error.localizedDescription);
+ NSLog(@"Failed to fetch DayEntity: %@", error.localizedDescription);
+ return;
+ }
+
+ if (fetchedDays.count == 0) {
+ NSLog(@"No DayEntity found for date 2025-02-13");
return;
}
+ NSManagedObject *dayEntity = fetchedDays.firstObject;
+ NSOrderedSet *segments = [dayEntity valueForKey:@"segments"];
+
// Create a temporary array for the segment dictionaries
NSMutableArray *tempSegmentDicts = [NSMutableArray array];
@@ -101,20 +112,20 @@
double duration = [[segment valueForKey:@"duration"] doubleValue];
NSMutableArray *frameDicts = [NSMutableArray array];
-
+
// Fetch the ordered frames
NSOrderedSet *frames = [segment valueForKey:@"frames"];
-
+
for (NSManagedObject *frame in frames) {
double frameTimeStamp = [[frame valueForKey:@"frame_timeStamp"] doubleValue];
double aspectRatio = [[frame valueForKey:@"aspect_ratio"] doubleValue];
int res = [[frame valueForKey:@"res"] intValue];
NSMutableArray *squareDicts = [NSMutableArray array];
-
+
// Fetch the ordered squares within this frame
NSOrderedSet *squares = [frame valueForKey:@"squares"];
-
+
for (NSManagedObject *square in squares) {
double originX = [[square valueForKey:@"originX"] doubleValue];
double originY = [[square valueForKey:@"originY"] doubleValue];
@@ -153,17 +164,15 @@
[tempSegmentDicts addObject:segmentDict];
}
- // Once all iterations are complete, assign tempSegmentDicts to the final array
+ // Assign tempSegmentDicts to the final array
self.segmentsDict[dateParam] = tempSegmentDicts;
// Log the results
NSLog(@"rory length of init segments = %lu", (unsigned long)tempSegmentDicts.count);
- NSLog(@"Fetched and processed %lu segments", (unsigned long)tempSegmentDicts.count);
+ NSLog(@"Fetched and processed %lu segments for date 2025-02-13", (unsigned long)tempSegmentDicts.count);
}];
-
}
-
- (void)startHTTPServerWithBasePath:(NSString *)basePath {
@try {
signal(SIGPIPE, SIG_IGN);
@@ -524,28 +533,28 @@
}
}
-- (void)deleteAllSegmentsInContext:(NSManagedObjectContext *)context {
- NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:@"SegmentEntity"];
+- (void)deleteAllDayEntitiesInContext:(NSManagedObjectContext *)context {
+ NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:@"DayEntity"];
NSError *fetchError = nil;
- NSArray *segments = [context executeFetchRequest:fetchRequest error:&fetchError];
-
+ NSArray *dayEntities = [context executeFetchRequest:fetchRequest error:&fetchError];
+
if (fetchError) {
- NSLog(@"Failed to fetch Segment Entity objects: %@", fetchError.localizedDescription);
+ NSLog(@"Failed to fetch DayEntity objects: %@", fetchError.localizedDescription);
return;
}
-
+
// Loop through all fetched objects and delete them
- for (NSManagedObject *segment in segments) {
- [context deleteObject:segment];
+ for (NSManagedObject *dayEntity in dayEntities) {
+ [context deleteObject:dayEntity];
}
-
+
// Save the context after deletion
NSError *saveError = nil;
if (![context save:&saveError]) {
- NSLog(@"Failed to delete objects: %@", saveError.localizedDescription);
+ NSLog(@"Failed to delete DayEntity objects: %@", saveError.localizedDescription);
} else {
- NSLog(@"All segments deleted successfully");
+ NSLog(@"All DayEntity objects deleted successfully");
}
}
diff --git a/clearcam/ViewController.m b/clearcam/ViewController.m
index a83a533..ef1b7d6 100644
--- a/clearcam/ViewController.m
+++ b/clearcam/ViewController.m
@@ -368,9 +368,23 @@ NSMutableDictionary *classColorMap;
[backgroundContext performBlock:^{
NSError *error = nil;
+ // Fetch or create DayEntity
+ NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:@"DayEntity"];
+ fetchRequest.predicate = [NSPredicate predicateWithFormat:@"date == %@", @"2025-02-13"];
+ NSArray *fetchedDays = [backgroundContext executeFetchRequest:fetchRequest error:&error];
+
+ NSManagedObject *dayEntity;
+ if (fetchedDays.count > 0) {
+ dayEntity = fetchedDays.firstObject;
+ } else {
+ dayEntity = [NSEntityDescription insertNewObjectForEntityForName:@"DayEntity" inManagedObjectContext:backgroundContext];
+ [dayEntity setValue:@"2025-02-13" forKey:@"date"];
+ }
+
+ // Create new SegmentEntity
NSManagedObject *newSegment = [NSEntityDescription insertNewObjectForEntityForName:@"SegmentEntity" inManagedObjectContext:backgroundContext];
- // Set the segment properties
+ // Set segment properties
[newSegment setValue:[NSString stringWithFormat:@"%@/%@", [[self.assetWriter.outputURL URLByDeletingLastPathComponent] lastPathComponent], self.assetWriter.outputURL.lastPathComponent] forKey:@"url"];
[newSegment setValue:@(timeStamp) forKey:@"timeStamp"];
[newSegment setValue:@(CMTimeGetSeconds(time)) forKey:@"duration"];
@@ -379,7 +393,7 @@ NSMutableDictionary *classColorMap;
NSMutableArray<NSManagedObject *> *segmentFrames = [[NSMutableArray alloc] init];
for (NSDictionary *frameData in currentSegmentSquaresCopy) {
- // Create new FrameEntity object
+ // Create new FrameEntity
NSManagedObject *newFrame = [NSEntityDescription insertNewObjectForEntityForName:@"FrameEntity" inManagedObjectContext:backgroundContext];
[newFrame setValue:frameData[@"frame_timeStamp"] forKey:@"frame_timeStamp"];
[newFrame setValue:frameData[@"aspect_ratio"] forKey:@"aspect_ratio"];
@@ -389,7 +403,7 @@ NSMutableDictionary *classColorMap;
NSMutableArray<NSManagedObject *> *frameSquares = [[NSMutableArray alloc] init];
for (NSDictionary *squareData in frameData[@"squares"]) {
- // Create new SquareEntity object
+ // Create new SquareEntity
NSManagedObject *newSquare = [NSEntityDescription insertNewObjectForEntityForName:@"SquareEntity" inManagedObjectContext:backgroundContext];
[newSquare setValue:squareData[@"originX"] forKey:@"originX"];
[newSquare setValue:squareData[@"originY"] forKey:@"originY"];
@@ -411,11 +425,15 @@ NSMutableDictionary *classColorMap;
NSOrderedSet *orderedFrames = [NSOrderedSet orderedSetWithArray:segmentFrames];
[newSegment setValue:orderedFrames forKey:@"frames"];
+ // Add new segment to DayEntity
+ NSMutableOrderedSet *daySegments = [dayEntity mutableOrderedSetValueForKey:@"segments"];
+ [daySegments addObject:newSegment];
+
// Save changes in the background context
if (![backgroundContext save:&error]) {
NSLog(@"Failed to save segment: %@", error.localizedDescription);
} else {
- NSLog(@"Segment saved successfully with ordered frames and squares.");
+ NSLog(@"Segment saved successfully under DayEntity with date 2025-02-13.");
// Merge changes back to the main context
[self.fileServer.context performBlock:^{