Browse Source

add freeze on Media()

marinofaggiana 4 years ago
parent
commit
80c4a72736

+ 2 - 2
iOSClient/Database/NCManageDatabase.swift

@@ -2393,7 +2393,7 @@ class NCManageDatabase: NSObject {
                 var metadatas = [tableMetadata]()
                 
                 let sortProperties = [SortDescriptor(keyPath: "date", ascending: false), SortDescriptor(keyPath: "fileNameView", ascending: false)]
-                let results = realm.objects(tableMetadata.self).filter(predicate).sorted(by: sortProperties) //.distinct(by: ["fileName"])
+                let results = realm.objects(tableMetadata.self).filter(predicate).sorted(by: sortProperties)
                 if (results.count > 0) {
                     
                     // For Live Photo
@@ -2408,7 +2408,7 @@ class NCManageDatabase: NSObject {
                         let ext = (result.fileNameView as NSString).pathExtension.uppercased()
                         let fileName = (result.fileNameView as NSString).deletingPathExtension
                         if !(ext == "MOV" && fileNameImages.contains(fileName)) {
-                            metadatas.append(tableMetadata.init(value: result))
+                            metadatas.append(result.freeze())
                         }
                     }
                 }

+ 4 - 9
iOSClient/Main/NCDetailViewController.swift

@@ -667,7 +667,7 @@ extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerI
             }
                 
         // Automatic download for: Encripted
-        } else if metadata.status == Int(k_metadataStatusNormal) && CCUtility.fileProviderStorageSize(metadata.ocId, fileNameView: metadata.fileNameView) == 0 && isFolderEncrypted{
+        } else if CCUtility.fileProviderStorageSize(metadata.ocId, fileNameView: metadata.fileNameView) == 0 && isFolderEncrypted{
             
             if NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "ocId == %@ AND session != ''", metadata.ocId)) == nil {
                 
@@ -677,17 +677,13 @@ extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerI
             completion(index, NCViewerImageCommon.shared.getImageOffOutline(frame: self.view.frame, type: metadata.typeFile), metadata, ZoomScale.default, nil)
             
         // Automatic download for: HEIC - GIF - SVG
-        } else if metadata.status == Int(k_metadataStatusNormal) && CCUtility.fileProviderStorageSize(metadata.ocId, fileNameView: metadata.fileNameView) == 0 && ((metadata.contentType == "image/heic" &&  metadata.hasPreview == false) || ext == "GIF" || ext == "SVG") {
+        } else if CCUtility.fileProviderStorageSize(metadata.ocId, fileNameView: metadata.fileNameView) == 0 && ((metadata.contentType == "image/heic" &&  metadata.hasPreview == false) || ext == "GIF" || ext == "SVG") {
             
             let serverUrlFileName = metadata.serverUrl + "/" + metadata.fileName
             let fileNameLocalPath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileName)!
-            
-            metadata.status = Int(k_metadataStatusInDownload)
-            
+                        
             NCCommunication.shared.download(serverUrlFileName: serverUrlFileName, fileNameLocalPath: fileNameLocalPath, requestHandler: { (_) in
-                
-                metadata.status = Int(k_metadataStatusDownloading)
-                
+                                
             },  progressHandler: { (progress) in
                                 
                 self.progress(Float(progress.fractionCompleted))
@@ -707,7 +703,6 @@ extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerI
                     completion(index, NCViewerImageCommon.shared.getImageOffOutline(frame: self.view.frame, type: metadata.typeFile), metadata, ZoomScale.default, nil)
                 }
                 
-                metadata.status = Int(k_metadataStatusNormal)
                 self.progress(0)
             }