]> dgit.raspbian.org Git - nextcloud-desktop.git/commitdiff
Rename misleading FileProviderFilesUtils to LocalFilesUtils
authorClaudio Cambra <claudio.cambra@nextcloud.com>
Mon, 13 Mar 2023 11:38:54 +0000 (12:38 +0100)
committerClaudio Cambra <claudio.cambra@nextcloud.com>
Fri, 12 May 2023 05:21:29 +0000 (13:21 +0800)
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/LocalFilesUtils.swift [new file with mode: 0644]
shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/NextcloudFileProviderFilesUtils.swift [deleted file]

diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/LocalFilesUtils.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/LocalFilesUtils.swift
new file mode 100644 (file)
index 0000000..411542a
--- /dev/null
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2023 by Claudio Cambra <claudio.cambra@nextcloud.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+import Foundation
+import FileProvider
+
+func pathForAppGroupContainer() -> URL? {
+    guard let appGroupIdentifier = Bundle.main.object(forInfoDictionaryKey: "SocketApiPrefix") as? String else {
+        NSLog("Could not get container url as missing SocketApiPrefix info in app Info.plist")
+        return nil
+    }
+
+    return FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupIdentifier)
+}
+
+func pathForFileProviderExtData() -> URL? {
+    let containerUrl = pathForAppGroupContainer()
+    return containerUrl?.appendingPathComponent("FileProviderExt/")
+}
+
+func pathForFileProviderExtFiles() -> URL? {
+    let fileProviderDataUrl = pathForFileProviderExtData()
+    return fileProviderDataUrl?.appendingPathComponent("Files/")
+}
+
+@discardableResult func localPathForNCDirectory(ocId: String) throws -> URL {
+    guard let fileProviderFilesPathUrl = pathForFileProviderExtFiles() else {
+        throw URLError(.badURL)
+    }
+
+    let folderPathUrl = fileProviderFilesPathUrl.appendingPathComponent(ocId)
+    let folderPath = folderPathUrl.path
+
+    if !FileManager.default.fileExists(atPath: folderPath) {
+        try FileManager.default.createDirectory(at: folderPathUrl, withIntermediateDirectories: true)
+    }
+
+    return folderPathUrl
+}
+
+@discardableResult func localPathForNCDirectory(directoryMetadata: NextcloudDirectoryMetadataTable) throws -> URL {
+    let ocId = directoryMetadata.ocId
+    return try localPathForNCDirectory(ocId: ocId)
+}
+
+@discardableResult func localPathForNCDirectory(itemMetadata: NextcloudItemMetadataTable) throws -> URL {
+    let ocId = itemMetadata.ocId
+    return try localPathForNCDirectory(ocId: ocId)
+}
+
+@discardableResult func localPathForNCFile(ocId: String, fileNameView: String) throws -> URL {
+    let fileFolderPathUrl = try localPathForNCDirectory(ocId: ocId)
+    let filePathUrl = fileFolderPathUrl.appendingPathComponent(fileNameView)
+    let filePath = filePathUrl.path
+
+    if !FileManager.default.fileExists(atPath: filePath) {
+        FileManager.default.createFile(atPath: filePath, contents: nil)
+    }
+
+    return filePathUrl
+}
+
+@discardableResult func localPathForNCFile(itemMetadata: NextcloudItemMetadataTable) throws -> URL {
+    let ocId = itemMetadata.ocId
+    let fileNameView = itemMetadata.fileNameView
+    return try localPathForNCFile(ocId: ocId, fileNameView: fileNameView)
+}
+
+func createFileOrDirectoryLocally(metadata: NextcloudItemMetadataTable) {
+    do {
+        if metadata.directory {
+            try localPathForNCDirectory(ocId: metadata.ocId)
+        } else {
+            try localPathForNCFile(itemMetadata: metadata)
+        }
+    } catch let error {
+        NSLog("Could not create NC file or directory locally, received error: %@", error.localizedDescription)
+    }
+}
diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/NextcloudFileProviderFilesUtils.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/NextcloudFileProviderFilesUtils.swift
deleted file mode 100644 (file)
index 411542a..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2023 by Claudio Cambra <claudio.cambra@nextcloud.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- */
-
-import Foundation
-import FileProvider
-
-func pathForAppGroupContainer() -> URL? {
-    guard let appGroupIdentifier = Bundle.main.object(forInfoDictionaryKey: "SocketApiPrefix") as? String else {
-        NSLog("Could not get container url as missing SocketApiPrefix info in app Info.plist")
-        return nil
-    }
-
-    return FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupIdentifier)
-}
-
-func pathForFileProviderExtData() -> URL? {
-    let containerUrl = pathForAppGroupContainer()
-    return containerUrl?.appendingPathComponent("FileProviderExt/")
-}
-
-func pathForFileProviderExtFiles() -> URL? {
-    let fileProviderDataUrl = pathForFileProviderExtData()
-    return fileProviderDataUrl?.appendingPathComponent("Files/")
-}
-
-@discardableResult func localPathForNCDirectory(ocId: String) throws -> URL {
-    guard let fileProviderFilesPathUrl = pathForFileProviderExtFiles() else {
-        throw URLError(.badURL)
-    }
-
-    let folderPathUrl = fileProviderFilesPathUrl.appendingPathComponent(ocId)
-    let folderPath = folderPathUrl.path
-
-    if !FileManager.default.fileExists(atPath: folderPath) {
-        try FileManager.default.createDirectory(at: folderPathUrl, withIntermediateDirectories: true)
-    }
-
-    return folderPathUrl
-}
-
-@discardableResult func localPathForNCDirectory(directoryMetadata: NextcloudDirectoryMetadataTable) throws -> URL {
-    let ocId = directoryMetadata.ocId
-    return try localPathForNCDirectory(ocId: ocId)
-}
-
-@discardableResult func localPathForNCDirectory(itemMetadata: NextcloudItemMetadataTable) throws -> URL {
-    let ocId = itemMetadata.ocId
-    return try localPathForNCDirectory(ocId: ocId)
-}
-
-@discardableResult func localPathForNCFile(ocId: String, fileNameView: String) throws -> URL {
-    let fileFolderPathUrl = try localPathForNCDirectory(ocId: ocId)
-    let filePathUrl = fileFolderPathUrl.appendingPathComponent(fileNameView)
-    let filePath = filePathUrl.path
-
-    if !FileManager.default.fileExists(atPath: filePath) {
-        FileManager.default.createFile(atPath: filePath, contents: nil)
-    }
-
-    return filePathUrl
-}
-
-@discardableResult func localPathForNCFile(itemMetadata: NextcloudItemMetadataTable) throws -> URL {
-    let ocId = itemMetadata.ocId
-    let fileNameView = itemMetadata.fileNameView
-    return try localPathForNCFile(ocId: ocId, fileNameView: fileNameView)
-}
-
-func createFileOrDirectoryLocally(metadata: NextcloudItemMetadataTable) {
-    do {
-        if metadata.directory {
-            try localPathForNCDirectory(ocId: metadata.ocId)
-        } else {
-            try localPathForNCFile(itemMetadata: metadata)
-        }
-    } catch let error {
-        NSLog("Could not create NC file or directory locally, received error: %@", error.localizedDescription)
-    }
-}