Skip to content

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

look at segments.txt if on a different hour

rorycleare1e2f0793685
diff --git a/clearcam/FileServer.m b/clearcam/FileServer.m
index 55858bb..7d3e76e 100644
--- a/clearcam/FileServer.m
+++ b/clearcam/FileServer.m
@@ -88,7 +88,7 @@
if ([filePath hasPrefix:@"get-segments"]) {
NSString *startParam = nil;
NSString *dateParam = nil;
-
+
NSRange queryRange = [filePath rangeOfString:@"?"];
if (queryRange.location != NSNotFound) {
NSString *queryString = [filePath substringFromIndex:queryRange.location + 1];
@@ -104,18 +104,38 @@
}
}
}
-
+
NSInteger start = startParam ? [startParam integerValue] : 0;
NSLog(@"START PARAM = %ld", (long)start);
NSLog(@"DATE PARAM = %@", dateParam);
if (!dateParam || !self.segmentsDict[dateParam]) {
- NSString *httpHeader = @"HTTP/1.1 400 Bad Request\r\nContent-Type: application/json\r\n\r\n";
- NSString *errorMessage = @"{\"error\": \"Missing or invalid date parameter\"}";
- send(clientSocket, [httpHeader UTF8String], httpHeader.length, 0);
- send(clientSocket, [errorMessage UTF8String], errorMessage.length, 0);
- return;
+ // Check for segments.txt file in the folder for the given date and time
+ NSString *documentsDirectory = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject];
+ NSString *segmentsDirectory = [documentsDirectory stringByAppendingPathComponent:dateParam];
+ NSString *segmentsFilePath = [segmentsDirectory stringByAppendingPathComponent:@"segments.txt"];
+
+ if ([[NSFileManager defaultManager] fileExistsAtPath:segmentsFilePath]) {
+ NSData *data = [NSData dataWithContentsOfFile:segmentsFilePath];
+ NSArray *fileSegments = [NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:nil];
+
+ if (fileSegments) {
+ self.segmentsDict[dateParam] = [fileSegments mutableCopy];
+ } else {
+ NSString *httpHeader = @"HTTP/1.1 400 Bad Request\r\nContent-Type: application/json\r\n\r\n";
+ NSString *errorMessage = @"{\"error\": \"Failed to read segments from file\"}";
+ send(clientSocket, [httpHeader UTF8String], httpHeader.length, 0);
+ send(clientSocket, [errorMessage UTF8String], errorMessage.length, 0);
+ return;
+ }
+ } else {
+ NSString *httpHeader = @"HTTP/1.1 400 Bad Request\r\nContent-Type: application/json\r\n\r\n";
+ NSString *errorMessage = @"{\"error\": \"Missing or invalid date parameter\"}";
+ send(clientSocket, [httpHeader UTF8String], httpHeader.length, 0);
+ send(clientSocket, [errorMessage UTF8String], errorMessage.length, 0);
+ return;
+ }
}
NSArray *segmentsForDate = self.segmentsDict[dateParam];
@@ -136,6 +156,7 @@
}
+
NSString *fullPath = [basePath stringByAppendingPathComponent:filePath];
BOOL isDirectory = NO;
if (![[NSFileManager defaultManager] fileExistsAtPath:fullPath isDirectory:&isDirectory]) {