Deactivated alpha channel inspection for NCC

Fixed float comparison in urlwatcher.sh
Fixed sending of multiline text in JFUtils

Author: iComputerfreak

NotifierBot/Sources/Notifier/JFUtils.swift

@@ -50,7 +50,10 @@ struct JFUtils {
     static private func sendImageOrFile(path: String, chatID: Int64, isFile: Bool, text: String? = nil) {
         var command = "\(kTelegramScript) -t \(token!) -c \(chatID) -\(isFile ? "f" : "i") \(path)"
         if let text = text {
-            command += " \(text)"
+            // Encase the lines in parantheses
+            let lines = text.components(separatedBy: .newlines).map({ "\"\($0)\"" })
+            // Join the lines using line breaks
+            command += " \(lines.joined(separator: "$'\n'"))"
         }
         shell(command)
     }

urlwatcher/urlwatcher.sh

@@ -106,9 +106,10 @@ function screenshotsMatch {
     local IMAGE_LATEST="$2"
 
     # Calculate the normalized cross correllation between both images
-    NCC=$(compare -quiet -metric NCC "$IMAGE_OLD" "$IMAGE_LATEST" "$DIFF_FILE" 2>&1)
+    NCC=$(compare -quiet -alpha deactivate -metric NCC "$IMAGE_OLD" "$IMAGE_LATEST" "$DIFF_FILE" 2>&1)
 
-    if [ "$NCC" -lt "$NCC_THRESHOLD" ]; then
+    # Compare floats
+    if [ $(echo "${NCC}<${NCC_THRESHOLD}" | bc -l) -eq 1 ]; then
         # The screenshots are not identical
         echo "Possible change detected. Confirming..."
 
@@ -131,25 +132,25 @@ function screenshotsMatch {
 
         # Compare the two cropped screenshots again
         # Calculate the normalized cross correllation between both images
-        NCC=$(compare -quiet -metric NCC "$IMAGE_OLD" "$IMAGE_LATEST" "$DIFF_FILE" 2>&1)
+        NCC=$(compare -quiet -alpha deactivate -metric NCC "$IMAGE_OLD" "$IMAGE_LATEST" "$DIFF_FILE" 2>&1)
 
-        if [ "$NCC" -lt "$NCC_THRESHOLD" ]; then
+        if [ $(echo "${NCC}<${NCC_THRESHOLD}" | bc -l) -eq 1 ]; then
             # The screenshots do not match. The website has changed
 
             # Write detailed NCC information to a file (and don't overwrite the diff file)
-            compare -verbose -metric NCC "$IMAGE_OLD" "$IMAGE_LATEST" /dev/null &> "$NCC_FILE"
+            compare -verbose -alpha deactivate -metric NCC "$IMAGE_OLD" "$IMAGE_LATEST" /dev/null &> "$NCC_FILE"
 
             # Return false, as the screenshots do not match
-            # In bash: 1 == false
+            # In bash: return value 1 == error == false
             return 1
         fi
     fi
 
     # Write detailed NCC information to a file (and don't overwrite the diff file)
-    compare -verbose -metric NCC "$IMAGE_OLD" "$IMAGE_LATEST" /dev/null &> "$NCC_FILE"
+    compare -verbose -alpha deactivate -metric NCC "$IMAGE_OLD" "$IMAGE_LATEST" /dev/null &> "$NCC_FILE"
 
     # If statement above didn't exit, that means we have no mismatching hashes and therefore the screenshots match (return true)
-    # In bash: 0 == true
+    # In bash: return value 0 == true
     return 0
 }