Skip to content

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

mostly broken downloads page

rorycleare2b6f6cf422a
diff --git a/clearcam/SceneState.m b/clearcam/SceneState.m
index 3d404e0..1de3225 100644
--- a/clearcam/SceneState.m
+++ b/clearcam/SceneState.m
@@ -21,36 +21,47 @@
- (void)processOutput:(NSArray *)array {
NSMutableDictionary *frame = [[NSMutableDictionary alloc] init];
- for(int i = 0; i < array.count; i++){
+
+ // Count occurrences in the current frame
+ for (int i = 0; i < array.count; i++) {
frame[array[i][4]] = frame[array[i][4]] ? @([frame[array[i][4]] intValue] + 1) : @1;
}
- [self.lastN addObject:frame];
- for(int i = 0; i < self.events.count; i++){
+ [self.lastN addObject:frame]; // Store this frame's data
+
+ // Process events
+ for (int i = 0; i < self.events.count; i++) {
NSNumber *totalValue = self.lastN_total[self.events[i]] ?: @0;
NSNumber *last_totalValue = [totalValue copy];
NSNumber *frameValue = frame[self.events[i]] ?: @0;
totalValue = @(totalValue.intValue + frameValue.intValue);
- if(self.lastN.count > 10){
+ if (self.lastN.count > 10) {
frameValue = self.lastN[0][self.events[i]] ?: @0;
totalValue = @(totalValue.intValue - frameValue.intValue);
}
+
int current_state = (int)roundf((totalValue ? [totalValue floatValue] : 0.0) / 10.0);
int last_state = (int)roundf((last_totalValue ? [last_totalValue floatValue] : 0.0) / 10.0);
self.lastN_total[self.events[i]] = totalValue;
+
if (current_state != last_state) {
+ // Get current timestamp
+ NSDate *date = [NSDate date]; // NOW inside the loop (fix)
+ NSTimeInterval unixTimestamp = [date timeIntervalSince1970]; // Float UNIX timestamp
+
+ // Format human-readable timestamp for logging
+ NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+ [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
+ NSString *formattedTimestamp = [dateFormatter stringFromDate:date];
+
+ // Logging
NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
NSString *documentsDirectory = [paths firstObject];
NSFileManager *fileManager = [NSFileManager defaultManager];
-
- NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
- NSDate *date = [NSDate date];
- [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
- NSString *timestamp = [dateFormatter stringFromDate:date];
-
- NSString *contentToWrite = [NSString stringWithFormat:@"%@ class: %@ x%@\n", timestamp, self.events[i], @(current_state)];
+ NSString *contentToWrite = [NSString stringWithFormat:@"%@ class: %@ x%@\n",
+ formattedTimestamp, self.events[i], @(current_state)];
// Handle alerts.txt if needed
if (current_state == [self.alerts[self.events[i]] intValue]) {
@@ -69,7 +80,7 @@
NSManagedObject *newEvent = [NSEntityDescription insertNewObjectForEntityForName:@"EventEntity"
inManagedObjectContext:self.backgroundContext];
- [newEvent setValue:@([date timeIntervalSince1970]) forKey:@"timeStamp"]; // Float value of timestamp
+ [newEvent setValue:@(unixTimestamp) forKey:@"timeStamp"]; // Correct per-event timestamp
[newEvent setValue:self.events[i] forKey:@"classType"]; // Class type
[newEvent setValue:@(current_state) forKey:@"quantity"]; // Quantity (current state)
@@ -80,9 +91,12 @@
}];
}
}
- if(self.lastN.count > 10){
+
+ // Keep lastN size within 10
+ if (self.lastN.count > 10) {
[self.lastN removeObjectAtIndex:0];
}
}
+
@end
diff --git a/clearcam/SettingsManager.m b/clearcam/SettingsManager.m
index 0cc0078..cdfa7e2 100644
--- a/clearcam/SettingsManager.m
+++ b/clearcam/SettingsManager.m
@@ -61,8 +61,8 @@
- (NSArray<NSNumber *> *)generateDefaultEvents {
NSMutableArray<NSNumber *> *defaultEvents = [NSMutableArray array];
- //[defaultEvents addObject:@0]; // 1 person for now
- //[defaultEvents addObject:@2];
+ [defaultEvents addObject:@0]; // 1 person for now
+ [defaultEvents addObject:@2];
[defaultEvents addObject:@63]; // laptop for now
return [defaultEvents copy];
}
diff --git a/clearcam/downloads.html b/clearcam/downloads.html
index ce01362..26e400f 100644
--- a/clearcam/downloads.html
+++ b/clearcam/downloads.html
@@ -1 +1,75 @@
-hello
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>Event List</title>
+ <script>
+ async function fetchEvents() {
+ try {
+ const response = await fetch('/get-events');
+ if (!response.ok) {
+ throw new Error('Failed to fetch events');
+ }
+ const events = await response.json();
+ renderEvents(events);
+ } catch (error) {
+ console.error('Error fetching events:', error);
+ document.getElementById('eventsTableBody').innerHTML = '<tr><td colspan="4">Failed to load events.</td></tr>';
+ }
+ }
+
+ function renderEvents(events) {
+ const tableBody = document.getElementById('eventsTableBody');
+ tableBody.innerHTML = ''; // Clear existing data
+
+ events.forEach(event => {
+ const unixTimestamp = new Date(event.timeStamp).getTime() / 1000; // Convert to Unix timestamp
+
+ const row = document.createElement('tr');
+ row.innerHTML = `
+ <td>${event.classType}</td>
+ <td>${event.quantity}</td>
+ <td>${event.timeStamp}</td>
+ <td><button onclick="deleteEvent(${unixTimestamp})">Delete</button></td>
+ `;
+ tableBody.appendChild(row);
+ });
+ }
+
+ async function deleteEvent(timeStamp) {
+ try {
+ const response = await fetch(`/delete-event?timeStamp=${timeStamp}`, { method: 'GET' });
+
+ if (!response.ok) {
+ throw new Error('Failed to delete event');
+ }
+
+ // Refresh event list after delete
+ fetchEvents();
+ } catch (error) {
+ console.error('Error deleting event:', error);
+ }
+ }
+
+ // Load events when the page loads
+ window.onload = fetchEvents;
+ </script>
+</head>
+<body>
+ <h1>Event List</h1>
+ <table border="1">
+ <thead>
+ <tr>
+ <th>Class Type</th>
+ <th>Quantity</th>
+ <th>Time Stamp</th>
+ <th>Action</th>
+ </tr>
+ </thead>
+ <tbody id="eventsTableBody">
+ <tr><td colspan="4">Loading events...</td></tr>
+ </tbody>
+ </table>
+</body>
+</html>