Skip to content

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

less crashy

roryclear028d84f8d61d
diff --git a/clearcam/FileServer.m b/clearcam/FileServer.m
index 9ff595d..934b3f4 100644
--- a/clearcam/FileServer.m
+++ b/clearcam/FileServer.m
@@ -24,10 +24,39 @@
AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
self.context = appDelegate.persistentContainer.viewContext;
+
+ //TODO REMOVE THIS
+ NSFileManager *fileManager = [NSFileManager defaultManager];
+ NSURL *documentsURL = [[[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] firstObject];
+ NSString *documentsPath = [documentsURL path];
+
+ NSError *error;
+ NSArray *contents = [fileManager contentsOfDirectoryAtPath:documentsPath error:&error];
+
+ if (error) {
+ NSLog(@"Failed to get contents of Documents directory: %@", error.localizedDescription);
+ return;
+ }
+
+ for (NSString *file in contents) {
+ //continue;
+ if ([file hasPrefix:@"batch_req"]) continue;
+ NSString *filePath = [documentsPath stringByAppendingPathComponent:file];
+ BOOL success = [fileManager removeItemAtPath:filePath error:&error];
+
+ if (!success) {
+ NSLog(@"Failed to delete %@: %@", file, error.localizedDescription);
+ } else {
+ NSLog(@"Deleted: %@", file);
+ }
+ }
+
+ ///TODO
+
// Save a new string
NSLog(@"core data segments?:");
- [self fetchAllSegmentsInContext:self.context];
- [self deleteAllSegmentsInContext:self.context]; //to delete all
+ //[self fetchAllSegmentsInContext:self.context];
+ [self deleteAllSegmentsInContext:self.context]; //to delete all, not thread safe yet!
// Fetch all saved strings
// coredata stuff
@@ -48,85 +77,90 @@
}
- (void)fetchAndProcessSegmentsFromCoreDataForDateParam:(NSString *)dateParam context:(NSManagedObjectContext *)context {
- // Create a fetch request for SegmentEntity
- NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] initWithEntityName:@"SegmentEntity"];
-
- // Execute the fetch request
- NSError *error = nil;
- NSArray *segments = [context executeFetchRequest:fetchRequest error:&error];
-
- if (error) {
- NSLog(@"Failed to fetch segments: %@", error.localizedDescription);
- return;
- }
+ // Create a private queue context for fetching
+ NSManagedObjectContext *backgroundContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
+ backgroundContext.parentContext = context; // Link it to the main context
- NSMutableArray *segmentDicts = [NSMutableArray array];
-
- // Loop through fetched segments and construct the JSON-like structure
- for (NSManagedObject *segment in segments) {
- NSString *url = [segment valueForKey:@"url"];
- double timeStamp = [[segment valueForKey:@"timeStamp"] doubleValue];
- double duration = [[segment valueForKey:@"duration"] doubleValue];
-
- NSMutableArray *frameDicts = [NSMutableArray array];
+ [backgroundContext performBlock:^{
+ NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] initWithEntityName:@"SegmentEntity"];
- // Fetch the ordered frames
- NSOrderedSet *frames = [segment valueForKey:@"frames"];
+ NSError *error = nil;
+ NSArray *segments = [backgroundContext executeFetchRequest:fetchRequest error:&error];
- 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];
+ if (error) {
+ NSLog(@"Failed to fetch segments: %@", error.localizedDescription);
+ return;
+ }
+
+ // Create a temporary array for the segment dictionaries
+ NSMutableArray *tempSegmentDicts = [NSMutableArray array];
+
+ for (NSManagedObject *segment in segments) {
+ NSString *url = [segment valueForKey:@"url"];
+ double timeStamp = [[segment valueForKey:@"timeStamp"] doubleValue];
+ double duration = [[segment valueForKey:@"duration"] doubleValue];
+
+ NSMutableArray *frameDicts = [NSMutableArray array];
- // Fetch the ordered squares within this frame
- NSOrderedSet *squares = [frame valueForKey:@"squares"];
+ // Fetch the ordered frames
+ NSOrderedSet *frames = [segment valueForKey:@"frames"];
- for (NSManagedObject *square in squares) {
- double originX = [[square valueForKey:@"originX"] doubleValue];
- double originY = [[square valueForKey:@"originY"] doubleValue];
- double bottomRightX = [[square valueForKey:@"bottomRightX"] doubleValue];
- double bottomRightY = [[square valueForKey:@"bottomRightY"] doubleValue];
- int classIndex = [[square valueForKey:@"classIndex"] intValue];
+ 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];
- NSDictionary *squareDict = @{
- @"originX": @(originX),
- @"originY": @(originY),
- @"bottomRightX": @(bottomRightX),
- @"bottomRightY": @(bottomRightY),
- @"classIndex": @(classIndex)
- };
+ // Fetch the ordered squares within this frame
+ NSOrderedSet *squares = [frame valueForKey:@"squares"];
- [squareDicts addObject:squareDict];
+ for (NSManagedObject *square in squares) {
+ double originX = [[square valueForKey:@"originX"] doubleValue];
+ double originY = [[square valueForKey:@"originY"] doubleValue];
+ double bottomRightX = [[square valueForKey:@"bottomRightX"] doubleValue];
+ double bottomRightY = [[square valueForKey:@"bottomRightY"] doubleValue];
+ int classIndex = [[square valueForKey:@"classIndex"] intValue];
+
+ NSDictionary *squareDict = @{
+ @"originX": @(originX),
+ @"originY": @(originY),
+ @"bottomRightX": @(bottomRightX),
+ @"bottomRightY": @(bottomRightY),
+ @"classIndex": @(classIndex)
+ };
+
+ [squareDicts addObject:squareDict];
+ }
+
+ NSDictionary *frameDict = @{
+ @"frame_timeStamp": @(frameTimeStamp),
+ @"aspect_ratio": @(aspectRatio),
+ @"res": @(res),
+ @"squares": squareDicts
+ };
+
+ [frameDicts addObject:frameDict];
}
-
- // Create frame dictionary
- NSDictionary *frameDict = @{
- @"frame_timeStamp": @(frameTimeStamp),
- @"aspect_ratio": @(aspectRatio),
- @"res": @(res),
- @"squares": squareDicts
+
+ NSDictionary *segmentDict = @{
+ @"url": url,
+ @"timeStamp": @(timeStamp),
+ @"duration": @(duration),
+ @"frames": frameDicts
};
-
- [frameDicts addObject:frameDict];
+
+ [tempSegmentDicts addObject:segmentDict];
}
-
- // Create segment dictionary
- NSDictionary *segmentDict = @{
- @"url": url,
- @"timeStamp": @(timeStamp),
- @"duration": @(duration),
- @"frames": frameDicts
- };
-
- [segmentDicts addObject:segmentDict];
- }
-
- // Now, `segmentDicts` contains all the segments, frames, and squares as required
- self.segmentsDict[dateParam] = segmentDicts; // Store it in your segmentsDict
-
- NSLog(@"Fetched and processed %lu segments", (unsigned long)segmentDicts.count);
+
+ // Once all iterations are complete, 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);
+ }];
+
}
@@ -437,7 +471,6 @@
}
- (void)fetchAllSegmentsInContext:(NSManagedObjectContext *)context {
- // Create a fetch request for SegmentEntity
NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] initWithEntityName:@"SegmentEntity"];
// Execute the fetch request
@@ -492,15 +525,13 @@
}
- (void)deleteAllSegmentsInContext:(NSManagedObjectContext *)context {
- // Create a fetch request for all SegmentEntity objects
NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:@"SegmentEntity"];
-
- // Fetch all SegmentEntity objects
+
NSError *fetchError = nil;
NSArray *segments = [context executeFetchRequest:fetchRequest error:&fetchError];
if (fetchError) {
- NSLog(@"Failed to fetch SegmentEntity objects: %@", fetchError.localizedDescription);
+ NSLog(@"Failed to fetch Segment Entity objects: %@", fetchError.localizedDescription);
return;
}
diff --git a/clearcam/ViewController.m b/clearcam/ViewController.m
index 5452a93..a83a533 100644
--- a/clearcam/ViewController.m
+++ b/clearcam/ViewController.m
@@ -54,37 +54,7 @@ NSMutableDictionary *classColorMap;
self.digits[@"-"] = @[@[ @0, @2, @3, @1 ]];
self.digits[@":"] = @[@[ @1, @1, @1, @1 ], @[ @1, @3, @1, @1 ]];
self.segmentLock = [[NSLock alloc] init]; //dont allow current_segment_squares to be accessed twice at once!
-
- //TODO REMOVE THIS
- NSFileManager *fileManager = [NSFileManager defaultManager];
- NSURL *documentsURL = [[[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] firstObject];
- NSString *documentsPath = [documentsURL path];
-
- NSError *error;
- NSArray *contents = [fileManager contentsOfDirectoryAtPath:documentsPath error:&error];
-
- if (error) {
- NSLog(@"Failed to get contents of Documents directory: %@", error.localizedDescription);
- return;
- }
-
- for (NSString *file in contents) {
- if ([file hasPrefix:@"opp"]) continue;
- if ([file hasPrefix:@"batch_req"]) continue;
- if ([file hasPrefix:@"2025-01-27"]) continue;
-
- NSString *filePath = [documentsPath stringByAppendingPathComponent:file];
- BOOL success = [fileManager removeItemAtPath:filePath error:&error];
-
- if (!success) {
- NSLog(@"Failed to delete %@: %@", file, error.localizedDescription);
- } else {
- NSLog(@"Deleted: %@", file);
- }
- }
-
- ///TODO
-
+
self.ciContext = [CIContext context];
self.yolo = [[Yolo alloc] init];
self.seg_number = 0;
@@ -345,108 +315,124 @@ NSMutableDictionary *classColorMap;
[self.videoWriterInput markAsFinished];
[self.assetWriter finishWritingWithCompletionHandler:^{
- AVAsset *asset = [AVAsset assetWithURL:self.assetWriter.outputURL];
- CMTime time = asset.duration;
+ AVAsset *asset = [AVAsset assetWithURL:self.assetWriter.outputURL];
+ CMTime time = asset.duration;
- NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
- [dateFormatter setDateFormat:@"yyyy-MM-dd"];
- NSString *dateFolderName = [dateFormatter stringFromDate:self.current_file_timestamp];
+ NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+ [dateFormatter setDateFormat:@"yyyy-MM-dd"];
+ NSString *dateFolderName = [dateFormatter stringFromDate:self.current_file_timestamp];
- // Get the documents directory
- NSString *documentsDirectory = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject];
- NSString *segmentsDirectory = [documentsDirectory stringByAppendingPathComponent:dateFolderName];
+ // Get the documents directory
+ NSString *documentsDirectory = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject];
+ NSString *segmentsDirectory = [documentsDirectory stringByAppendingPathComponent:dateFolderName];
- // Create the folder if it doesn't exist
- NSError *error = nil;
- if (![[NSFileManager defaultManager] fileExistsAtPath:segmentsDirectory]) {
- [[NSFileManager defaultManager] createDirectoryAtPath:segmentsDirectory withIntermediateDirectories:YES attributes:nil error:&error];
- if (error) {
- NSLog(@"Error creating directory: %@", error);
+ // Create the folder if it doesn't exist
+ NSError *error = nil;
+ if (![[NSFileManager defaultManager] fileExistsAtPath:segmentsDirectory]) {
+ [[NSFileManager defaultManager] createDirectoryAtPath:segmentsDirectory withIntermediateDirectories:YES attributes:nil error:&error];
+ if (error) {
+ NSLog(@"Error creating directory: %@", error);
+ }
}
- }
-
- NSCalendar *calendar = [NSCalendar currentCalendar];
- NSDateComponents *components = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay | NSCalendarUnitHour fromDate:self.current_file_timestamp];
- NSString *dateKey = [NSString stringWithFormat:@"%04ld-%02ld-%02ld", (long)components.year, (long)components.month, (long)components.day];
-
- if (!self.fileServer.segmentsDict[dateKey]) {
- [self.fileServer fetchAndProcessSegmentsFromCoreDataForDateParam:dateKey context:self.fileServer.context]; //todo only works on today's segments!
- }
+ NSCalendar *calendar = [NSCalendar currentCalendar];
+ NSDateComponents *components = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay | NSCalendarUnitHour fromDate:self.current_file_timestamp];
+ NSString *dateKey = [NSString stringWithFormat:@"%04ld-%02ld-%02ld", (long)components.year, (long)components.month, (long)components.day];
- NSMutableDictionary *segmentEntry = [NSMutableDictionary dictionaryWithDictionary:@{ //does this fix last segment in hour/day?
- @"url": [NSString stringWithFormat:@"%@/%@", [[self.assetWriter.outputURL URLByDeletingLastPathComponent] lastPathComponent], self.assetWriter.outputURL.lastPathComponent],
- @"duration": @(CMTimeGetSeconds(time)),
- @"frames":[self.current_segment_squares copy]
- }];
-
- //timestamp of every segment now
- calendar = [NSCalendar currentCalendar];
- components = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay fromDate:self.current_file_timestamp];
- NSDate *midnight = [calendar dateFromComponents:components];
- NSTimeInterval timeStamp = [self.current_file_timestamp timeIntervalSinceDate:midnight];
- segmentEntry[@"timeStamp"] = @(timeStamp);
-
-
- //core data below
- // Create new SegmentEntity object
- NSManagedObject *newSegment = [NSEntityDescription insertNewObjectForEntityForName:@"SegmentEntity" inManagedObjectContext:self.fileServer.context];
-
- // Set the 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"];
-
- // Create an array for the frames
- NSMutableArray<NSManagedObject *> *segmentFrames = [[NSMutableArray alloc] init];
-
- for (NSDictionary *frameData in self.current_segment_squares) {
- // Create new FrameEntity object
- NSManagedObject *newFrame = [NSEntityDescription insertNewObjectForEntityForName:@"FrameEntity" inManagedObjectContext:self.fileServer.context];
- [newFrame setValue:frameData[@"frame_timeStamp"] forKey:@"frame_timeStamp"];
- [newFrame setValue:frameData[@"aspect_ratio"] forKey:@"aspect_ratio"];
- [newFrame setValue:frameData[@"res"] forKey:@"res"];
-
- // Create an array for the squares in this frame
- NSMutableArray<NSManagedObject *> *frameSquares = [[NSMutableArray alloc] init];
-
- for (NSDictionary *squareData in frameData[@"squares"]) {
- // Create new SquareEntity object
- NSManagedObject *newSquare = [NSEntityDescription insertNewObjectForEntityForName:@"SquareEntity" inManagedObjectContext:self.fileServer.context];
- [newSquare setValue:squareData[@"originX"] forKey:@"originX"];
- [newSquare setValue:squareData[@"originY"] forKey:@"originY"];
- [newSquare setValue:squareData[@"bottomRightX"] forKey:@"bottomRightX"];
- [newSquare setValue:squareData[@"bottomRightY"] forKey:@"bottomRightY"];
- [newSquare setValue:squareData[@"classIndex"] forKey:@"classIndex"];
-
- [frameSquares addObject:newSquare];
+ if (!self.fileServer.segmentsDict[dateKey]) {
+ [self.fileServer fetchAndProcessSegmentsFromCoreDataForDateParam:dateKey context:self.fileServer.context]; //todo only works on today's segments!
}
- // Convert squares array to NSOrderedSet and set to the frame
- NSOrderedSet *orderedSquares = [NSOrderedSet orderedSetWithArray:frameSquares];
- [newFrame setValue:orderedSquares forKey:@"squares"];
+ // Create a copy of self.current_segment_squares to avoid mutation during enumeration
+ NSArray *currentSegmentSquaresCopy = [self.current_segment_squares copy];
+
+ NSMutableDictionary *segmentEntry = [NSMutableDictionary dictionaryWithDictionary:@{ //does this fix last segment in hour/day?
+ @"url": [NSString stringWithFormat:@"%@/%@", [[self.assetWriter.outputURL URLByDeletingLastPathComponent] lastPathComponent], self.assetWriter.outputURL.lastPathComponent],
+ @"duration": @(CMTimeGetSeconds(time)),
+ @"frames": currentSegmentSquaresCopy
+ }];
+
+ //timestamp of every segment now
+ calendar = [NSCalendar currentCalendar];
+ components = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay fromDate:self.current_file_timestamp];
+ NSDate *midnight = [calendar dateFromComponents:components];
+ NSTimeInterval timeStamp = [self.current_file_timestamp timeIntervalSinceDate:midnight];
+ segmentEntry[@"timeStamp"] = @(timeStamp);
+
+
+ //core data below
+ // Create a private context for background processing
+ NSManagedObjectContext *backgroundContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
+ backgroundContext.parentContext = self.fileServer.context; // Link to main context
+
+ [backgroundContext performBlock:^{
+ NSError *error = nil;
+
+ NSManagedObject *newSegment = [NSEntityDescription insertNewObjectForEntityForName:@"SegmentEntity" inManagedObjectContext:backgroundContext];
+
+ // Set the 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"];
+
+ // Create an array for the frames
+ NSMutableArray<NSManagedObject *> *segmentFrames = [[NSMutableArray alloc] init];
+
+ for (NSDictionary *frameData in currentSegmentSquaresCopy) {
+ // Create new FrameEntity object
+ NSManagedObject *newFrame = [NSEntityDescription insertNewObjectForEntityForName:@"FrameEntity" inManagedObjectContext:backgroundContext];
+ [newFrame setValue:frameData[@"frame_timeStamp"] forKey:@"frame_timeStamp"];
+ [newFrame setValue:frameData[@"aspect_ratio"] forKey:@"aspect_ratio"];
+ [newFrame setValue:frameData[@"res"] forKey:@"res"];
+
+ // Create an array for the squares in this frame
+ NSMutableArray<NSManagedObject *> *frameSquares = [[NSMutableArray alloc] init];
+
+ for (NSDictionary *squareData in frameData[@"squares"]) {
+ // Create new SquareEntity object
+ NSManagedObject *newSquare = [NSEntityDescription insertNewObjectForEntityForName:@"SquareEntity" inManagedObjectContext:backgroundContext];
+ [newSquare setValue:squareData[@"originX"] forKey:@"originX"];
+ [newSquare setValue:squareData[@"originY"] forKey:@"originY"];
+ [newSquare setValue:squareData[@"bottomRightX"] forKey:@"bottomRightX"];
+ [newSquare setValue:squareData[@"bottomRightY"] forKey:@"bottomRightY"];
+ [newSquare setValue:squareData[@"classIndex"] forKey:@"classIndex"];
+
+ [frameSquares addObject:newSquare];
+ }
- [segmentFrames addObject:newFrame];
- }
+ // Convert squares array to NSOrderedSet and set to the frame
+ NSOrderedSet *orderedSquares = [NSOrderedSet orderedSetWithArray:frameSquares];
+ [newFrame setValue:orderedSquares forKey:@"squares"];
- // Convert NSMutableArray to NSOrderedSet and set to the segment
- NSOrderedSet *orderedFrames = [NSOrderedSet orderedSetWithArray:segmentFrames];
- [newSegment setValue:orderedFrames forKey:@"frames"];
+ [segmentFrames addObject:newFrame];
+ }
- // Save the context
- error = nil;
- if (![self.fileServer.context save:&error]) {
- NSLog(@"Failed to save segment: %@", error.localizedDescription);
- } else {
- NSLog(@"Segment saved successfully with ordered frames and squares.");
- }
- //core data above
-
- [self.fileServer.segmentsDict[dateKey] addObject:segmentEntry];
- [self startNewRecording];
- [self.segmentLock lock];
- [self.current_segment_squares removeAllObjects];
- [self.segmentLock unlock];
+ // Convert NSMutableArray to NSOrderedSet and set to the segment
+ NSOrderedSet *orderedFrames = [NSOrderedSet orderedSetWithArray:segmentFrames];
+ [newSegment setValue:orderedFrames forKey:@"frames"];
+
+ // 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.");
+
+ // Merge changes back to the main context
+ [self.fileServer.context performBlock:^{
+ NSError *mainContextError = nil;
+ if (![self.fileServer.context save:&mainContextError]) {
+ NSLog(@"Failed to save main context: %@", mainContextError.localizedDescription);
+ }
+ }];
+ }
+ }];
+ //core data above
+
+ [self.fileServer.segmentsDict[dateKey] addObject:segmentEntry];
+ [self startNewRecording];
+ [self.segmentLock lock];
+ [self.current_segment_squares removeAllObjects];
+ [self.segmentLock unlock];
}];
} else {
NSLog(@"Cannot finish writing. Asset writer status: %ld", (long)self.assetWriter.status);