Skip to content

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

clean

roryclear9503f2b3b5a1
diff --git a/clearcam/FileServer.m b/clearcam/FileServer.m
index 7fe5253..424f417 100644
--- a/clearcam/FileServer.m
+++ b/clearcam/FileServer.m
@@ -339,7 +339,7 @@
}
if ([filePath hasPrefix:@"get-classes"]) {
- NSString *currentClasses = [[NSUserDefaults standardUserDefaults] stringForKey:@"yolo_indexes_key"] ?: @"all"; // Default to "all" if not set
+ NSString *currentClasses = [[NSUserDefaults standardUserDefaults] stringForKey:@"yolo_preset_idx"] ?: @"all"; // Default to "all" if not set
[self sendJson200:@[currentClasses] toClient:clientSocket]; // Send as an array
return;
}
diff --git a/clearcam/SettingsManager.h b/clearcam/SettingsManager.h
index 0543983..2b9f2a0 100644
--- a/clearcam/SettingsManager.h
+++ b/clearcam/SettingsManager.h
@@ -10,7 +10,6 @@
@property (nonatomic, strong) NSString *height;
@property (nonatomic, strong) NSString *text_size;
@property (nonatomic, strong) NSString *preset; //todo, resolution
-@property (nonatomic, strong) NSString *yolo_preset;
+ (instancetype)sharedManager;
diff --git a/clearcam/SettingsManager.m b/clearcam/SettingsManager.m
index 5814572..385cf14 100644
--- a/clearcam/SettingsManager.m
+++ b/clearcam/SettingsManager.m
@@ -14,8 +14,6 @@
- (instancetype)init {
self = [super init];
if (self) {
- self.yolo_preset = @"all";
- [[NSUserDefaults standardUserDefaults] setObject:@"all" forKey:@"yolo_indexes_key"];
NSDictionary *savedPresets = [[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_presets"];
if (!savedPresets) {
[[NSUserDefaults standardUserDefaults] setObject:[[NSMutableDictionary alloc] initWithDictionary:@{
@@ -23,6 +21,7 @@
@"People+Vehicles": @[@0, @1, @2, @3, @5, @7]
}] forKey:@"yolo_presets"];
}
+ if(![[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_preset_idx"]) [[NSUserDefaults standardUserDefaults] setObject:@"People+Vehicles" forKey:@"yolo_preset_idx"];
[[NSUserDefaults standardUserDefaults] synchronize];
[self loadResolutionSettings];
[self loadEvents];
@@ -32,8 +31,7 @@
}
- (void)updateYoloIndexesKey:(NSString *)key {
- [[NSUserDefaults standardUserDefaults] setObject:key forKey:@"yolo_indexes_key"];
- self.yolo_preset = key;
+ [[NSUserDefaults standardUserDefaults] setObject:key forKey:@"yolo_preset_idx"];
[[NSUserDefaults standardUserDefaults] synchronize];
}
diff --git a/clearcam/SettingsViewController.m b/clearcam/SettingsViewController.m
index 075f44f..2715187 100644
--- a/clearcam/SettingsViewController.m
+++ b/clearcam/SettingsViewController.m
@@ -1,6 +1,6 @@
#import "SettingsViewController.h"
#import "SettingsManager.h"
-#import "NumberSelectionViewController.h" // Import the new class
+#import "NumberSelectionViewController.h"
@interface SettingsViewController () <UITableViewDelegate, UITableViewDataSource>
@@ -22,7 +22,7 @@
// Initialize selectedResolution and selectedPresetKey based on SettingsManager
SettingsManager *settingsManager = [SettingsManager sharedManager];
self.selectedResolution = [NSString stringWithFormat:@"%@p", settingsManager.height];
- self.selectedPresetKey = [[NSUserDefaults standardUserDefaults] stringForKey:@"yolo_indexes_key"] ?: @"all"; // Default to "all" if no key is saved
+ self.selectedPresetKey = [[NSUserDefaults standardUserDefaults] stringForKey:@"yolo_preset_idx"] ?: @"all"; // Default to "all" if no key is saved
// Create table view
self.tableView = [[UITableView alloc] initWithFrame:self.view.bounds style:UITableViewStyleInsetGrouped];
@@ -242,9 +242,6 @@
numberSelectionVC.presetKey = presetKey;
numberSelectionVC.selectedIndexes = [selectedIndexes mutableCopy];
numberSelectionVC.completionHandler = ^(NSArray<NSNumber *> *selectedIndexes) {
- SettingsManager *settingsManager = [SettingsManager sharedManager];
-
- //todo deepseek slop
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
NSMutableDictionary *yoloPresets = [[defaults objectForKey:@"yolo_presets"] mutableCopy];
@@ -252,16 +249,20 @@
yoloPresets = [NSMutableDictionary dictionary];
}
- // Step 2: Update the dictionary with the new key-value pair
+ // Update the dictionary with the new key-value pair
yoloPresets[presetKey] = selectedIndexes;
- // Step 3: Save the updated dictionary back to NSUserDefaults
+ // Save the updated dictionary back to NSUserDefaults
[defaults setObject:yoloPresets forKey:@"yolo_presets"];
- // Step 4: Synchronize to save changes immediately (optional but recommended)
+ // Automatically select the new preset
+ self.selectedPresetKey = presetKey;
+ [defaults setObject:presetKey forKey:@"yolo_preset_idx"];
+
+ // Synchronize to save changes immediately
[defaults synchronize];
-
+ // Reload the table view to update the UI
[self.tableView reloadData];
};
[self.navigationController pushViewController:numberSelectionVC animated:YES];
@@ -271,14 +272,12 @@
UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Delete Preset"
message:@"Select a preset to delete"
preferredStyle:UIAlertControllerStyleActionSheet];
- //todo deepseek slop
NSArray *presetKeys = [[[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_presets"] allKeys];
for (NSString *presetKey in presetKeys) {
if (![presetKey isEqualToString:@"all"]) { // Prevent deletion of the "all" preset
UIAlertAction *action = [UIAlertAction actionWithTitle:presetKey
style:UIAlertActionStyleDestructive
handler:^(UIAlertAction * _Nonnull action) {
-
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
NSMutableDictionary *yoloPresets = [[defaults objectForKey:@"yolo_presets"] mutableCopy];
@@ -286,13 +285,20 @@
[yoloPresets removeObjectForKey:presetKey];
}
- // Step 4: Save the updated dictionary back to NSUserDefaults
+ // Save the updated dictionary back to NSUserDefaults
[defaults setObject:yoloPresets forKey:@"yolo_presets"];
- // Step 5: Synchronize to save changes immediately (optional but recommended)
+ // Check if the deleted preset was the currently selected one
+ if ([self.selectedPresetKey isEqualToString:presetKey]) {
+ // Switch to the "all" preset
+ self.selectedPresetKey = @"all";
+ [defaults setObject:@"all" forKey:@"yolo_preset_idx"];
+ }
+
+ // Synchronize to save changes immediately
[defaults synchronize];
- // Step 6: Reload the table view to reflect the changes
+ // Reload the table view to reflect the changes
[self.tableView reloadData];
}];
[alert addAction:action];
diff --git a/clearcam/Yolo.m b/clearcam/Yolo.m
index ab806c4..91c5f48 100644
--- a/clearcam/Yolo.m
+++ b/clearcam/Yolo.m
@@ -164,7 +164,7 @@ UInt8 *rgbData;
}
- (NSArray *)processOutput:(const float *)output {
- NSArray<NSNumber *> *yoloIndexes = [[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_presets"][[SettingsManager sharedManager].yolo_preset];
+ NSArray<NSNumber *> *yoloIndexes = [[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_presets"][[[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_preset_idx"]];
NSMutableArray *boxes = [NSMutableArray array];
int numPredictions = pow(self.yolo_res / 32, 2) * 21;