Fixed wrongly interpreted return value of compare command

Fixed working directory for debugging

Author: iComputerfreak

urlwatcher/.swiftpm/xcode/xcshareddata/xcschemes/urlwatcher.xcscheme

@@ -51,6 +51,13 @@
             ReferencedContainer = "container:">
          </BuildableReference>
       </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "PATH"
+            value = "/Users/jonasfrey/tools:/usr/local/opt/gnu-getopt/bin:/Library/Frameworks/Python.framework/Versions/3.9/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/TeX/texbin:/opt/X11/bin:/Library/Apple/usr/bin:/opt/local/bin:/Users/jonasfrey/scripts:/Users/jonasfrey/flutter/bin"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

urlwatcher/Package.swift

@@ -17,6 +17,6 @@ let package = Package(
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .target(
             name: "urlwatcher",
-            dependencies: []),
+            dependencies: [], swiftSettings: [.define("DEBUG")]),
     ]
 )

urlwatcher/Sources/urlwatcher/ConfigParser.swift

@@ -27,7 +27,8 @@ class ConfigParser {
         let config = (try? String(contentsOfFile: urlListFile)) ?? ""
         var entries: [URLEntry] = []
         for line in config.components(separatedBy: .newlines) {
-            if line.isEmpty {
+            if line.trimmingCharacters(in: .whitespaces).isEmpty
+                || line.trimmingCharacters(in: .whitespaces).starts(with: "#") {
                 continue
             }
             let components = line.components(separatedBy: ",")

urlwatcher/Sources/urlwatcher/Functions.swift

@@ -84,6 +84,7 @@ func sendTelegramMessage(_ message: String, to chatID: Int, image: String? = nil
 }
 
 func handleScreenshotError(entry: URLEntry) throws {
+    print("Handling error.")
     let errorFile = "\(directory(for: entry))/error"
     // If the errorReportMinutes are not set, we immediately notify the user
     guard errorReportMinutes > 0 else {
@@ -122,6 +123,9 @@ func notifyNew(entry: URLEntry, file: String) throws {
 
 func rollBack(_ oldImage: String, to latestImage: String) throws {
     if fileManager.fileExists(atPath: oldImage) {
+        if fileManager.fileExists(atPath: latestImage) {
+            try fileManager.removeItem(atPath: latestImage)
+        }
         try fileManager.moveItem(atPath: oldImage, toPath: latestImage)
     }
 }
@@ -138,7 +142,9 @@ func screenshotNCC(_ oldImage: String, _ latestImage: String, diffFile: String)
         diffFile
     ], standardOutput: nccPipe, standardError: nccPipe)
 
-    guard result == .success else {
+    // The compare command returns 0, if the images are similar, 1 if they are dissimilar and something else on an error
+    if case .failure(let code) = result,
+       code != 1 && code != 0 {
         return nil
     }
 

urlwatcher/Sources/urlwatcher/main.swift

@@ -6,8 +6,12 @@ let silentMode: Bool = false
 
 let fileManager = FileManager.default
 /// The directory, the executable is in
+#if DEBUG
+let currentPath = fileManager.currentDirectoryPath
+#else
 let currentPath = Bundle.main.bundlePath
-/// The telegram bot token it read from a file
+#endif
+/// The telegram bot token is read from a file
 let telegramBotToken = try String(contentsOfFile: "\(currentPath)/../BOT_TOKEN", encoding: .utf8)
 /// The script used to send the telegram messages
 let telegramScript = "\(currentPath)/../tools/telegram.sh"
@@ -126,9 +130,12 @@ for entry in config {
 
     let tempDiff = "\(entryPath)/diff.temp"
     // If the website changed
-    if let ncc = try screenshotNCC(oldImage, latestImage, diffFile: tempDiff),
-       ncc < nccThreshold {
-        print("Possible change detected. Confirming...")
+    if let ncc = try screenshotNCC(oldImage, latestImage, diffFile: tempDiff) {
+        guard ncc < nccThreshold else {
+            print("No change detected. NCC: \(ncc)")
+            break // Break the if
+        }
+        print("Possible change detected (NCC: \(ncc)). Confirming...")
 
         // Take another screenshot to confirm its not just a one-time loading error or inconsistency
         // Delete the changed screenshot, otherwise we cannot confirm that taking the screenshot was a success
@@ -139,9 +146,13 @@ for entry in config {
             continue
         }
 
-        if let newNCC = try screenshotNCC(oldImage, latestImage, diffFile: tempDiff),
-           newNCC < nccThreshold {
+        if let newNCC = try screenshotNCC(oldImage, latestImage, diffFile: tempDiff) {
+            guard newNCC < nccThreshold else {
+                print("Change not confirmed. NCC: \(newNCC)")
+                break // Break the inner if
+            }
             // If the second screenshot also shows changes, we notify the user
+            print("Change confirmed. NCC: \(newNCC). Notifying user.")
 
             // Save the temp file persistently
             let diffFile = "\(entryPath)/\(diffFilename)"
@@ -167,6 +178,10 @@ for entry in config {
             // Notify the user
             try sendTelegramMessage("\(entry.name) has changed. NCC: \(ncc)\(ncc != newNCC ? ", \(newNCC)" : "")", to: Int(entry.chatID), image: latestImage)
         }
+    } else {
+        print("Error checking screenshot NCC.")
+        try handleScreenshotError(entry: entry)
+        try rollBack(oldImage, to: latestImage)
     }
 
     // Delete the error file if it exists, since we just successfully captured a screenshot