Marino Faggiana 6 жил өмнө
parent
commit
f474aed644

+ 1 - 3
PickerFileProvider/FileProviderData.swift

@@ -62,9 +62,7 @@ class FileProviderData: NSObject {
         accountUrl = activeAccount.url
         homeServerUrl = CCUtility.getHomeServerUrlActiveUrl(activeAccount.url)
         directoryUser = CCUtility.getDirectoryActiveUser(activeAccount.user, activeUrl: activeAccount.url)
-        
-        ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: accountUser, withUserID: accountUserID, withPassword: accountPassword, withUrl: accountUrl)
-        
+                
         return true
     }
     

+ 2 - 2
PickerFileProvider/FileProviderEnumerator.swift

@@ -26,7 +26,7 @@ import FileProvider
 class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
     
     var enumeratedItemIdentifier: NSFileProviderItemIdentifier
-    let recordForPage = 20
+    let recordForPage = 15
     var serverUrl: String?
     var providerData: FileProviderData
     
@@ -107,7 +107,7 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
             return
         }
             
-        // Read Folder
+        let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.accountUser, withUserID: providerData.accountUserID, withPassword: providerData.accountPassword, withUrl: providerData.accountUrl)
         ocNetworking?.readFolder(serverUrl, depth: "1", account: providerData.account, success: { (metadatas, metadataFolder, directoryID) in
                 
             if (metadatas != nil) {

+ 3 - 0
PickerFileProvider/FileProviderExtension+Actions.swift

@@ -43,6 +43,7 @@ extension FileProviderExtension {
         
         let serverUrl = tableDirectory.serverUrl
         
+        let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.accountUser, withUserID: providerData.accountUserID, withPassword: providerData.accountPassword, withUrl: providerData.accountUrl)
         ocNetworking?.createFolder(directoryName, serverUrl: serverUrl, account: providerData.account, success: { (fileID, date) in
             
             let metadata = tableMetadata()
@@ -148,6 +149,7 @@ extension FileProviderExtension {
         let directoryIDTo = NCManageDatabase.sharedInstance.getDirectoryID(serverUrlTo)!
         let fileNameTo = serverUrlTo + "/" + itemFrom.filename
         
+        let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.accountUser, withUserID: providerData.accountUserID, withPassword: providerData.accountPassword, withUrl: providerData.accountUrl)
         ocNetworking?.moveFileOrFolder(fileNameFrom, fileNameTo: fileNameTo, success: {
             
             if metadataFrom.directory {
@@ -208,6 +210,7 @@ extension FileProviderExtension {
         let fileNamePathFrom = serverUrl + "/" + fileNameFrom
         let fileNamePathTo = serverUrl + "/" + itemName
         
+        let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.accountUser, withUserID: providerData.accountUserID, withPassword: providerData.accountPassword, withUrl: providerData.accountUrl)
         ocNetworking?.moveFileOrFolder(fileNamePathFrom, fileNameTo: fileNamePathTo, success: {
             
             // Rename metadata

+ 1 - 0
PickerFileProvider/FileProviderExtension+Network.swift

@@ -38,6 +38,7 @@ extension FileProviderExtension {
             return
         }
         
+        let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.accountUser, withUserID: providerData.accountUserID, withPassword: providerData.accountPassword, withUrl: providerData.accountUrl)
         ocNetworking?.deleteFileOrFolder(metadata.fileName, serverUrl: serverUrl, success: {
             
             let fileNamePath = self.providerData.directoryUser + "/" + metadata.fileID

+ 1 - 0
PickerFileProvider/FileProviderExtension+Thumbnail.swift

@@ -35,6 +35,7 @@ extension FileProviderExtension {
                     let fileName = CCUtility.returnFileNamePath(fromFileName: metadata!.fileName, serverUrl: serverUrl, activeUrl: providerData.accountUrl)
                     let fileNameLocal = metadata!.fileID
                     
+                    let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.accountUser, withUserID: providerData.accountUserID, withPassword: providerData.accountPassword, withUrl: providerData.accountUrl)
                     ocNetworking?.downloadThumbnail(withDimOfThumbnail: "m", fileName: fileName, fileNameLocal: fileNameLocal, success: {
                         
                         do {

+ 1 - 1
PickerFileProvider/FileProviderExtension.swift

@@ -31,7 +31,6 @@ var fileProviderSignalDeleteItemIdentifier = [NSFileProviderItemIdentifier]()
 var fileProviderSignalUpdateItem = [FileProviderItem]()
 
 var currentAnchor: UInt64 = 0
-var ocNetworking: OCnetworking?
 var fileNamePathImport = [String]()
 
 /* -----------------------------------------------------------------------------------------------------------------------------------------------
@@ -338,6 +337,7 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
             _ = self.deleteFile("\(providerData.directoryUser)/\(metadata.fileID)")
             _ = self.deleteFile("\(providerData.directoryUser)/\(metadata.fileID).ico")
 
+            let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.accountUser, withUserID: providerData.accountUserID, withPassword: providerData.accountPassword, withUrl: providerData.accountUrl)
             let task = ocNetworking?.downloadFileNameServerUrl("\(serverUrl)/\(metadata.fileName)", fileNameLocalPath: "\(providerData.directoryUser)/\(metadata.fileID)", communication: CCNetworking.shared().sharedOCCommunicationExtensionDownload(metadata.fileName), success: { (lenght, etag, date) in
                 
                 // remove Task