Fixed bug that would only cause the first URL to be checked

Removed debug working directory again since it does not work

Author: iComputerfreak

urlwatcher/Sources/urlwatcher/main.swift

@@ -6,11 +6,7 @@ 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
-#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
@@ -130,53 +126,53 @@ for entry in config {
 
     let tempDiff = "\(entryPath)/diff.temp"
     // If the website changed
-    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
-        try fileManager.removeItem(atPath: latestImage)
-        
-        // Re-do the whole screenshot procedure
-        guard try screenshot() else {
-            continue
-        }
-        
-        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.")
+    if let ncc = try screenshotNCC(oldImage, latestImage, diffFile: tempDiff), ncc < nccThreshold {
+        if ncc < nccThreshold {
+            print("Possible change detected (NCC: \(ncc)). Confirming...")
 
-            // Save the temp file persistently
-            let diffFile = "\(entryPath)/\(diffFilename)"
-            if fileManager.fileExists(atPath: diffFile) {
-                try fileManager.removeItem(atPath: diffFile)
-            }
-            try fileManager.moveItem(atPath: tempDiff, toPath: diffFile)
+            // 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
+            try fileManager.removeItem(atPath: latestImage)
 
-            // Generate detailed NCC information
-            let nccFile = "\(entryPath)/\(nccFilename)"
-            if fileManager.fileExists(atPath: nccFile) {
-                try fileManager.removeItem(atPath: nccFile)
+            // Re-do the whole screenshot procedure
+            guard try screenshot() else {
+                continue
             }
-            try bash("compare", arguments: [
-                "-verbose",
-                "-alpha", "deactivate",
-                "-metric", "NCC",
-                oldImage,
-                latestImage,
-                "/dev/null"
-            ], standardOutput: FileHandle(forWritingAtPath: nccFile))
 
-            // Notify the user
-            try sendTelegramMessage("\(entry.name) has changed. NCC: \(ncc)\(ncc != newNCC ? ", \(newNCC)" : "")", to: Int(entry.chatID), image: latestImage)
+            if let newNCC = try screenshotNCC(oldImage, latestImage, diffFile: tempDiff) {
+                if newNCC < nccThreshold {
+                    // 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)"
+                    if fileManager.fileExists(atPath: diffFile) {
+                        try fileManager.removeItem(atPath: diffFile)
+                    }
+                    try fileManager.moveItem(atPath: tempDiff, toPath: diffFile)
+                    
+                    // Generate detailed NCC information
+                    let nccFile = "\(entryPath)/\(nccFilename)"
+                    if fileManager.fileExists(atPath: nccFile) {
+                        try fileManager.removeItem(atPath: nccFile)
+                    }
+                    try bash("compare", arguments: [
+                        "-verbose",
+                        "-alpha", "deactivate",
+                        "-metric", "NCC",
+                        oldImage,
+                        latestImage,
+                        "/dev/null"
+                    ], standardOutput: FileHandle(forWritingAtPath: nccFile))
+                    
+                    // Notify the user
+                    try sendTelegramMessage("\(entry.name) has changed. NCC: \(ncc)\(ncc != newNCC ? ", \(newNCC)" : "")", to: Int(entry.chatID), image: latestImage)
+                } else {
+                    print("Change not confirmed. NCC: \(newNCC)")
+                }
+            }
+        } else {
+            print("No change detected. NCC: \(ncc)")
         }
     } else {
         print("Error checking screenshot NCC.")