Added error status and error notify status to /info command

urlwatcher now creates a .notified file after notifying the user of an error and will not send any further messages
Fixed urlwatcher deleting error instead of .error

Author: iComputerfreak

NotifierBot/Sources/Notifier/Commands/InfoCommand.swift

@@ -61,6 +61,21 @@ struct InfoCommand: Command {
             durationString = SharedUtils.muteDurationFormatter.string(from: restDuration) ?? ""
         }
         lines.append("- Muted: \(e.isMuted ? "Yes (\(durationString) hours remaining)" : "No")".escaped())
+        let entryPath = SharedUtils.directory(for: e)
+        
+        let errorFile = "\(entryPath)/.error"
+        let errored = FileManager.default.fileExists(atPath: errorFile)
+        // The empty string will propagate the error to the formatter below
+        let errorFileContents = try? String(contentsOfFile: errorFile) ?? ""
+        let errorDate = ISO8601DateFormatter().date(from: errorFileContents)
+        var durationString: String? = nil
+        if let errorDate = errorDate {
+            let errorDuration = Date().timeIntervalSince(errorDate)
+            durationString = SharedUtils.muteDurationFormatter.string(from: errorDuration)
+        }
+        lines.append("- Errored: \(errored ? "Yes (for \(durationString ?? "an unknown time"))" : "No")")
+        let notified = FileManager.default.fileExists(atPath: "\(entryPath)/.notified")
+        lines.append("  - Notified: \(notified ? "Yes" : "No")")
         return lines.joined(separator: "\n")
     }
 

Shared/Sources/Shared/SharedUtils.swift

@@ -76,4 +76,9 @@ public struct SharedUtils {
         return DummyFormatter(fullUnits: false)
     }
 
+    public static func directory(for entry: URLEntry) -> String {
+        // Use the name and chat id to create unique directories
+        return "\(kImagesDirectory)/\(entry.name).\(entry.chatID)"
+    }
+    
 }

urlwatcher/Sources/urlwatcher/Functions.swift

@@ -144,7 +144,8 @@ func sendTelegramMessage(_ message: String, to chatID: Int, image: String? = nil
 }
 
 func handleScreenshotError(entry: URLEntry) throws {
-    let errorFile = "\(directory(for: entry))/.error"
+    let entryPath = SharedUtils.directory(for: entry)
+    let errorFile = "\(entryPath)/.error"
     // If the errorReportMinutes are not set, we immediately notify the user
     guard kErrorReportDuration > 0 else {
         try notifyError(entry: entry)
@@ -163,8 +164,16 @@ func handleScreenshotError(entry: URLEntry) throws {
         return
     }
 
-    // If an error file already exists, read the creation date from the file's contents
+    // If an error file already exists
     print("Error file already exists")
+    
+    // Check if the user has already been notified
+    if fileManager.fileExists(atPath: "\(entryPath)/.notified") {
+        // User has already been notified
+        return
+    }
+    
+    // Read the creation date from the file's contents
     if fileManager.fileExists(atPath: errorFile) {
        let errorContents = try String(contentsOfFile: errorFile)
         print("Creation date: \(errorContents)")
@@ -173,7 +182,12 @@ func handleScreenshotError(entry: URLEntry) throws {
         }
         if creationDate.distance(to: Date()) >= kErrorReportDuration {
             // Notify the user that an error persisted for the last `errorReportTime` seconds
+            // and create the "notified" file to indicate that the user has already been notified about this error
             try notifyError(entry: entry)
+            let notifiedFile = "\(SharedUtils.directory(for: entry))/.notified"
+            if fileManager.fileExists(atPath: notifiedFile) {
+                try fileManager.removeItem(atPath: notifiedFile)
+            }
         }
     }
 }

urlwatcher/Sources/urlwatcher/Utils.swift

@@ -26,11 +26,6 @@ enum BashResult: Equatable {
     }
 }
 
-func directory(for entry: URLEntry) -> String {
-    // Use the name and chat id to create unique directories
-    return "\(kImagesDirectory)/\(entry.name).\(entry.chatID)"
-}
-
 @discardableResult
 func bash(_ command: String, arguments: [String] = [], noEnv: Bool = false, currentDirectory: String? = nil, standardOutput: Any? = nil, standardError: Any? = nil) throws -> BashResult {
     let proc = Process()

urlwatcher/Sources/urlwatcher/main.swift

@@ -64,7 +64,7 @@ do {
             try ConfigParser.saveConfig(config)
         }
 
-        let entryPath = directory(for: entry)
+        let entryPath = SharedUtils.directory(for: entry)
 
         // Create the image directory, if it does not exist yet
         if !fileManager.directoryExists(atPath: entryPath) {
@@ -226,10 +226,14 @@ do {
         }
 
         // Delete the error file if it exists, since we just successfully captured a screenshot
-        let errorFile = "\(entryPath)/error"
+        let errorFile = "\(entryPath)/.error"
         if fileManager.fileExists(atPath: errorFile) {
             try fileManager.removeItem(atPath: errorFile)
         }
+        let notifiedFile = "\(entryPath)/.notified"
+        if fileManager.fileExists(atPath: notifiedFile) {
+            try fileManager.removeItem(atPath: notifiedFile)
+        }
     }
 
 } catch let error {