From d596a9d790b9d720df9f7e0535da5fc7f766a3ed Mon Sep 17 00:00:00 2001
From: Christoph Hagen <github@christophhagen.de>
Date: Sat, 18 Feb 2023 23:47:52 +0100
Subject: [PATCH] Improve logging

---
 Sources/App/CapServer.swift | 9 +++++++++
 Training/train.swift        | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Sources/App/CapServer.swift b/Sources/App/CapServer.swift
index 23e6307..14c261f 100644
--- a/Sources/App/CapServer.swift
+++ b/Sources/App/CapServer.swift
@@ -235,12 +235,20 @@ final class CapServer {
             log("Failed to get image urls for cap \(cap.id)")
             return
         }
+        
+        if images.count != cap.count {
+            log("\(images.count) instead of \(cap.count) images for cap \(cap.id)")
+        }
+        
+        // Get list of existing images
         var sorted: [(id: Int, url: URL)] = images.compactMap {
             guard let id = Int($0.deletingPathExtension().lastPathComponent.components(separatedBy: "-").last!) else {
                 return nil
             }
             return (id, $0)
         }.sorted { $0.id < $1.id }
+        
+        // Check that all images are available
         for version in 0..<images.count {
             guard version != sorted[version].id else {
                 continue
@@ -249,6 +257,7 @@ final class CapServer {
             let newUrl = imageUrl(of: cap.id, version: version)
             do {
                 try fm.moveItem(at: lastImage.url, to: newUrl)
+                log("Moved image \(lastImage.id) to \(version) for cap \(cap.id)")
             } catch {
                 log("Failed to move file \(lastImage.url.path) to \(newUrl.path): \(error)")
                 return
diff --git a/Training/train.swift b/Training/train.swift
index 03cf912..8398ea0 100644
--- a/Training/train.swift
+++ b/Training/train.swift
@@ -458,12 +458,12 @@ final class ClassifierCreator {
         do {
             (data, response) = try await URLSession.shared.data(for: request)
         } catch {
-            print("[ERROR] Request failed: \(error)")
+            print("[ERROR] Request to \(request.url!.absoluteString) failed: \(error)")
             return nil
         }
         let code = (response as! HTTPURLResponse).statusCode
         guard code == 200 else {
-            print("[ERROR] Invalid response \(code)")
+            print("[ERROR] Request to \(request.url!.absoluteString): Invalid response \(code)")
             return nil
         }
         return data