Shotlog - Screenshot Log

@@ -43,7 +43,36 @@ struct Channel {     tx: broadcast::Sender<Entry>, } -const MAX_ENTRIES: usize = 200;+/// In-memory AND on-disk cap of shots per channel (SHOTLOG_MAX_SHOTS, default 200).+/// When a channel exceeds it, the oldest shot is dropped AND its files deleted -+/// without this the disk grew unbounded (3.4 GB before retention existed).+fn max_shots() -> usize {+    std::env::var("SHOTLOG_MAX_SHOTS").ok().and_then(|v| v.parse().ok()).unwrap_or(200)+}++/// Days of inactivity before a whole channel is pruned (SHOTLOG_RETENTION_DAYS,+/// default 30; 0 disables the sweep).+fn retention_days() -> u64 {+    std::env::var("SHOTLOG_RETENTION_DAYS").ok().and_then(|v| v.parse().ok()).unwrap_or(30)+}++/// Delete a shot's files: the PNG, its JSON sidecar, and any child-window PNGs.+fn delete_entry_files(entry: &Entry) {+    let p = std::path::Path::new(&entry.path);+    let _ = fs::remove_file(p);+    let _ = fs::remove_file(p.with_extension("json"));+    if let Some(arr) = entry.popups.as_ref().and_then(|v| v.as_array()) {+        if let Some(dir) = p.parent() {+            for c in arr {+                if let Some(f) = c.get("filename").and_then(|x| x.as_str()) {+                    let _ = fs::remove_file(dir.join(f));+                }+            }+        }+    }+}++const MAX_ENTRIES: usize = 200; // legacy const; runtime cap comes from max_shots()  /// One connected viewer: which surface it's on, and whether that surface is /// actually on-screen (Page Visibility) vs a background tab / minimized window.@@ -172,9 +201,12 @@ impl Store {                 next_id += 1;             } -            // Keep only the last MAX_ENTRIES-            if entries.len() > MAX_ENTRIES {-                entries = entries.split_off(entries.len() - MAX_ENTRIES);+            // Keep only the newest max_shots() - and DELETE the older shots'+            // files, which previously lingered on disk forever.+            let cap = max_shots();+            if entries.len() > cap {+                let trimmed: Vec<Entry> = entries.drain(..entries.len() - cap).collect();+                for e in &trimmed { delete_entry_files(e); }             }              let mut channels = self.channels.write().await;@@ -263,8 +295,9 @@ impl Store {          ch.next_id += 1;         ch.entries.push(entry.clone());-        if ch.entries.len() > MAX_ENTRIES {-            ch.entries.remove(0);+        while ch.entries.len() > max_shots() {+            let old = ch.entries.remove(0);+            delete_entry_files(&old);         }          // Broadcast to SSE listeners (ignore errors — no receivers is fine)@@ -422,4 +455,38 @@ impl Store {     pub fn base_dir(&self) -> &Path {         &self.base_dir     }++    /// Prune whole channels idle longer than SHOTLOG_RETENTION_DAYS (default 30):+    /// delete the channel directory and drop it from the in-memory store.+    /// Returns the pruned channel names. Runs at startup and every 6 hours.+    pub async fn retention_sweep(&self) -> Vec<String> {+        let days = retention_days();+        if days == 0 { return Vec::new(); }+        let cutoff = std::time::SystemTime::now() - std::time::Duration::from_secs(days * 86_400);+        let mut pruned = Vec::new();+        let Ok(read_dir) = fs::read_dir(&self.base_dir) else { return pruned };+        for d in read_dir.flatten() {+            let path = d.path();+            if !path.is_dir() { continue; }+            // newest mtime of any file inside (or the dir itself when empty)+            let newest = fs::read_dir(&path).ok()+                .map(|it| it.flatten()+                    .filter_map(|f| f.metadata().ok().and_then(|m| m.modified().ok()))+                    .max())+                .flatten()+                .or_else(|| fs::metadata(&path).ok().and_then(|m| m.modified().ok()));+            if let Some(t) = newest {+                if t < cutoff {+                    let name = d.file_name().to_string_lossy().to_string();+                    // Never prune a channel someone is actively viewing.+                    if !self.viewer_infos(&name).await.is_empty() { continue; }+                    if fs::remove_dir_all(&path).is_ok() {+                        self.channels.write().await.remove(&name);+                        pruned.push(name);+                    }+                }+            }+        }+        pruned+    } }