Skip to content

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

clean

roryclear7ac4251184fe
diff --git a/clearcam/FileServer.m b/clearcam/FileServer.m
index 7dbe47e..d66c0ce 100644
--- a/clearcam/FileServer.m
+++ b/clearcam/FileServer.m
@@ -316,14 +316,13 @@
}
}
if (indexesParam) {
- if ([indexesParam isEqualToString:@"all"]) {
+ if ([[SettingsManager sharedManager].presets objectForKey:indexesParam]) {
+ self.currentClasses = indexesParam;
+ [[SettingsManager sharedManager] updateYoloIndexesKey:indexesParam];
+ } else {
self.currentClasses = @"all";
[[SettingsManager sharedManager] updateYoloIndexesKey:@"all"];
- } else if ([indexesParam isEqualToString:@"vehiclesPeople"]) {
- self.currentClasses = @"vehiclesPeople";
- [[SettingsManager sharedManager] updateYoloIndexesKey:@"vehiclesPeople"];
}
-
NSString *httpHeader = @"HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n";
send(clientSocket, [httpHeader UTF8String], httpHeader.length, 0);
return;
diff --git a/clearcam/SettingsManager.m b/clearcam/SettingsManager.m
index bb84b21..437210a 100644
--- a/clearcam/SettingsManager.m
+++ b/clearcam/SettingsManager.m
@@ -35,23 +35,18 @@
- (void)loadYoloIndexes {
NSString *savedKey = [[NSUserDefaults standardUserDefaults] stringForKey:@"yolo_indexes_key"];
- if(savedKey && [savedKey isEqualToString:@"vehiclesPeople"]){
- self.yolo_indexes = @[@0,@1,@2,@3,@5,@7];
- } else {
- self.yolo_indexes = self.presets[@"all"];
- }
+ NSArray<NSNumber *> *indexes = self.presets[savedKey] ?: self.presets[@"all"];
+ self.yolo_indexes = indexes;
}
- (void)updateYoloIndexesKey:(NSString *)key {
[[NSUserDefaults standardUserDefaults] setObject:key forKey:@"yolo_indexes_key"];
- if([key isEqualToString:@"vehiclesPeople"]){
- self.yolo_indexes = @[@0,@1,@2,@3,@5,@7];
- } else {
- self.yolo_indexes = self.presets[@"all"];
- }
+ NSArray<NSNumber *> *indexes = self.presets[key] ?: self.presets[@"all"];
+ self.yolo_indexes = indexes;
[[NSUserDefaults standardUserDefaults] synchronize];
}
+
- (void)loadEvents {
NSArray *savedEvents = [[NSUserDefaults standardUserDefaults] arrayForKey:@"events"];
if (savedEvents) {