Replaced urls.list separator with semicolon to allow for commas in /setcaptureelement etc.

Author: iComputerfreak

NotifierBot/Sources/Notifier/Commands/SetCaptureElementCommand.swift

@@ -36,8 +36,8 @@ struct SetCaptureElementCommand: Command {
         config[entryIndex!].captureElement = ""
         if args.count > 1 {
             let element = args[1...].joined(separator: " ")
-            guard !element.contains(",") else {
-                try bot.sendMessage("Please specify a HTML element that does not contain ','", to: chatID)
+            guard !element.contains(configSeparator) else {
+                try bot.sendMessage("Please specify a HTML element that does not contain '\(configSeparator)'", to: chatID)
                 return
             }
             // If there was a new element supplied, set it

NotifierBot/Sources/Notifier/Commands/SetClickElementCommand.swift

@@ -36,8 +36,8 @@ struct SetClickElementCommand: Command {
         config[entryIndex!].clickElement = ""
         if args.count > 1 {
             let element = args[1...].joined(separator: " ")
-            guard !element.contains(",") else {
-                try bot.sendMessage("Please specify a HTML element that does not contain ','", to: chatID)
+            guard !element.contains(configSeparator) else {
+                try bot.sendMessage("Please specify a HTML element that does not contain '\(configSeparator)'", to: chatID)
                 return
             }
             // If there was a new element supplied, set it

NotifierBot/Sources/Notifier/Commands/SetWaitElement.swift

@@ -36,8 +36,8 @@ struct SetWaitElementCommand: Command {
         config[entryIndex!].waitElement = ""
         if args.count > 1 {
             let element = args[1...].joined(separator: " ")
-            guard !element.contains(",") else {
-                try bot.sendMessage("Please specify a HTML element that does not contain ','", to: chatID)
+            guard !element.contains(configSeparator) else {
+                try bot.sendMessage("Please specify a HTML element that does not contain '\(configSeparator)'", to: chatID)
                 return
             }
             // If there was a new element supplied, set it

Shared/Sources/Shared/ConfigParser.swift

@@ -34,7 +34,7 @@ public class ConfigParser {
                 || line.trimmingCharacters(in: .whitespaces).starts(with: "#") {
                 continue
             }
-            let components = line.components(separatedBy: ",")
+            let components = line.components(separatedBy: configSeparator)
             // Name, x, y, width, height, url (url may contain comma)
             guard components.count >= 9 else {
                 throw JFConfigError.malformedLineSegments(line)
@@ -55,7 +55,7 @@ public class ConfigParser {
             let unmuteDateStr = nextArg()
             let chatID = Int64(nextArg())
             // URL is the rest
-            let url = args.joined(separator: ",").trimmingCharacters(in: .whitespaces)
+            let url = args.joined(separator: configSeparator).trimmingCharacters(in: .whitespaces)
 
             guard x != nil && y != nil && width != nil && height != nil && chatID != nil, delay != nil else {
                 throw JFConfigError.malformedIntegers(line)
@@ -80,17 +80,28 @@ public class ConfigParser {
 
     /// Parses the config back into a string and saves it to disk
     public static func saveConfig(_ config: Config) throws {
-        var configString = ""
+        var configLines: [String] = []
         for l in config {
             var unmuteDateStr = ""
             if let unmuteDate = l.unmuteDate {
                 unmuteDateStr = dateFormatter.string(from: unmuteDate)
             }
-            configString += "\(l.name),\(l.area.x),\(l.area.y),\(l.area.width),\(l.area.height),\(l.delay),\(l.captureElement),\(l.clickElement),\(l.waitElement),\(unmuteDateStr),\(l.chatID),\(l.url)\n"
+            configLines.append([
+                l.name,
+                "\(l.area.x)",
+                "\(l.area.y)",
+                "\(l.area.width)",
+                "\(l.area.height)",
+                "\(l.delay)",
+                l.captureElement,
+                l.clickElement,
+                l.waitElement,
+                unmuteDateStr,
+                "\(l.chatID)",
+                l.url
+            ].joined(separator: configSeparator))
         }
-        // Remove the trailing line break
-        configString.removeLast()
-        try configString.write(toFile: kURLListFile, atomically: true, encoding: .utf8)
+        try configLines.joined(separator: "\n").write(toFile: kURLListFile, atomically: true, encoding: .utf8)
     }
 
     public static func parsePermissions() -> [Int64: BotPermission] {

Shared/Sources/Shared/JFLiterals.swift

@@ -74,3 +74,5 @@ public let kDiffFile = "diff.png"
 public let kNccThreshold = 0.999
 /// The duration for which a screenshot capture error has to persist for the user to be notified. Set to 0 to immediately notify on errors
 public let kErrorReportDuration: TimeInterval = 120 * 60 // 2 hours
+/// The string used to separate the values in the urls.list file
+public let configSeparator = ";"