Fixed DummyFormatter

Reduced website timeout to 30 seconds
Fixed error message on missing bot token

Author: iComputerfreak

Shared/Sources/Shared/SharedUtils.swift

@@ -24,25 +24,25 @@ public struct SharedUtils {
             var rest = ti
             let years = rest / (365 * 24 * 60 * 60)
             rest = rest.truncatingRemainder(dividingBy: (365 * 24 * 60 * 60))
-            if years > 0 {
+            if years >= 1 {
                 components.append(durationString(Int(years), .year))
             }
 
             let days = rest / (24 * 60 * 60)
             rest = rest.truncatingRemainder(dividingBy: (24 * 60 * 60))
-            if days > 0 {
+            if days >= 1 {
                 components.append(durationString(Int(days), .day))
             }
 
             let hours = rest / (60 * 60)
             rest = rest.truncatingRemainder(dividingBy: (60 * 60))
-            if hours > 0 {
+            if hours >= 1 {
                 components.append(durationString(Int(hours), .hour))
             }
 
             let minutes = rest / 60
             rest = rest.truncatingRemainder(dividingBy: 60)
-            if minutes > 0 {
+            if minutes >= 1 {
                 components.append(durationString(Int(minutes), .minute))
             }
 

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

@@ -57,6 +57,11 @@
             value = "true"
             isEnabled = "YES">
          </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "PATH"
+            value = "/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin"
+            isEnabled = "YES">
+         </EnvironmentVariable>
       </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction

urlwatcher/Sources/urlwatcher/Functions.swift

@@ -16,6 +16,7 @@ func takeScreenshot(ofURL url: String, outputPath: String, delay: Int? = nil, ca
         "--output=\"\(outputPath)\"",
         "--overwrite",
         "--full-page",
+        "--timeout=30", // decrease timeout to prevent waiting for elements that are not there anymore
         "--user-agent=\"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.50 Safari/537.36\""
     ]
     if let delay = delay, delay > 0 {
@@ -162,11 +163,14 @@ func handleScreenshotError(entry: URLEntry) throws {
     }
 
     // If an error file already exists, get the attributes and check the creation date
+    print("Error file already exists")
     if fileManager.fileExists(atPath: errorFile),
-       let creationDate = try fileManager.attributesOfItem(atPath: errorFile)[.creationDate] as? Date,
-       creationDate.distance(to: Date()) >= kErrorReportDuration {
-        // Notify the user that an error persisted for the last `errorReportTime` seconds
-        try notifyError(entry: entry)
+       let creationDate = try fileManager.attributesOfItem(atPath: errorFile)[.creationDate] as? Date {
+        print("Creation date: \(creationDate) (\(creationDate.distance(to: Date()) / 3600) hours ago")
+        if creationDate.distance(to: Date()) >= kErrorReportDuration {
+            // Notify the user that an error persisted for the last `errorReportTime` seconds
+            try notifyError(entry: entry)
+        }
     }
 }
 
@@ -179,7 +183,8 @@ func notifyError(entry: URLEntry) throws {
     // TODO: Replace with DateComponentsFormatter when available on Linux
     let f = SharedUtils.DummyFormatter(fullUnits: true)
     let durationString = f.string(from: kErrorReportDuration) ?? "some time"
-    try sendTelegramMessage("The entry '\(entry.name)' failed to capture a screenshot for at least \(durationString).",
+    try sendTelegramMessage("The entry '\(entry.name)' failed to capture a screenshot for at least " +
+                            "\(durationString.isEmpty ? "some time" : durationString).",
                             to: Int(entry.chatID))
 }
 

urlwatcher/Sources/urlwatcher/main.swift

@@ -21,7 +21,7 @@ if let t = try? String(contentsOfFile: "\(mainDirectory)/BOT_TOKEN", encoding: .
     telegramBotToken = t
 } else {
     print("Unable to read bot token. Please place it into the file " +
-          "\(mainDirectory.components(separatedBy: "/").dropLast().joined(separator: "/"))/BOT_TOKEN " +
+          "\(mainDirectory)/BOT_TOKEN " +
           "or provide the environment variable TELEGRAM_BOT_TOKEN")
     exit(1)
 }