Log cap count when adding image

Sources/App/CapServer+Routes.swift

@@ -120,6 +120,19 @@ extension CapServer {
             }
             return try encoder.encode(cap)
         }
+
+        // Delete a cap completely, with all images
+        app.postCatching("delete", ":cap") { request in
+            guard let cap = request.parameters.get("cap", as: Int.self) else {
+                log("/delete/:cap/: Invalid 'cap' parameter for image deletion")
+                throw Abort(.badRequest)
+            }
+            try self.ensureOperability()
+            try authenticator.authorize(request)
+            guard self.delete(cap: cap) else {
+                throw Abort(.gone)
+            }
+        }
     }
 }
 

Sources/App/CapServer.swift

@@ -358,9 +358,10 @@ final class CapServer {
             log("Failed to write image \(id) for cap \(cap): \(error)")
             throw CapError.invalidFile
         }
-        caps[cap]!.count = try count(of: cap)
+        let count = try count(of: cap)
+        caps[cap]!.count = count
         addChangedImageToLog(cap: cap, image: id)
-        log("Added image \(id) for cap \(cap)")
+        log("Added image \(id) for cap \(cap) (\(count) total)")
     }
     
     private func writeChangedImagesToDisk() throws {
@@ -505,6 +506,39 @@ final class CapServer {
         return caps[capId]!
     }
 
+    func delete(cap capId: Int) -> Bool {
+        guard caps[capId] != nil else {
+            log("Attempting to delete unknown cap \(capId)")
+            return false
+        }
+        // 1. Remove all images
+        do {
+            let imageFolderUrl = folder(of: capId)
+            if exists(imageFolderUrl) {
+                try fm.removeItem(at: imageFolderUrl)
+            }
+        } catch {
+            log("Failed to delete image folder of cap \(capId): \(error)")
+            return false
+        }
+        // 2. Remove thumbnail
+        do {
+            let url = thumbnail(of: capId)
+            if exists(url) {
+                try fm.removeItem(at: url)
+            }
+        } catch {
+            log("Failed to delete thumbnail of cap \(capId): \(error)")
+            return false
+        }
+
+        // 3. Remove cap
+        caps[capId] = nil
+        saveCapCountHTML()
+        updateGridCapCount()
+        return true
+    }
+    
     // MARK: Classifier
     
     func updateTrainedClasses(content: String) {