Skip to content

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

auto delete??

roryclear289cd12bbcd9
diff --git a/clearcam/FileServer.m b/clearcam/FileServer.m
index cfb67de..290c2e1 100644
--- a/clearcam/FileServer.m
+++ b/clearcam/FileServer.m
@@ -26,6 +26,10 @@
//TODO REMOVE THIS
+ [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"LastDeletedDayIndex"];
+ [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"LastDeletedSegmentIndex"];
+ [[NSUserDefaults standardUserDefaults] synchronize];
+
NSFileManager *fileManager = [NSFileManager defaultManager];
NSURL *documentsURL = [[[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] firstObject];
NSString *documentsPath = [documentsURL path];
diff --git a/clearcam/ViewController.m b/clearcam/ViewController.m
index 11ca04f..cb458e0 100644
--- a/clearcam/ViewController.m
+++ b/clearcam/ViewController.m
@@ -28,7 +28,7 @@
@property (nonatomic, strong) NSMutableArray *current_segment_squares;
@property (nonatomic, strong) NSLock *segmentLock;
-#define MIN_FREE_SPACE_MB 20800 //threshold to start deleting
+#define MIN_FREE_SPACE_MB 42800 //threshold to start deleting
@end
@@ -475,10 +475,18 @@ NSMutableDictionary *classColorMap;
}
- (void)ensureFreeDiskSpace {
+ NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+
+ NSInteger lastDeletedDayIndex = [defaults integerForKey:@"LastDeletedDayIndex"];
+ NSInteger lastDeletedSegmentIndex = [defaults integerForKey:@"LastDeletedSegmentIndex"];
+
while ((double)[[[[NSFileManager defaultManager] attributesOfFileSystemForPath:NSHomeDirectory() error:nil] objectForKey:NSFileSystemFreeSize] unsignedLongLongValue] / (1024.0 * 1024.0) < MIN_FREE_SPACE_MB) {
NSLog(@"NOT ENOUGH SPACE!");
-
+
+ // Fetch all DayEntities, sorted by date
NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:@"DayEntity"];
+ fetchRequest.sortDescriptors = @[[NSSortDescriptor sortDescriptorWithKey:@"date" ascending:YES]];
+
NSError *fetchError = nil;
NSArray *dayEntities = [self.fileServer.context executeFetchRequest:fetchRequest error:&fetchError];
@@ -487,23 +495,45 @@ NSMutableDictionary *classColorMap;
return;
}
+ if (dayEntities.count == 0 || lastDeletedDayIndex >= dayEntities.count) {
+ NSLog(@"No more DayEntities available. Resetting deletion indexes.");
+ [defaults removeObjectForKey:@"LastDeletedDayIndex"];
+ [defaults removeObjectForKey:@"LastDeletedSegmentIndex"];
+ [defaults synchronize];
+ return;
+ }
+
BOOL deletedFile = NO;
- for (NSManagedObject *dayEntity in dayEntities) {
- NSLog(@"day entity found: %@", [dayEntity valueForKey:@"date"]);
-
- for (NSManagedObject *segmentEntity in [dayEntity valueForKey:@"segments"]) {
- NSLog(@"\t segment found %@", [segmentEntity valueForKey:@"url"]);
-
- if (![[segmentEntity valueForKey:@"url"] isEqual:@""]) {
- NSString *filePath = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES).firstObject stringByAppendingPathComponent:[segmentEntity valueForKey:@"url"]];
-
+ for (NSInteger dayIndex = lastDeletedDayIndex; dayIndex < dayEntities.count; dayIndex++) {
+ NSManagedObject *dayEntity = dayEntities[dayIndex];
+ NSLog(@"Checking DayEntity: %@", [dayEntity valueForKey:@"date"]);
+
+ NSArray *segments = [[dayEntity valueForKey:@"segments"] allObjects];
+
+ if (lastDeletedSegmentIndex >= segments.count) {
+ lastDeletedSegmentIndex = 0; // Reset segment index if we move to the next day
+ }
+
+ for (NSInteger segmentIndex = lastDeletedSegmentIndex; segmentIndex < segments.count; segmentIndex++) {
+ NSManagedObject *segmentEntity = segments[segmentIndex];
+ NSString *segmentURL = [segmentEntity valueForKey:@"url"];
+ NSLog(@"\tChecking Segment: %@", segmentURL);
+
+ if (![segmentURL isEqualToString:@""]) {
+ NSString *filePath = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES).firstObject stringByAppendingPathComponent:segmentURL];
+
if ([[NSFileManager defaultManager] removeItemAtPath:filePath error:nil]) {
- NSLog(@"\t deleted %@", [segmentEntity valueForKey:@"url"]);
+ NSLog(@"\tDeleted %@", segmentURL);
[segmentEntity setValue:@"" forKey:@"url"];
deletedFile = YES;
+
+ // Save indexes
+ [defaults setInteger:dayIndex forKey:@"LastDeletedDayIndex"];
+ [defaults setInteger:segmentIndex forKey:@"LastDeletedSegmentIndex"];
+ [defaults synchronize];
}
-
+
// Check free space again
double freeSpace = (double)[[[[NSFileManager defaultManager] attributesOfFileSystemForPath:NSHomeDirectory() error:nil] objectForKey:NSFileSystemFreeSize] unsignedLongLongValue] / (1024.0 * 1024.0);
if (freeSpace >= MIN_FREE_SPACE_MB) {
@@ -512,15 +542,22 @@ NSMutableDictionary *classColorMap;
}
}
}
+
+ // If we finish all segments in a day, move to the next one
+ lastDeletedSegmentIndex = 0;
}
- // If no file was deleted but still low on space, break to avoid infinite loop
+ // If nothing was deleted, reset the indexes to avoid getting stuck
if (!deletedFile) {
- NSLog(@"No more files to delete but still low on space!");
+ NSLog(@"No more files to delete but still low on space! Resetting deletion indexes.");
+ [defaults removeObjectForKey:@"LastDeletedDayIndex"];
+ [defaults removeObjectForKey:@"LastDeletedSegmentIndex"];
+ [defaults synchronize];
return;
}
}
- NSLog(@"free space = %f",(double)[[[[NSFileManager defaultManager] attributesOfFileSystemForPath:NSHomeDirectory() error:nil] objectForKey:NSFileSystemFreeSize] unsignedLongLongValue] / (1024.0 * 1024.0));
+
+ NSLog(@"Free space = %f MB", (double)[[[[NSFileManager defaultManager] attributesOfFileSystemForPath:NSHomeDirectory() error:nil] objectForKey:NSFileSystemFreeSize] unsignedLongLongValue] / (1024.0 * 1024.0));
}
- (void)captureOutput:(AVCaptureOutput *)output didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer fromConnection:(AVCaptureConnection *)connection {
diff --git a/clearcam/player.html b/clearcam/player.html
index 15413f4..0cb02a6 100644
--- a/clearcam/player.html
+++ b/clearcam/player.html
@@ -690,11 +690,11 @@
let i = 0;
let next_i = 1;
while(next_i < newSegments.length) {
- if(newSegments[i].timeStamp == 0.0){
+ if(newSegments[i].url.length == 0){
i=next_i;
next_i+=1;
}
- while(newSegments[next_i].timeStamp == 0.0 && next_i < newSegments.length){
+ while(newSegments[next_i].url.length == 0 && next_i < newSegments.length){
next_i += 1;
}
if(next_i >= newSegments.length){
@@ -710,7 +710,7 @@
cumulativeStart: currentCumulativeStart,
lostFrames: lostFrames > 0 ? lostFrames : 0,
});
- if(lostFrames > 60){ //todo why 60
+ if(lostFrames > 1){ //todo why 60
gaps.push([currentCumulativeStart + segment.duration,lostFrames]);
}
i=next_i;