marinofaggiana 4 年之前
父節點
當前提交
7e6665fc02
共有 2 個文件被更改,包括 10 次插入12 次删除
  1. 6 8
      iOSClient/Networking/NCOperationQueue.swift
  2. 4 4
      iOSClient/Networking/NCService.swift

+ 6 - 8
iOSClient/Networking/NCOperationQueue.swift

@@ -199,14 +199,12 @@ class NCOperationSynchronization: ConcurrentOperation {
                             }
                             
                             // Files
-                            if metadatas.count > 0 {
-                                let metadatasResult = NCManageDatabase.sharedInstance.getMetadatas(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND status == %d", account, serverUrlFileName, k_metadataStatusNormal))
-                                let metadatasChanged = NCManageDatabase.sharedInstance.updateMetadatas(metadatas, metadatasResult: metadatasResult, withVerifyLocal: self.download)
-                                if self.download {
-                                    for metadata in metadatasChanged {
-                                        if metadata.directory == false {
-                                            NCOperationQueue.shared.download(metadata: metadata, selector: self.selector, setFavorite: false)
-                                        }
+                            let metadatasResult = NCManageDatabase.sharedInstance.getMetadatas(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND status == %d", account, serverUrlFileName, k_metadataStatusNormal))
+                            let metadatasChanged = NCManageDatabase.sharedInstance.updateMetadatas(metadatas, metadatasResult: metadatasResult, withVerifyLocal: self.download)
+                            if self.download {
+                                for metadata in metadatasChanged {
+                                    if metadata.directory == false {
+                                        NCOperationQueue.shared.download(metadata: metadata, selector: self.selector, setFavorite: false)
                                     }
                                 }
                             }

+ 4 - 4
iOSClient/Networking/NCService.swift

@@ -72,10 +72,9 @@ class NCService: NSObject {
                 // Synchronize favorite ---
                 NCNetworking.shared.listingFavoritescompletion { (_, _, _, _) in }
                 
-                // Synchronize Offline ---
-                let directories = NCManageDatabase.sharedInstance.getTablesDirectory(predicate: NSPredicate(format: "account == %@ AND offline == true", tableAccount.account), sorted: "serverUrl", ascending: true)
-                if (directories != nil) {
-                    for directory: tableDirectory in directories! {
+                // Synchronize Offline Directory ---
+                if let directories = NCManageDatabase.sharedInstance.getTablesDirectory(predicate: NSPredicate(format: "account == %@ AND offline == true", tableAccount.account), sorted: "serverUrl", ascending: true) {
+                    for directory: tableDirectory in directories {
                         guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "ocId == %@", directory.ocId)) else {
                             continue
                         }
@@ -83,6 +82,7 @@ class NCService: NSObject {
                     }
                 }
                 
+                // Synchronize Offline Files ---
                 let files = NCManageDatabase.sharedInstance.getTableLocalFiles(predicate: NSPredicate(format: "account == %@ AND offline == true", tableAccount.account), sorted: "fileName", ascending: true)
                 for file: tableLocalFile in files {
                     guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "ocId == %@", file.ocId)) else {