Skip to content

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

dont scan maybe dont crash

roryclear6b95b154d3cb
diff --git a/clearcam/PortScanner.m b/clearcam/PortScanner.m
index 6e23728..72fdafc 100644
--- a/clearcam/PortScanner.m
+++ b/clearcam/PortScanner.m
@@ -13,7 +13,7 @@
_cachedOpenPorts = [NSMutableArray array];
_scanQueue = dispatch_queue_create("com.example.PortScannerQueue", DISPATCH_QUEUE_SERIAL);
}
- [self updateCachedOpenPortsForPort:80];
+ //[self updateCachedOpenPortsForPort:80];
return self;
}
diff --git a/clearcam/ViewController.m b/clearcam/ViewController.m
index dd6adeb..4799c58 100644
--- a/clearcam/ViewController.m
+++ b/clearcam/ViewController.m
@@ -21,6 +21,7 @@
@property (nonatomic, strong) CIContext *ciContext;
@property (atomic, assign) BOOL isProcessing;
+@property (nonatomic, assign) BOOL isProcessingCoreData;
@property (nonatomic, assign) BOOL recordPressed;
@property (nonatomic, assign) BOOL isRecording;
@property (nonatomic, assign) CMTime startTime;
@@ -37,6 +38,7 @@
@property (nonatomic, strong) NSManagedObjectContext *backgroundContext;
@property (nonatomic, strong) NSString *dayFolderName;
@property (nonatomic, strong) dispatch_queue_t segmentQueue;
+@property (nonatomic, strong) dispatch_queue_t finishRecordingQueue;
@property (nonatomic, strong) SceneState *scene;
#define MIN_FREE_SPACE_MB 500 //threshold to start deleting
@@ -52,6 +54,9 @@ NSMutableDictionary *classColorMap;
self.recordPressed = NO;
self.scene = [[SceneState alloc] init];
self.segmentQueue = dispatch_queue_create("com.example.segmentQueue", DISPATCH_QUEUE_SERIAL);
+
+ self.finishRecordingQueue = dispatch_queue_create("com.example.finishRecordingQueue", DISPATCH_QUEUE_SERIAL);
+
self.current_segment_squares = [[NSMutableArray alloc] init];
self.digits = [NSMutableDictionary dictionary];
self.digits[@"0"] = @[@[ @0, @0, @3, @1], @[ @0, @1, @1 , @3], @[ @2, @1, @1 , @3], @[ @0, @4, @3 , @1]];
@@ -515,109 +520,116 @@ NSMutableDictionary *classColorMap;
NSLog(@"Cannot finish writing. Asset writer status: %ld", (long)self.assetWriter.status);
return;
}
-
- self.isRecording = NO;
- [self.videoWriterInput markAsFinished];
-
- [self.assetWriter finishWritingWithCompletionHandler:^{
- if (!self.assetWriter.outputURL) return;
-
- AVAsset *asset = [AVAsset assetWithURL:self.assetWriter.outputURL];
- CMTime time = asset.duration;
-
- NSString *segmentsDirectory = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject] stringByAppendingPathComponent:self.dayFolderName];
- [[NSFileManager defaultManager] createDirectoryAtPath:segmentsDirectory withIntermediateDirectories:YES attributes:nil error:nil];
-
- NSString *segmentURL = [NSString stringWithFormat:@"%@/%@", [[self.assetWriter.outputURL URLByDeletingLastPathComponent] lastPathComponent], self.assetWriter.outputURL.lastPathComponent];
-
- NSCalendar *calendar = [NSCalendar currentCalendar];
- NSDateComponents *components = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay fromDate:self.current_file_timestamp];
- NSTimeInterval timeStamp = [self.current_file_timestamp timeIntervalSinceDate:[calendar dateFromComponents:components]];
-
- // Create a local copy of current_segment_squares
- __block NSArray *segmentSquaresCopy;
- dispatch_sync(self.segmentQueue, ^{
- segmentSquaresCopy = [self.current_segment_squares copy];
- [self.current_segment_squares removeAllObjects];
- });
-
- [self.backgroundContext performBlockAndWait:^{
- // Fetch or create DayEntity efficiently
- NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:@"DayEntity"];
- fetchRequest.predicate = [NSPredicate predicateWithFormat:@"date == %@", self.dayFolderName];
- fetchRequest.fetchLimit = 1; // Only one DayEntity per date
-
- NSError *error = nil;
- NSArray *fetchedDays = [self.backgroundContext executeFetchRequest:fetchRequest error:&error];
- NSManagedObject *dayEntity;
-
- if (error) {
- NSLog(@"Failed to fetch DayEntity: %@", error.localizedDescription);
- return;
- }
-
- if (fetchedDays.count > 0) {
- dayEntity = fetchedDays.firstObject;
- } else {
- dayEntity = [NSEntityDescription insertNewObjectForEntityForName:@"DayEntity" inManagedObjectContext:self.backgroundContext];
- [dayEntity setValue:self.dayFolderName forKey:@"date"];
- }
-
- // Insert new SegmentEntity
- NSManagedObject *newSegment = [NSEntityDescription insertNewObjectForEntityForName:@"SegmentEntity" inManagedObjectContext:self.backgroundContext];
- [newSegment setValuesForKeysWithDictionary:@{
- @"url": segmentURL,
- @"timeStamp": @(timeStamp),
- @"duration": @(CMTimeGetSeconds(time))
- }];
-
- // Pre-allocate frames array
- NSMutableArray<NSManagedObject *> *segmentFrames = [NSMutableArray arrayWithCapacity:segmentSquaresCopy.count];
-
- for (NSDictionary *frameData in segmentSquaresCopy) {
- NSManagedObject *newFrame = [NSEntityDescription insertNewObjectForEntityForName:@"FrameEntity" inManagedObjectContext:self.backgroundContext];
- [newFrame setValuesForKeysWithDictionary:@{
- @"frame_timeStamp": frameData[@"frame_timeStamp"] ?: @0,
- @"aspect_ratio": frameData[@"aspect_ratio"] ?: @0,
- @"res": frameData[@"res"] ?: @0
- }];
-
- NSArray *squaresData = frameData[@"squares"];
- NSMutableArray<NSManagedObject *> *frameSquares = [NSMutableArray arrayWithCapacity:squaresData.count];
-
- for (NSDictionary *squareData in squaresData) {
- NSManagedObject *newSquare = [NSEntityDescription insertNewObjectForEntityForName:@"SquareEntity" inManagedObjectContext:self.backgroundContext];
- [newSquare setValuesForKeysWithDictionary:squareData];
- [frameSquares addObject:newSquare];
+
+ dispatch_async(self.finishRecordingQueue, ^{
+ while (self.isProcessingCoreData) {
+ [NSThread sleepForTimeInterval:0.01];
+ }
+ self.isProcessingCoreData = YES;
+ self.isRecording = NO;
+ [self.videoWriterInput markAsFinished];
+
+ [self.assetWriter finishWritingWithCompletionHandler:^{
+ if (!self.assetWriter.outputURL) return;
+
+ AVAsset *asset = [AVAsset assetWithURL:self.assetWriter.outputURL];
+ CMTime time = asset.duration;
+
+ NSString *segmentsDirectory = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject] stringByAppendingPathComponent:self.dayFolderName];
+ [[NSFileManager defaultManager] createDirectoryAtPath:segmentsDirectory withIntermediateDirectories:YES attributes:nil error:nil];
+
+ NSString *segmentURL = [NSString stringWithFormat:@"%@/%@", [[self.assetWriter.outputURL URLByDeletingLastPathComponent] lastPathComponent], self.assetWriter.outputURL.lastPathComponent];
+
+ NSCalendar *calendar = [NSCalendar currentCalendar];
+ NSDateComponents *components = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay fromDate:self.current_file_timestamp];
+ NSTimeInterval timeStamp = [self.current_file_timestamp timeIntervalSinceDate:[calendar dateFromComponents:components]];
+
+ // Create a local copy of current_segment_squares
+ __block NSArray *segmentSquaresCopy;
+ dispatch_sync(self.segmentQueue, ^{
+ segmentSquaresCopy = [self.current_segment_squares copy];
+ [self.current_segment_squares removeAllObjects];
+ });
+
+ [self.backgroundContext performBlock:^{
+ // Fetch or create DayEntity efficiently
+ NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:@"DayEntity"];
+ fetchRequest.predicate = [NSPredicate predicateWithFormat:@"date == %@", self.dayFolderName];
+ fetchRequest.fetchLimit = 1; // Only one DayEntity per date
+
+ NSError *error = nil;
+ NSArray *fetchedDays = [self.backgroundContext executeFetchRequest:fetchRequest error:&error];
+ NSManagedObject *dayEntity;
+
+ if (error) {
+ NSLog(@"Failed to fetch DayEntity: %@", error.localizedDescription);
+ return;
}
-
- [newFrame setValue:[NSOrderedSet orderedSetWithArray:frameSquares] forKey:@"squares"];
- [segmentFrames addObject:newFrame];
- }
-
- [newSegment setValue:[NSOrderedSet orderedSetWithArray:segmentFrames] forKey:@"frames"];
- [[dayEntity mutableOrderedSetValueForKey:@"segments"] addObject:newSegment];
-
- // Save background context
- if ([self.backgroundContext save:&error]) {
- NSLog(@"Segment saved successfully under DayEntity with date %@", self.dayFolderName);
- // Save parent context only if necessary
- [self.fileServer.context performBlockAndWait:^{
- NSError *parentError = nil;
- if (![self.fileServer.context save:&parentError]) {
- NSLog(@"Failed to save parent context: %@", parentError.localizedDescription);
- }
+
+ if (fetchedDays.count > 0) {
+ dayEntity = fetchedDays.firstObject;
+ } else {
+ dayEntity = [NSEntityDescription insertNewObjectForEntityForName:@"DayEntity" inManagedObjectContext:self.backgroundContext];
+ [dayEntity setValue:self.dayFolderName forKey:@"date"];
+ }
+
+ // Insert new SegmentEntity
+ NSManagedObject *newSegment = [NSEntityDescription insertNewObjectForEntityForName:@"SegmentEntity" inManagedObjectContext:self.backgroundContext];
+ [newSegment setValuesForKeysWithDictionary:@{
+ @"url": segmentURL,
+ @"timeStamp": @(timeStamp),
+ @"duration": @(CMTimeGetSeconds(time))
}];
- } else {
- NSLog(@"Failed to save segment: %@", error.localizedDescription);
- }
+
+ // Pre-allocate frames array
+ NSMutableArray<NSManagedObject *> *segmentFrames = [NSMutableArray arrayWithCapacity:segmentSquaresCopy.count];
+
+ for (NSDictionary *frameData in segmentSquaresCopy) {
+ NSManagedObject *newFrame = [NSEntityDescription insertNewObjectForEntityForName:@"FrameEntity" inManagedObjectContext:self.backgroundContext];
+ [newFrame setValuesForKeysWithDictionary:@{
+ @"frame_timeStamp": frameData[@"frame_timeStamp"] ?: @0,
+ @"aspect_ratio": frameData[@"aspect_ratio"] ?: @0,
+ @"res": frameData[@"res"] ?: @0
+ }];
+
+ NSArray *squaresData = frameData[@"squares"];
+ NSMutableArray<NSManagedObject *> *frameSquares = [NSMutableArray arrayWithCapacity:squaresData.count];
+
+ for (NSDictionary *squareData in squaresData) {
+ NSManagedObject *newSquare = [NSEntityDescription insertNewObjectForEntityForName:@"SquareEntity" inManagedObjectContext:self.backgroundContext];
+ [newSquare setValuesForKeysWithDictionary:squareData];
+ [frameSquares addObject:newSquare];
+ }
+
+ [newFrame setValue:[NSOrderedSet orderedSetWithArray:frameSquares] forKey:@"squares"];
+ [segmentFrames addObject:newFrame];
+ }
+
+ [newSegment setValue:[NSOrderedSet orderedSetWithArray:segmentFrames] forKey:@"frames"];
+ [[dayEntity mutableOrderedSetValueForKey:@"segments"] addObject:newSegment];
+
+ // Save background context
+ if ([self.backgroundContext save:&error]) {
+ NSLog(@"Segment saved successfully under DayEntity with date %@", self.dayFolderName);
+ // Save parent context only if necessary
+ [self.fileServer.context performBlockAndWait:^{
+ NSError *parentError = nil;
+ if (![self.fileServer.context save:&parentError]) {
+ NSLog(@"Failed to save parent context: %@", parentError.localizedDescription);
+ }
+ }];
+ } else {
+ NSLog(@"Failed to save segment: %@", error.localizedDescription);
+ }
+ }];
+
+ // Start new recording
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self.isProcessingCoreData = NO;
+ [self startNewRecording];
+ });
}];
-
- // Start new recording
- dispatch_async(dispatch_get_main_queue(), ^{
- [self startNewRecording];
- });
- }];
+ });
}
- (NSString *)jsonStringFromDictionary:(NSDictionary *)dictionary {
@@ -841,7 +853,7 @@ NSMutableDictionary *classColorMap;
NSTimeInterval elapsedTime = CMTimeGetSeconds(self.currentTime);
if (self.fileServer.segment_length == 1 && [[NSDate now] timeIntervalSinceDate:self.fileServer.last_req_time] > 60) {
- self.fileServer.segment_length = 60;
+ self.fileServer.segment_length = 1; //todo change back
}
if (elapsedTime >= self.fileServer.segment_length) {
[self finishRecording];
@@ -1088,3 +1100,4 @@ NSMutableDictionary *classColorMap;
+