Replaced DateComponentsFormatter with dummy formatter for Linux Compatibility

Removed (and invalidated) telegram bot token from scheme

Author: iComputerfreak

NotifierBot/Sources/Notifier/Commands/InfoCommand.swift

@@ -58,7 +58,7 @@ struct InfoCommand: Command {
         }
         var durationString = ""
         if let restDuration = e.unmuteDate?.timeIntervalSince(Date()) {
-            durationString = JFUtils.muteDurationFormatter.string(from: restDuration) ?? ""
+            durationString = SharedUtils.muteDurationFormatter.string(from: restDuration) ?? ""
         }
         lines.append("- Muted: \(e.isMuted ? "Yes (\(durationString) hours remaining)" : "No")".escaped())
         return lines.joined(separator: "\n")

NotifierBot/Sources/Notifier/JFUtils.swift

@@ -74,13 +74,6 @@ struct JFUtils {
         return list.joined(separator: "\n")
     }
 
-    static var muteDurationFormatter: DateComponentsFormatter {
-        let f = DateComponentsFormatter()
-        f.unitsStyle = .abbreviated
-        f.allowedUnits = [.year, .day, .hour, .minute]
-        return f
-    }
-    
 }
 
 extension Dispatcher {

Shared/Sources/Shared/PermissionHandler.swift

@@ -1,5 +1,5 @@
 //
-//  File 2.swift
+//  PermissionHandler.swift
 //  
 //
 //  Created by Jonas Frey on 01.05.21.

Shared/Sources/Shared/SharedUtils.swift

@@ -0,0 +1,79 @@
+//
+//  SharedUtils.swift
+//  
+//
+//  Created by Jonas Frey on 01.04.22.
+//
+
+import Foundation
+
+public struct SharedUtils {
+    
+    /// Dummy formatter that replaces the DateComponentsFormatter with a fixed configuration
+    /// DateComponentsFormatter is not yet available on Linux, so we have to use this one instead
+    public struct DummyFormatter {
+        
+        let fullUnits: Bool
+        
+        public init(fullUnits: Bool = false) {
+            self.fullUnits = fullUnits
+        }
+        
+        public func string(from ti: TimeInterval) -> String? {
+            var components: [String] = []
+            var rest = ti
+            let years = rest / (365 * 24 * 60 * 60)
+            rest = rest.truncatingRemainder(dividingBy: (365 * 24 * 60 * 60))
+            if years > 0 {
+                components.append(durationString(Int(years), .year))
+            }
+            
+            let days = rest / (24 * 60 * 60)
+            rest = rest.truncatingRemainder(dividingBy: (24 * 60 * 60))
+            if days > 0 {
+                components.append(durationString(Int(days), .day))
+            }
+            
+            let hours = rest / (60 * 60)
+            rest = rest.truncatingRemainder(dividingBy: (60 * 60))
+            if hours > 0 {
+                components.append(durationString(Int(hours), .hour))
+            }
+            
+            let minutes = rest / 60
+            rest = rest.truncatingRemainder(dividingBy: 60)
+            if minutes > 0 {
+                components.append(durationString(Int(minutes), .minute))
+            }
+            
+            return components.joined(separator: " ")
+        }
+        
+        private enum Unit: String {
+            case year
+            case day
+            case hour
+            case minute
+        }
+        
+        private func durationString(_ amount: Int, _ unit: Unit) -> String {
+            return "\(amount) \(unitString(amount, unit))"
+        }
+        
+        private func unitString(_ amount: Int, _ unit: Unit) -> String {
+            if !fullUnits {
+                return .init(unit.rawValue.first!)
+            }
+            return unit.rawValue.appending(amount == 1 ? "" : "s")
+        }
+    }
+    
+    public static var muteDurationFormatter: DummyFormatter {
+//        let f = DateComponentsFormatter()
+//        f.unitsStyle = .abbreviated
+//        f.allowedUnits = [.year, .day, .hour, .minute]
+//        return f
+        return DummyFormatter(fullUnits: false)
+    }
+    
+}

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

@@ -57,11 +57,6 @@
             value = "true"
             isEnabled = "YES">
          </EnvironmentVariable>
-         <EnvironmentVariable
-            key = "TELEGRAM_BOT_TOKEN"
-            value = "5221316043:AAF-_gfAxbHVrW2HDfplfSYz3psPtseLVKM"
-            isEnabled = "YES">
-         </EnvironmentVariable>
       </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction

urlwatcher/Sources/urlwatcher/Functions.swift

@@ -176,9 +176,8 @@ func notifyError(entry: URLEntry) throws {
         return
     }
     print("Error taking screenshot. Notifying user...")
-    let f = DateComponentsFormatter()
-    f.allowedUnits = [.year, .day, .hour, .minute, .second]
-    f.unitsStyle = .full
+    // 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).",
                             to: Int(entry.chatID))