MEGA coding

Signed-off-by: marinofaggiana <ios@nextcloud.com>

Share/NCShareExtension+DataSource.swift

@@ -81,7 +81,7 @@ extension NCShareExtension: UICollectionViewDataSource {
         cell.progressView.progress = 0.0
 
         if metadata.directory {
-            setupDirectoryCell(cell, with: metadata)
+            setupDirectoryCell(cell, indexPath: indexPath, with: metadata)
         }
 
         // image Favorite
@@ -106,7 +106,7 @@ extension NCShareExtension: UICollectionViewDataSource {
         return cell
     }
 
-    func setupDirectoryCell(_ cell: NCListCell, with metadata: tableMetadata) {
+    func setupDirectoryCell(_ cell: NCListCell, indexPath: IndexPath, with metadata: tableMetadata) {
         var isShare = false
         var isMounted = false
         if let metadataFolder = metadataFolder {
@@ -114,10 +114,7 @@ extension NCShareExtension: UICollectionViewDataSource {
             isMounted = metadata.permissions.contains(NCGlobal.shared.permissionMounted) && !metadataFolder.permissions.contains(NCGlobal.shared.permissionMounted)
         }
 
-        var tableShare: tableShare?
-        if dataSource.metadataShare[metadata.ocId] != nil {
-            tableShare = dataSource.metadataShare[metadata.ocId]
-        }
+        let tableShare = dataSource.metadatasForSection[indexPath.section].metadataShare[metadata.ocId]
 
         if metadata.e2eEncrypted {
             cell.imageItem.image = NCBrandColor.cacheImages.folderEncrypted

iOSClient/Data/NCDataSource.swift

@@ -25,12 +25,8 @@ import UIKit
 
 class NCDataSource: NSObject {
 
-    public var metadatasForSection: [NCMetadatasForSection] = []
-
     public var metadatasSource: [tableMetadata] = []
-    public var metadataShare: [String: tableShare] = [:]
-    public var metadataOffLine: [String] = []
-    public var sections: [String] = []
+    public var metadatasForSection: [NCMetadatasForSection] = []
 
     private var ascending: Bool = true
     private var sort: String = ""
@@ -39,6 +35,8 @@ class NCDataSource: NSObject {
     private var filterLivePhoto: Bool = true
     private var groupByField: String = ""
 
+    private var sectionsValue: [String] = []
+
     override init() {
         super.init()
     }
@@ -55,152 +53,182 @@ class NCDataSource: NSObject {
         self.groupByField = groupByField
 
         // Create sections && sorted
-        self.sections = self.metadatasSource.map { getSectionField(metadata: $0) }
-        self.sections = self.sections.sorted {
+        createSections()
+
+        // Create metadataForSection
+        for sectionValue in self.sectionsValue {
+            createMetadataForSection(sectionValue: sectionValue)
+        }
+    }
+
+    // MARK: -
+
+    func createSections() {
+
+        self.sectionsValue = metadatasSource.map { getSectionValue(metadata: $0) }
+        self.sectionsValue = Array(Set(self.sectionsValue))
+        self.sectionsValue = self.sectionsValue.sorted {
             if self.ascending {
                 return $0 < $1
             } else {
                 return $0 > $1
             }
         }
+    }
 
-        // Create metadataForSection
-        for section in self.sections {
-            let metadatas = self.metadatasSource.filter({ getSectionField(metadata: $0) == section})
-            let metadataForSection = NCMetadatasForSection.init(section: section, metadatas: metadatas, sort: self.sort, ascending: self.ascending, directoryOnTop: self.directoryOnTop, favoriteOnTop: self.favoriteOnTop, filterLivePhoto: self.filterLivePhoto)
-            metadatasForSection.append(metadataForSection)
-        }
+    func createMetadataForSection(sectionValue: String) {
+
+        let metadatas = metadatasSource.filter({ getSectionValue(metadata: $0) == sectionValue})
+        let metadataForSection = NCMetadatasForSection.init(sectionValue: sectionValue, metadatas: metadatas, sort: self.sort, ascending: self.ascending, directoryOnTop: self.directoryOnTop, favoriteOnTop: self.favoriteOnTop, filterLivePhoto: self.filterLivePhoto)
+        metadatasForSection.append(metadataForSection)
     }
 
     // MARK: -
 
-    func getFilesInformation() -> (directories: Int, files: Int, size: Int64) {
+    @discardableResult
+    func addMetadata(_ metadata: tableMetadata) -> IndexPath? {
 
-        var directories: Int = 0
-        var files: Int = 0
-        var size: Int64 = 0
+        // ADD metadatasSource
+        if let rowIndex = self.metadatasSource.firstIndex(where: {$0.fileNameView == metadata.fileNameView || $0.ocId == metadata.ocId}) {
+            self.metadatasSource[rowIndex] = metadata
+        } else {
+            self.metadatasSource.append(metadata)
+        }
 
-        for metadata in self.metadatasSource {
-            if metadata.directory {
-                directories += 1
+        // ADD metadataForSection
+        if let sectionIndex = self.sectionsValue.firstIndex(where: {$0 == self.getSectionValue(metadata: metadata) }) {
+            let metadataForSection = metadatasForSection[sectionIndex]
+            if let rowIndex = metadataForSection.metadatas.firstIndex(where: {$0.fileNameView == metadata.fileNameView || $0.ocId == metadata.ocId}) {
+                metadataForSection.metadatas[rowIndex] = metadata
+                return IndexPath(row: rowIndex, section: sectionIndex)
             } else {
-                files += 1
+                metadataForSection.metadatas.append(metadata)
+                metadataForSection.createMetadatasForSection()
+                if let rowIndex = metadataForSection.metadatas.firstIndex(where: {$0.ocId == metadata.ocId}) {
+                    return IndexPath(row: rowIndex, section: sectionIndex)
+                }
+                return nil
             }
-            size += metadata.size
+        } else {
+            createSections()
+            let sectionValue = getSectionValue(metadata: metadata)
+            createMetadataForSection(sectionValue: sectionValue)
         }
 
-        return (directories, files, size)
+        return nil
     }
 
     func deleteMetadata(ocId: String) -> IndexPath? {
 
-        if let indexPath = self.getIndexPathMetadata(ocId: ocId) {
-            self.metadatasSource.remove(at: indexPath.row)
-            return indexPath
+        var indexPathReturn: IndexPath?
+
+        // DELETE metadataForSection (IMPORTANT FIRST)
+        let (indexPath, metadataForSection) = self.getIndexPathMetadata(ocId: ocId)
+        if let indexPath = indexPath, let metadataForSection = metadataForSection {
+            metadataForSection.metadatas.remove(at: indexPath.row)
+            metadataForSection.createMetadatasForSection()
+            indexPathReturn = indexPath
         }
 
-        return nil
+        // DELETE metadatasSource (IMPORTANT LAST)
+        if let rowIndex = self.metadatasSource.firstIndex(where: {$0.ocId == ocId}) {
+            self.metadatasSource.remove(at: rowIndex)
+        }
+
+        return indexPathReturn
     }
 
     @discardableResult
     func reloadMetadata(ocId: String, ocIdTemp: String? = nil) -> IndexPath? {
 
+        var ocIdSearch = ocId
         var indexPath: IndexPath?
+        var metadataForSection: NCMetadatasForSection?
+
+        guard let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) else { return nil }
 
         if let ocIdTemp = ocIdTemp {
-            indexPath = self.getIndexPathMetadata(ocId: ocIdTemp)
-        } else {
-            indexPath = self.getIndexPathMetadata(ocId: ocId)
+            ocIdSearch = ocIdTemp
         }
 
-        guard let indexPath = indexPath, let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) else { return nil }
-        self.metadatasSource[indexPath.row] = metadata
-
-        if CCUtility.fileProviderStorageExists(metadata) {
-            let tableLocalFile = NCManageDatabase.shared.getTableLocalFile(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
-            if tableLocalFile?.offline ?? false {
-                metadataOffLine.append(metadata.ocId)
-            }
+        // UPDATE metadataForSection (IMPORTANT FIRST)
+        (indexPath, metadataForSection) = self.getIndexPathMetadata(ocId: ocIdSearch)
+        if let indexPath = indexPath, let metadataForSection = metadataForSection {
+            metadataForSection.metadatas[indexPath.row] = metadata
+            metadataForSection.createMetadatasForSection()
         }
 
-        return indexPath
-    }
-
-    @discardableResult
-    func addMetadata(_ metadata: tableMetadata) -> IndexPath? {
-
-        var row: Int = 0
-
-        // Already exists
-        for metadataCount in self.metadatasSource {
-            if metadataCount.fileNameView == metadata.fileNameView || metadataCount.ocId == metadata.ocId {
-                self.metadatasSource[row] = metadata
-                let section = getSection(metadata: metadata)
-                return IndexPath(row: row, section: section)
-            }
-            row += 1
+        // UPDATE metadatasSource (IMPORTANT LAST)
+        if let rowIndex = self.metadatasSource.firstIndex(where: {$0.ocId == ocIdSearch}) {
+            self.metadatasSource[rowIndex] = metadata
         }
 
-        // Append & rebuild
-        self.metadatasSource.append(metadata)
-        //createMetadatas()
-
-        return getIndexPathMetadata(ocId: metadata.ocId)
+        return indexPath
     }
 
-    func getIndexPathMetadata(ocId: String) -> IndexPath? {
+    // MARK: -
 
-        var row: Int = 0
+    func getIndexPathMetadata(ocId: String) -> (indexPath: IndexPath?, metadataForSection: NCMetadatasForSection?) {
 
-        for metadata in self.metadatasSource {
-            if metadata.ocId == ocId {
-                let section = getSection(metadata: metadata)
-                return IndexPath(row: row, section: section)
+        if let metadata = metadatasSource.filter({ $0.ocId == ocId}).first {
+            let sectionValue = getSectionValue(metadata: metadata)
+            if let sectionIndex = self.sectionsValue.firstIndex(where: {$0 == sectionValue}) {
+                for metadataForSection in self.metadatasForSection {
+                    if metadataForSection.sectionValue == sectionValue {
+                        if let rowIndex = metadataForSection.metadatas.firstIndex(where: {$0.ocId == ocId}) {
+                            return (IndexPath(row: rowIndex, section: sectionIndex), metadataForSection)
+                        }
+                    }
+                }
             }
-            row += 1
         }
 
-        return nil
+        return (nil, nil)
     }
 
     func numberOfSections() -> Int {
 
-        if sections.count == 0 {
+        if self.metadatasForSection.count == 0 {
             return 1
         } else {
-            return sections.count
+            return self.metadatasForSection.count
         }
     }
     
     func numberOfItemsInSection(_ section: Int) -> Int {
 
-        if self.sections.count == 0 || self.metadatasSource.count == 0 { return 0 }
-        let sectionName = self.sections[section]
-        let metadatas = self.metadatasSource.filter({ getSectionField(metadata: $0) == sectionName})
-
-        return metadatas.count
+        if self.metadatasForSection.count == 0 || self.metadatasSource.count == 0 { return 0 }
+        return self.metadatasForSection[section].metadatas.count
     }
 
     func cellForItemAt(indexPath: IndexPath) -> tableMetadata? {
 
-        let row = indexPath.row
-        let sectionName = self.sections[indexPath.section]
-        let metadatas = self.metadatasSource.filter({ getSectionField(metadata: $0) == sectionName})
+        let metadatasForSection = self.metadatasForSection[indexPath.section]
+        return metadatasForSection.metadatas[indexPath.row]
+    }
 
-        if row > metadatas.count - 1 {
-            return nil
-        } else {
-            return metadatas[row]
-        }
+    func getSectionValue(indexPath: IndexPath) -> String {
+        
+        let metadataForSection = self.metadatasForSection[indexPath.section]
+        return metadataForSection.sectionValue
     }
 
-    internal func getSection(metadata: tableMetadata) -> Int {
+    func getFooterInformation() -> (directories: Int, files: Int, size: Int64) {
 
-        let section = self.sections.firstIndex(where: {$0 == getSectionField(metadata: metadata)}) ?? 0
-        return section
+        var directories: Int = 0
+        var files: Int = 0
+        var size: Int64 = 0
+
+        for metadataForSection in metadatasForSection {
+            directories += metadataForSection.numDirectory
+            files += metadataForSection.numFile
+            size += metadataForSection.totalSize
+        }
+
+        return (directories, files, size)
     }
 
-    internal func getSectionField(metadata: tableMetadata) -> String {
+    internal func getSectionValue(metadata: tableMetadata) -> String {
 
         switch self.groupByField {
         case "name":
@@ -213,26 +241,31 @@ class NCDataSource: NSObject {
 
 class NCMetadatasForSection: NSObject {
 
-    var section: String
+    var sectionValue: String
     var metadatas: [tableMetadata]
 
-    var sort : String
-    var ascending: Bool
-    var directoryOnTop: Bool
-    var favoriteOnTop: Bool
-    var filterLivePhoto: Bool
+    private var sort : String
+    private var ascending: Bool
+    private var directoryOnTop: Bool
+    private var favoriteOnTop: Bool
+    private var filterLivePhoto: Bool
+
+    private var metadatasSourceSorted: [tableMetadata] = []
+    private var metadatasFavoriteDirectory: [tableMetadata] = []
+    private var metadatasFavoriteFile: [tableMetadata] = []
+    private var metadatasDirectory: [tableMetadata] = []
+    private var metadatasFile: [tableMetadata] = []
+
+    public var numDirectory: Int = 0
+    public var numFile: Int = 0
+    public var totalSize: Int64 = 0
+    public var metadataShare: [String: tableShare] = [:]
+    public var metadataOffLine: [String] = []
 
-    var metadatasSourceSorted: [tableMetadata] = []
-    var metadatasFavoriteDirectory: [tableMetadata] = []
-    var metadatasFavoriteFile: [tableMetadata] = []
-    var metadatasDirectory: [tableMetadata] = []
-    var metadatasFile: [tableMetadata] = []
-    var metadataShare: [String: tableShare] = [:]
-    var metadataOffLine: [String] = []
 
-    init(section: String, metadatas: [tableMetadata], sort: String, ascending: Bool, directoryOnTop: Bool, favoriteOnTop: Bool, filterLivePhoto: Bool) {
+    init(sectionValue: String, metadatas: [tableMetadata], sort: String, ascending: Bool, directoryOnTop: Bool, favoriteOnTop: Bool, filterLivePhoto: Bool) {
 
-        self.section = section
+        self.sectionValue = sectionValue
         self.metadatas = metadatas
         self.sort = sort
         self.ascending = ascending
@@ -245,12 +278,24 @@ class NCMetadatasForSection: NSObject {
         createMetadatasForSection()
     }
 
-    private func createMetadatasForSection() {
+    func createMetadatasForSection() {
 
-        /*
-        Metadata order
-        */
+        // Clear
+        //
+        metadatasSourceSorted.removeAll()
+        metadatasFavoriteDirectory.removeAll()
+        metadatasFavoriteFile.removeAll()
+        metadatasDirectory.removeAll()
+        metadatasFile.removeAll()
+        metadataShare.removeAll()
+        metadataOffLine.removeAll()
 
+        numDirectory = 0
+        numFile = 0
+        totalSize = 0
+
+        // Metadata order
+        //
         if sort != "none" && sort != "" {
             metadatasSourceSorted = metadatas.sorted {
 
@@ -279,10 +324,8 @@ class NCMetadatasForSection: NSObject {
             metadatasSourceSorted = metadatas
         }
 
-        /*
-        Initialize datasource
-        */
-
+        // Initialize datasource
+        //
         for metadata in metadatasSourceSorted {
 
             // skipped the root file
@@ -324,6 +367,14 @@ class NCMetadatasForSection: NSObject {
             } else {
                 metadatasFile.append(metadata)
             }
+
+            //Info
+            if metadata.directory {
+                numDirectory += 1
+            } else {
+                numFile += 1
+                totalSize += metadata.size
+            }
         }
 
         metadatas.removeAll()

iOSClient/FileViewInFolder/NCFileViewInFolder.swift

@@ -98,7 +98,8 @@ class NCFileViewInFolder: NCCollectionViewCommon {
                 // Blink file
                 if self.fileName != nil {
                     if let metadata = NCManageDatabase.shared.getMetadata(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileName == %@", self.appDelegate.account, self.serverUrl, self.fileName!)) {
-                        if let indexPath = self.dataSource.getIndexPathMetadata(ocId: metadata.ocId) {
+                        let (indexPath, _) = self.dataSource.getIndexPathMetadata(ocId: metadata.ocId)
+                        if let indexPath = indexPath {
                             DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
                                 UIView.animate(withDuration: 0.3) {
                                     self.collectionView.scrollToItem(at: indexPath, at: .centeredVertically, animated: false)

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -430,9 +430,8 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
     @objc func favoriteFile(_ notification: NSNotification) {
 
         if let userInfo = notification.userInfo as NSDictionary?, let ocId = userInfo["ocId"] as? String, let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) {
-            if dataSource.getIndexPathMetadata(ocId: metadata.ocId) != nil {
-                reloadDataSource()
-            }
+            let (_, _) = dataSource.getIndexPathMetadata(ocId: metadata.ocId)
+            reloadDataSource()
         }
     }
 
@@ -516,8 +515,9 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         if let userInfo = notification.userInfo as NSDictionary?, let progressNumber = userInfo["progress"] as? NSNumber, let totalBytes = userInfo["totalBytes"] as? Int64, let totalBytesExpected = userInfo["totalBytesExpected"] as? Int64, let ocId = userInfo["ocId"] as? String {
 
             let status = userInfo["status"] as? Int ?? NCGlobal.shared.metadataStatusNormal
+            let (indexPath, _) = self.dataSource.getIndexPathMetadata(ocId: ocId)
 
-            if let indexPath = dataSource.getIndexPathMetadata(ocId: ocId) {
+            if let indexPath = indexPath {
                 if let cell = collectionView?.cellForItem(at: indexPath) {
                     if cell is NCListCell {
                         let cell = cell as! NCListCell
@@ -1309,7 +1309,7 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
 
                 let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionHeader", for: indexPath) as! NCSectionHeader
 
-                header.labelSection.text = self.dataSource.sections[indexPath.section].firstUppercased
+                header.labelSection.text = self.dataSource.getSectionValue(indexPath: indexPath).firstUppercased
                 header.labelSection.textColor = NCBrandColor.shared.brandElement
 
                 return header
@@ -1320,7 +1320,7 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
             let footer = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionFooter", for: indexPath) as! NCSectionFooter
 
             if dataSource.numberOfSections() == 1 {
-                let info = dataSource.getFilesInformation()
+                let info = dataSource.getFooterInformation()
                 footer.setTitleLabel(directories: info.directories, files: info.files, size: info.size )
             } else {
                 footer.setTitleLabel(text: "")
@@ -1430,7 +1430,6 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
             }
         }
 
-        var tableShare: tableShare?
         var isShare = false
         var isMounted = false
 
@@ -1439,9 +1438,7 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
             isMounted = metadata.permissions.contains(NCGlobal.shared.permissionMounted) && !metadataFolder!.permissions.contains(NCGlobal.shared.permissionMounted)
         }
 
-        if dataSource.metadataShare[metadata.ocId] != nil {
-            tableShare = dataSource.metadataShare[metadata.ocId]
-        }
+        let tableShare = dataSource.metadatasForSection[indexPath.section].metadataShare[metadata.ocId]
 
         //
         // LAYOUT LIST
@@ -1537,7 +1534,7 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
             } else {
 
                 // image local
-                if dataSource.metadataOffLine.contains(metadata.ocId) {
+                if dataSource.metadatasForSection[indexPath.section].metadataOffLine.contains(metadata.ocId) {
                     a11yValues.append(NSLocalizedString("_offline_", comment: ""))
                     cell.imageLocal.image = NCBrandColor.cacheImages.offlineFlag
                 } else if CCUtility.fileProviderStorageExists(metadata) {
@@ -1732,7 +1729,7 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
             } else {
 
                 // image Local
-                if dataSource.metadataOffLine.contains(metadata.ocId) {
+                if dataSource.metadatasForSection[indexPath.section].metadataOffLine.contains(metadata.ocId) {
                     cell.imageLocal.image = NCBrandColor.cacheImages.offlineFlag
                     a11yValues.append(NSLocalizedString("_offline_", comment: ""))
                 } else if CCUtility.fileProviderStorageExists(metadata) {

iOSClient/Select/NCSelect.swift

@@ -385,7 +385,7 @@ extension NCSelect: UICollectionViewDataSource {
 
             let footer = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionFooter", for: indexPath) as! NCSectionFooter
 
-            let info = dataSource.getFilesInformation()
+            let info = dataSource.getFooterInformation()
             footer.setTitleLabel(directories: info.directories, files: info.files, size: info.size)
 
             return footer
@@ -439,16 +439,13 @@ extension NCSelect: UICollectionViewDataSource {
             }
         }
 
-        var tableShare: tableShare?
         var isShare = false
         var isMounted = false
 
         isShare = metadata.permissions.contains(NCGlobal.shared.permissionShared) && !metadataFolder.permissions.contains(NCGlobal.shared.permissionShared)
         isMounted = metadata.permissions.contains(NCGlobal.shared.permissionMounted) && !metadataFolder.permissions.contains(NCGlobal.shared.permissionMounted)
 
-        if dataSource.metadataShare[metadata.ocId] != nil {
-            tableShare = dataSource.metadataShare[metadata.ocId]
-        }
+        let tableShare = dataSource.metadatasForSection[indexPath.section].metadataShare[metadata.ocId]
 
         // LAYOUT LIST
 
@@ -509,7 +506,7 @@ extension NCSelect: UICollectionViewDataSource {
                 cell.labelInfo.text = CCUtility.dateDiff(metadata.date as Date) + " · " + CCUtility.transformedSize(metadata.size)
 
                 // image local
-                if dataSource.metadataOffLine.contains(metadata.ocId) {
+                if dataSource.metadatasForSection[indexPath.section].metadataOffLine.contains(metadata.ocId) {
                     cell.imageLocal.image = NCBrandColor.cacheImages.offlineFlag
                 } else if CCUtility.fileProviderStorageExists(metadata) {
                     cell.imageLocal.image = NCBrandColor.cacheImages.local
@@ -606,7 +603,7 @@ extension NCSelect: UICollectionViewDataSource {
             } else {
 
                 // image Local
-                if dataSource.metadataOffLine.contains(metadata.ocId) {
+                if dataSource.metadatasForSection[indexPath.section].metadataOffLine.contains(metadata.ocId) {
                     cell.imageLocal.image = NCBrandColor.cacheImages.offlineFlag
                 } else if CCUtility.fileProviderStorageExists(metadata) {
                     cell.imageLocal.image = NCBrandColor.cacheImages.local