dev

PickerFileProvider/FileProviderData.swift

@@ -33,7 +33,7 @@ class FileProviderData: NSObject {
     var accountPassword = ""
     var accountUrl = ""
     var homeServerUrl = ""
-    var directoryUser = ""
+//    var directoryUser = ""
     
     // Directory
     var fileProviderStorageURL: URL?
@@ -86,7 +86,7 @@ class FileProviderData: NSObject {
                 accountPassword = activeAccount.password
                 accountUrl = activeAccount.url
                 homeServerUrl = CCUtility.getHomeServerUrlActiveUrl(activeAccount.url)
-                directoryUser = CCUtility.getDirectoryActiveUser(activeAccount.user, activeUrl: activeAccount.url)
+//                directoryUser = CCUtility.getDirectoryActiveUser(activeAccount.user, activeUrl: activeAccount.url)
             }
         } else if account != activeAccount.account {
             assert(false, "change user")

PickerFileProvider/FileProviderExtension+Network.swift

@@ -116,22 +116,12 @@ extension FileProviderExtension {
     
     func deleteFileSystem(for metadata: tableMetadata, serverUrl: String, itemIdentifier: NSFileProviderItemIdentifier) {
         
-        let fileNamePath = self.providerData.directoryUser + "/" + metadata.fileID
+        let fileNamePath = CCUtility.getDirectoryProviderStorageFileID(itemIdentifier.rawValue)!
         do {
             try self.providerData.fileManager.removeItem(atPath: fileNamePath)
         } catch let error {
             print("error: \(error)")
         }
-        do {
-            try self.providerData.fileManager.removeItem(atPath: fileNamePath + ".ico")
-        } catch let error {
-            print("error: \(error)")
-        }
-        do {
-            try self.providerData.fileManager.removeItem(atPath: self.providerData.fileProviderStorageURL!.path + "/" + itemIdentifier.rawValue)
-        } catch let error {
-            print("error: \(error)")
-        }
         
         if metadata.directory {
             let dirForDelete = CCUtility.stringAppendServerUrl(serverUrl, addFileName: metadata.fileName)
@@ -317,7 +307,6 @@ extension FileProviderExtension {
             return
         }
         
-        metadata.path = providerData.directoryUser
         metadata.assetLocalIdentifier = ""
         metadata.session = k_upload_session_extension
         metadata.sessionSelector = selectorUploadFile