Refactor

Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com>

Author: mpivchev

Sources/NextcloudKit/Utils/FileAutoRenamer.swift

@@ -5,16 +5,16 @@
 import Foundation
 
 public final class FileAutoRenamer: Sendable {
-    private let capabilities: NKCapabilities.Capabilities
     private let forbiddenFileNameCharacters: [String]
     private let forbiddenFileNameExtensions: [String]
+    private let capabilities: NKCapabilities.Capabilities
 
     private let replacement = "_"
 
-    public init(capabilities: NKCapabilities.Capabilities, forbiddenFileNameCharacters: [String] = [], forbiddenFileNameExtensions: [String] = []) {
+    public init(capabilities: NKCapabilities.Capabilities) {
+        self.forbiddenFileNameCharacters = capabilities.forbiddenFileNameCharacters
+        self.forbiddenFileNameExtensions = capabilities.forbiddenFileNameExtensions.map { $0.lowercased() }
         self.capabilities = capabilities
-        self.forbiddenFileNameCharacters = forbiddenFileNameCharacters
-        self.forbiddenFileNameExtensions = forbiddenFileNameExtensions.map { $0.lowercased() }
     }
 
     public func rename(filename: String, isFolderPath: Bool = false) -> String {

Sources/NextcloudKit/Utils/FileNameValidator.swift

@@ -37,11 +37,11 @@ public final class FileNameValidator: Sendable {
         return NKError(errorCode: NSURLErrorCannotCreateFile, errorDescription: errorMessage)
     }
 
-    public init(forbiddenFileNames: [String], forbiddenFileNameBasenames: [String], forbiddenFileNameCharacters: [String], forbiddenFileNameExtensions: [String], capabilities: NKCapabilities.Capabilities) {
-        self.forbiddenFileNames = forbiddenFileNames.map { $0.uppercased() }
-        self.forbiddenFileNameBasenames = forbiddenFileNameBasenames.map { $0.uppercased() }
-        self.forbiddenFileNameCharacters = forbiddenFileNameCharacters
-        self.forbiddenFileNameExtensions = forbiddenFileNameExtensions.map { $0.uppercased() }
+    public init(capabilities: NKCapabilities.Capabilities) {
+        self.forbiddenFileNames = capabilities.forbiddenFileNames.map { $0.uppercased() }
+        self.forbiddenFileNameBasenames = capabilities.forbiddenFileNameBasenames.map { $0.uppercased() }
+        self.forbiddenFileNameCharacters = capabilities.forbiddenFileNameCharacters
+        self.forbiddenFileNameExtensions = capabilities.forbiddenFileNameExtensions.map { $0.uppercased() }
         self.capabilities = capabilities
     }
 

Tests/NextcloudKitUnitTests/FileAutoRenamerUnitTests.swift

@@ -37,11 +37,10 @@ struct FileAutoRenamerUnitTests {
         capabilities.windowsCompatibleFilenamesEnabled = wcfEnabled
         capabilities.serverVersionMajor = serverMajor
 
-        return FileAutoRenamer(
-            capabilities: capabilities,
-            forbiddenFileNameCharacters: chars,
-            forbiddenFileNameExtensions: exts
-        )
+        capabilities.forbiddenFileNameCharacters = chars
+        capabilities.forbiddenFileNameExtensions = exts
+
+        return FileAutoRenamer(capabilities: capabilities)
     }
 
     @Test func testInvalidChar() {

Tests/NextcloudKitUnitTests/FileNameValidatorUnitTests.swift

@@ -12,16 +12,15 @@ struct FileNameValidatorUnitTests {
         capabilities.windowsCompatibleFilenamesEnabled = wcfEnabled
         capabilities.serverVersionMajor = serverMajor
 
-        return FileNameValidator(
-            forbiddenFileNames: [".htaccess",".htaccess"],
-            forbiddenFileNameBasenames: ["con", "prn", "aux", "nul", "com0", "com1", "com2", "com3", "com4",
-                                         "com5", "com6", "com7", "com8", "com9", "com¹", "com²", "com³",
-                                         "lpt0", "lpt1", "lpt2", "lpt3", "lpt4", "lpt5", "lpt6", "lpt7",
-                                         "lpt8", "lpt9", "lpt¹", "lpt²", "lpt³"],
-            forbiddenFileNameCharacters: ["<", ">", ":", "\\\\", "/", "|", "?", "*", "&"],
-            forbiddenFileNameExtensions: [".filepart",".part", ".", ",", " "],
-            capabilities: capabilities
-        )
+        capabilities.forbiddenFileNames = [".htaccess",".htaccess"]
+        capabilities.forbiddenFileNameBasenames = ["con", "prn", "aux", "nul", "com0", "com1", "com2", "com3", "com4",
+                                                   "com5", "com6", "com7", "com8", "com9", "com¹", "com²", "com³",
+                                                   "lpt0", "lpt1", "lpt2", "lpt3", "lpt4", "lpt5", "lpt6", "lpt7",
+                                                   "lpt8", "lpt9", "lpt¹", "lpt²", "lpt³"]
+        capabilities.forbiddenFileNameCharacters = ["<", ">", ":", "\\\\", "/", "|", "?", "*", "&"]
+        capabilities.forbiddenFileNameExtensions = [".filepart",".part", ".", ",", " "]
+
+        return FileNameValidator(capabilities: capabilities)
     }
 
     @Test("Invalid character is rejected")