]> dgit.raspbian.org Git - nextcloud-desktop.git/commitdiff
Make NKError extension conversion more legible
authorClaudio Cambra <claudio.cambra@nextcloud.com>
Mon, 13 Mar 2023 13:35:47 +0000 (14:35 +0100)
committerClaudio Cambra <claudio.cambra@nextcloud.com>
Fri, 12 May 2023 05:21:30 +0000 (13:21 +0800)
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/Extensions/NKError+Extensions.swift

index e30574a66966dcfbe296e0f92650374bb3c3b918..b8f912ab022c86cfff19311c91562e38b7fa79d8 100644 (file)
@@ -17,17 +17,50 @@ import FileProvider
 import NextcloudKit
 
 extension NKError {
-    func toFileProviderError() -> NSFileProviderError {
-        let nkErrorCode = self.errorCode
+    var isCouldntConnectError: Bool {
+        get {
+            let nkErrorCode = self.errorCode
+            return nkErrorCode == -9999 ||
+                nkErrorCode == -1001 ||
+                nkErrorCode == -1004 ||
+                nkErrorCode == -1005 ||
+                nkErrorCode == -1009 ||
+                nkErrorCode == -1012 ||
+                nkErrorCode == -1200 ||
+                nkErrorCode == -1202 ||
+                nkErrorCode == 500 ||
+                nkErrorCode == 503 ||
+                nkErrorCode == 200
+        }
+    }
 
-        if nkErrorCode == 404 {
+    var isUnauthenticatedError: Bool {
+        get {
+            return self.errorCode == -1013
+        }
+    }
+
+    var isGoingOverQuotaError: Bool {
+        get {
+            return self.errorCode == 507
+        }
+    }
+
+    var isNotFoundError: Bool {
+        get {
+            return self.errorCode == 404
+        }
+    }
+
+    func toFileProviderError() -> NSFileProviderError {
+        if self.isNotFoundError {
             return NSFileProviderError(.noSuchItem)
-        } else if nkErrorCode == -9999 || nkErrorCode == -1001 || nkErrorCode == -1004 || nkErrorCode == -1005 || nkErrorCode == -1009 || nkErrorCode == -1012 || nkErrorCode == -1200 || nkErrorCode == -1202 || nkErrorCode == 500 || nkErrorCode == 503 || nkErrorCode == 200 {
+        } else if self.isCouldntConnectError {
             // Provide something the file provider can do something with
             return NSFileProviderError(.serverUnreachable)
-        } else if nkErrorCode == -1013  {
+        } else if self.isUnauthenticatedError {
             return NSFileProviderError(.notAuthenticated)
-        } else if nkErrorCode == 507 {
+        } else if self.isGoingOverQuotaError {
             return NSFileProviderError(.insufficientQuota)
         } else {
             return NSFileProviderError(.cannotSynchronize)