Marino Faggiana 6 years ago
parent
commit
63bf9e6177

+ 0 - 1
PickerFileProvider/FileProviderExtension+Actions.swift

@@ -438,7 +438,6 @@ extension FileProviderExtension {
                 metadata.fileID = tableDirectory.directoryID + fileName
                 metadata.fileID = tableDirectory.directoryID + fileName
                 metadata.fileName = fileName
                 metadata.fileName = fileName
                 metadata.fileNameView = fileName
                 metadata.fileNameView = fileName
-                metadata.path = fileNamePathDirectory
                 metadata.size = size
                 metadata.size = size
                 metadata.status = Int(k_metadataStatusHide)
                 metadata.status = Int(k_metadataStatusHide)
                
                

+ 3 - 3
PickerFileProvider/FileProviderExtension.swift

@@ -302,14 +302,14 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
                 return
                 return
             }
             }
             
             
+            // delete file 0 len
+            _ = self.providerData.deleteFile(CCUtility.getDirectoryProviderStorageFileID(identifier.rawValue, fileNameView: metadata.fileNameView))
+            
             let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.accountUser, withUserID: providerData.accountUserID, withPassword: providerData.accountPassword, withUrl: providerData.accountUrl)
             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: url.path, communication: CCNetworking.shared().sharedOCCommunicationExtensionDownload(), success: { (lenght, etag, date) in
             let task = ocNetworking?.downloadFileNameServerUrl(serverUrl + "/" + metadata.fileName, fileNameLocalPath: url.path, communication: CCNetworking.shared().sharedOCCommunicationExtensionDownload(), success: { (lenght, etag, date) in
                 
                 
                 // remove Task
                 // remove Task
                 self.outstandingDownloadTasks.removeValue(forKey: url)
                 self.outstandingDownloadTasks.removeValue(forKey: url)
-
-                // copy download file to url
-//                _ = self.providerData.copyFile("\(self.providerData.directoryUser)/\(metadata.fileID)", toPath: url.path)
             
             
                 // update DB Local
                 // update DB Local
                 metadata.date = date! as NSDate
                 metadata.date = date! as NSDate

+ 0 - 1
iOSClient/Database/NCDatabase.swift

@@ -179,7 +179,6 @@ class tableLocalFile: Object {
     @objc dynamic var account = ""
     @objc dynamic var account = ""
     @objc dynamic var date = NSDate()
     @objc dynamic var date = NSDate()
     @objc dynamic var etag = ""
     @objc dynamic var etag = ""
-    @objc dynamic var etagFPE = ""
     @objc dynamic var exifDate = NSDate()
     @objc dynamic var exifDate = NSDate()
     @objc dynamic var exifLatitude = ""
     @objc dynamic var exifLatitude = ""
     @objc dynamic var exifLongitude = ""
     @objc dynamic var exifLongitude = ""

+ 0 - 3
iOSClient/Database/NCManageDatabase.swift

@@ -1485,9 +1485,6 @@ class NCManageDatabase: NSObject {
                 if let etag = etag {
                 if let etag = etag {
                     result.etag = etag
                     result.etag = etag
                 }
                 }
-                if let etagFPE = etagFPE {
-                    result.etagFPE = etagFPE
-                }
             }
             }
         } catch let error {
         } catch let error {
             print("[LOG] Could not write to database: ", error)
             print("[LOG] Could not write to database: ", error)