marinofaggiana 5 tahun lalu
induk
melakukan
608a094717
1 mengubah file dengan 2 tambahan dan 13 penghapusan
  1. 2 13
      File Provider Extension/FileProviderExtension.swift

+ 2 - 13
File Provider Extension/FileProviderExtension.swift

@@ -267,7 +267,6 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
     override func itemChanged(at url: URL) {
         
         var size = 0 as Double
-        var error: NSError?
         let pathComponents = url.pathComponents
         assert(pathComponents.count > 2)
         let itemIdentifier = NSFileProviderItemIdentifier(pathComponents[pathComponents.count - 2])
@@ -279,10 +278,6 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
             return
         }
         
-        if url.startAccessingSecurityScopedResource() == false {
-            return
-        }
-        
         // typefile directory ? (NOT PERMITTED)
         do {
             let attributes = try fileProviderUtility.sharedInstance.fileManager.attributesOfItem(atPath: url.path)
@@ -295,7 +290,7 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
             return
         }
 
-        let fileName = NCUtility.sharedInstance.createFileName(url.lastPathComponent, serverUrl: metadata.serverUrl, account: fileProviderData.sharedInstance.account)
+        let fileName = pathComponents[pathComponents.count - 1]
         let fileNameServerUrl = metadata.serverUrl + "/" + fileName
         let fileNameLocalPath = url.path
         
@@ -305,10 +300,6 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
             
             if account == fileProviderData.sharedInstance.account && errorCode == 0 {
                 
-                self.fileCoordinator.coordinate(readingItemAt: url, options: .withoutChanges, error: &error) { (url) in
-                    _ = fileProviderUtility.sharedInstance.copyFile(url.path, toPath: CCUtility.getDirectoryProviderStorageOcId(ocId, fileNameView: fileName))
-                }
-                
                 metadata.date = date! as NSDate
                 metadata.etag = etag!
                 metadata.size = size
@@ -316,15 +307,13 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
                 guard let metadataDB = NCManageDatabase.sharedInstance.addMetadata(metadata) else {
                     return
                 }
-                NCManageDatabase.sharedInstance.addLocalFile(metadata: metadataDB)
+                NCManageDatabase.sharedInstance.setLocalFile(ocId: metadata.ocId, date: metadata.date, exifDate: nil, exifLatitude: nil, exifLongitude: nil, fileName: nil, etag: metadata.etag)
                 
                 let item = FileProviderItem(metadata: metadataDB, parentItemIdentifier: parentItemIdentifier)
                 fileProviderData.sharedInstance.fileProviderSignalUpdateItem[item.itemIdentifier] = item
                 
                 fileProviderData.sharedInstance.signalEnumerator(for: [parentItemIdentifier, .workingSet])
             }
-            
-            url.stopAccessingSecurityScopedResource()
         })
     }