coding

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

Share/NCShareExtension+DataSource.swift

@@ -47,11 +47,11 @@ extension NCShareExtension: UICollectionViewDelegate {
 extension NCShareExtension: UICollectionViewDataSource {
 
     func numberOfSections(in collectionView: UICollectionView) -> Int {
-        return 1
+        return dataSource.numberOfSections()
     }
 
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        let numberOfItems = dataSource.numberOfItems()
+        let numberOfItems = dataSource.numberOfItemsInSection(section)
         emptyDataSet?.numberOfItemsInSection(numberOfItems, section: section)
         return numberOfItems
     }

iOSClient/Data/NCDataSource.swift

@@ -35,12 +35,13 @@ class NCDataSource: NSObject {
     private var directoryOnTop: Bool = true
     private var favoriteOnTop: Bool = true
     private var filterLivePhoto: Bool = true
+    private var groupByField: String = ""
 
     override init() {
         super.init()
     }
 
-    init(metadatasSource: [tableMetadata], sort: String? = "none", ascending: Bool? = false, directoryOnTop: Bool? = true, favoriteOnTop: Bool? = true, filterLivePhoto: Bool? = true) {
+    init(metadatasSource: [tableMetadata], sort: String? = "none", ascending: Bool? = false, directoryOnTop: Bool? = true, favoriteOnTop: Bool? = true, filterLivePhoto: Bool? = true, groupByField: String = "name") {
         super.init()
 
         self.sort = sort ?? "none"
@@ -48,6 +49,7 @@ class NCDataSource: NSObject {
         self.directoryOnTop = directoryOnTop ?? true
         self.favoriteOnTop = favoriteOnTop ?? true
         self.filterLivePhoto = filterLivePhoto ?? true
+        self.groupByField = groupByField
 
         createMetadatas(metadatasSource: metadatasSource)
     }
@@ -73,26 +75,28 @@ class NCDataSource: NSObject {
                 switch sort {
                 case "date":
                     if ascending {
-                        return ($0.name, ($0.date as Date)) < ($1.name, ($1.date as Date))
+                        return (getSectionField(metadata:$0), ($0.date as Date)) < (getSectionField(metadata:$1), ($1.date as Date))
                     } else {
-                        return ($0.name, ($0.date as Date)) > ($1.name, ($1.date as Date))
+                        return (getSectionField(metadata:$0), ($0.date as Date)) > (getSectionField(metadata:$1), ($1.date as Date))
                     }
                 case "size":
                     if ascending {
-                        return ($0.name, $0.size) < ($1.name, $1.size)
+                        return (getSectionField(metadata:$0), $0.size) < (getSectionField(metadata:$1), $1.size)
                     } else {
-                        return ($0.name, $0.size) > ($1.name, $1.size)
+                        return (getSectionField(metadata:$0), $0.size) > (getSectionField(metadata:$1), $1.size)
                     }
                 default:
                     if ascending {
-                        return ($0.name, $0.fileNameView.lowercased()) < ($1.name, $1.fileNameView.lowercased())
+                        return (getSectionField(metadata:$0), $0.fileNameView.lowercased()) < (getSectionField(metadata:$1), $1.fileNameView.lowercased())
                     } else {
-                        return ($0.name, $0.fileNameView.lowercased()) > ($1.name, $1.fileNameView.lowercased())
+                        return (getSectionField(metadata:$0), $0.fileNameView.lowercased()) > (getSectionField(metadata:$1), $1.fileNameView.lowercased())
                     }
                 }
             }
         } else {
-            metadatasSourceSorted = metadatasSource
+            metadatasSourceSorted = metadatasSource.sorted {
+                (getSectionField(metadata:$0)) < (getSectionField(metadata:$1))
+            }
         }
 
         /*
@@ -142,7 +146,7 @@ class NCDataSource: NSObject {
             }
 
             // sections
-            sections.append(metadata.name)
+            sections.append(getSectionField(metadata:metadata))
         }
 
         metadatas.removeAll()
@@ -173,29 +177,29 @@ class NCDataSource: NSObject {
         return (directories, files, size)
     }
 
-    func deleteMetadata(ocId: String) -> Int? {
+    func deleteMetadata(ocId: String) -> IndexPath? {
 
-        if let index = self.getIndexMetadata(ocId: ocId) {
-            metadatas.remove(at: index)
-            return index
+        if let indexPath = self.getIndexPathMetadata(ocId: ocId) {
+            metadatas.remove(at: indexPath.row)
+            return indexPath
         }
 
         return nil
     }
 
     @discardableResult
-    func reloadMetadata(ocId: String, ocIdTemp: String? = nil) -> Int? {
+    func reloadMetadata(ocId: String, ocIdTemp: String? = nil) -> IndexPath? {
 
-        var index: Int?
+        var indexPath: IndexPath?
 
         if let ocIdTemp = ocIdTemp {
-            index = self.getIndexMetadata(ocId: ocIdTemp)
+            indexPath = self.getIndexPathMetadata(ocId: ocIdTemp)
         } else {
-            index = self.getIndexMetadata(ocId: ocId)
+            indexPath = self.getIndexPathMetadata(ocId: ocId)
         }
 
-        guard let index = index, let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) else { return nil }
-        metadatas[index] = metadata
+        guard let indexPath = indexPath, let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) else { return nil }
+        metadatas[indexPath.row] = metadata
 
         if CCUtility.fileProviderStorageExists(metadata) {
             let tableLocalFile = NCManageDatabase.shared.getTableLocalFile(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
@@ -204,45 +208,60 @@ class NCDataSource: NSObject {
             }
         }
 
-        return index
+        return indexPath
     }
 
     @discardableResult
-    func addMetadata(_ metadata: tableMetadata) -> Int? {
+    func addMetadata(_ metadata: tableMetadata) -> IndexPath? {
 
-        var index: Int = 0
+        var row: Int = 0
 
         // Already exists
-        for metadataCount in metadatas {
+        for metadataCount in self.metadatas {
             if metadataCount.fileNameView == metadata.fileNameView || metadataCount.ocId == metadata.ocId {
-                metadatas[index] = metadata
-                return index
+                metadatas[row] = metadata
+                let section = getSection(metadata: metadata)
+                return IndexPath(row: row, section: section)
             }
-            index += 1
+            row += 1
         }
 
         // Append & rebuild
         metadatas.append(metadata)
         createMetadatas(metadatasSource: metadatas)
 
-        return getIndexMetadata(ocId: metadata.ocId)
+        return getIndexPathMetadata(ocId: metadata.ocId)
     }
 
-    func getIndexMetadata(ocId: String) -> Int? {
+    func getIndexPathMetadata(ocId: String) -> IndexPath? {
 
-        var index: Int = 0
+        var row: Int = 0
 
-        for metadataCount in metadatas {
-            if metadataCount.ocId == ocId {
-                return index
+        for metadata in self.metadatas {
+            if metadata.ocId == ocId {
+                let section = getSection(metadata: metadata)
+                return IndexPath(row: row, section: section)
             }
-            index += 1
+            row += 1
         }
 
         return nil
     }
 
-    func numberOfItems() -> Int {
+    func numberOfSections() -> Int {
+
+        if sections.count == 0 {
+            return 1
+        } else {
+            return sections.count
+        }
+    }
+    
+    func numberOfItemsInSection(_ section: Int) -> Int {
+
+        if self.sections.count == 0 || metadatas.count == 0 { return 0 }
+        let sectionName = self.sections[section]
+        let metadatas = self.metadatas.filter({ getSectionField(metadata: $0) == sectionName})
 
         return metadatas.count
     }
@@ -250,6 +269,8 @@ class NCDataSource: NSObject {
     func cellForItemAt(indexPath: IndexPath) -> tableMetadata? {
 
         let row = indexPath.row
+        let sectionName = self.sections[indexPath.section]
+        let metadatas = self.metadatas.filter({ getSectionField(metadata: $0) == sectionName})
 
         if row > metadatas.count - 1 {
             return nil
@@ -257,4 +278,20 @@ class NCDataSource: NSObject {
             return metadatas[row]
         }
     }
+
+    internal func getSection(metadata: tableMetadata) -> Int {
+
+        let section = self.sections.firstIndex(where: {$0 == getSectionField(metadata: metadata)}) ?? 0
+        return section
+    }
+
+    internal func getSectionField(metadata: tableMetadata) -> String {
+        
+        switch self.groupByField {
+        case "name":
+            return metadata.name
+        default:
+            return metadata.name
+        }
+    }
 }

iOSClient/FileViewInFolder/NCFileViewInFolder.swift

@@ -98,12 +98,12 @@ 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 row = self.dataSource.getIndexMetadata(ocId: metadata.ocId) {
+                        if let indexPath = self.dataSource.getIndexPathMetadata(ocId: metadata.ocId) {
                             DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
                                 UIView.animate(withDuration: 0.3) {
-                                    self.collectionView.scrollToItem(at: IndexPath(row: row, section: 0), at: .centeredVertically, animated: false)
+                                    self.collectionView.scrollToItem(at: indexPath, at: .centeredVertically, animated: false)
                                 } completion: { _ in
-                                    if let cell = self.collectionView.cellForItem(at: IndexPath(row: row, section: 0)) {
+                                    if let cell = self.collectionView.cellForItem(at: indexPath) {
                                         cell.backgroundColor = .darkGray
                                         UIView.animate(withDuration: 2) {
                                             cell.backgroundColor = .clear

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -364,8 +364,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
             } else if fileNameView.lowercased() == NCGlobal.shared.fileNameRichWorkspace.lowercased() {
                 reloadDataSourceNetwork(forced: true)
             } else {
-                if let row = dataSource.deleteMetadata(ocId: ocId) {
-                    let indexPath = IndexPath(row: row, section: 0)
+                if let indexPath = dataSource.deleteMetadata(ocId: ocId) {
                     collectionView?.performBatchUpdates({
                         collectionView?.deleteItems(at: [indexPath])
                     }, completion: { _ in
@@ -381,8 +380,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         if let userInfo = notification.userInfo as NSDictionary?, let ocId = userInfo["ocId"] as? String, let serverUrlFrom = userInfo["serverUrlFrom"] as? String, let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) {
             // DEL
             if serverUrlFrom == serverUrl && metadata.account == appDelegate.account {
-                if let row = dataSource.deleteMetadata(ocId: ocId) {
-                    let indexPath = IndexPath(row: row, section: 0)
+                if let indexPath = dataSource.deleteMetadata(ocId: ocId) {
                     collectionView?.performBatchUpdates({
                         collectionView?.deleteItems(at: [indexPath])
                     }, completion: { _ in
@@ -391,8 +389,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
                 }
                 // ADD
             } else if metadata.serverUrl == serverUrl && metadata.account == appDelegate.account {
-                if let row = dataSource.addMetadata(metadata) {
-                    let indexPath = IndexPath(row: row, section: 0)
+                if let indexPath = dataSource.addMetadata(metadata) {
                     collectionView?.performBatchUpdates({
                         collectionView?.insertItems(at: [indexPath])
                     }, completion: { _ in
@@ -431,7 +428,7 @@ 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.getIndexMetadata(ocId: metadata.ocId) != nil {
+            if dataSource.getIndexPathMetadata(ocId: metadata.ocId) != nil {
                 reloadDataSource()
             }
         }
@@ -440,8 +437,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
     @objc func downloadStartFile(_ notification: NSNotification) {
 
         if let userInfo = notification.userInfo as NSDictionary?, let ocId = userInfo["ocId"] as? String, let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) {
-            if let row = dataSource.reloadMetadata(ocId: metadata.ocId) {
-                let indexPath = IndexPath(row: row, section: 0)
+            if let indexPath = dataSource.reloadMetadata(ocId: metadata.ocId) {
                 if indexPath.section < collectionView.numberOfSections && indexPath.row < collectionView.numberOfItems(inSection: indexPath.section) {
                     collectionView?.reloadItems(at: [indexPath])
                 }
@@ -455,9 +451,8 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
               let ocId = userInfo["ocId"] as? String,
               let _ = userInfo["errorCode"] as? Int,
               let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId),
-              let row = dataSource.reloadMetadata(ocId: metadata.ocId)
+              let indexPath = dataSource.reloadMetadata(ocId: metadata.ocId)
         else { return }
-        let indexPath = IndexPath(row: row, section: 0)
         if indexPath.section < collectionView.numberOfSections && indexPath.row < collectionView.numberOfItems(inSection: indexPath.section) {
             collectionView?.reloadItems(at: [indexPath])
         }
@@ -466,8 +461,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
     @objc func downloadCancelFile(_ notification: NSNotification) {
 
         if let userInfo = notification.userInfo as NSDictionary?, let ocId = userInfo["ocId"] as? String, let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) {
-            if let row = dataSource.reloadMetadata(ocId: metadata.ocId) {
-                let indexPath = IndexPath(row: row, section: 0)
+            if let indexPath = dataSource.reloadMetadata(ocId: metadata.ocId) {
                 if indexPath.section < collectionView.numberOfSections && indexPath.row < collectionView.numberOfItems(inSection: indexPath.section) {
                     collectionView?.reloadItems(at: [indexPath])
                 }
@@ -500,8 +494,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         if let userInfo = notification.userInfo as NSDictionary?, let ocId = userInfo["ocId"] as? String, let serverUrl = userInfo["serverUrl"] as? String, let account = userInfo["account"] as? String {
 
             if serverUrl == self.serverUrl && account == appDelegate.account {
-                if let row = dataSource.deleteMetadata(ocId: ocId) {
-                    let indexPath = IndexPath(row: row, section: 0)
+                if let indexPath = dataSource.deleteMetadata(ocId: ocId) {
                     collectionView?.performBatchUpdates({
                         if indexPath.section < (collectionView?.numberOfSections ?? 0) && indexPath.row < (collectionView?.numberOfItems(inSection: indexPath.section) ?? 0) {
                             collectionView?.deleteItems(at: [indexPath])
@@ -522,8 +515,8 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
 
             let status = userInfo["status"] as? Int ?? NCGlobal.shared.metadataStatusNormal
 
-            if let index = dataSource.getIndexMetadata(ocId: ocId) {
-                if let cell = collectionView?.cellForItem(at: IndexPath(row: index, section: 0)) {
+            if let indexPath = dataSource.getIndexPathMetadata(ocId: ocId) {
+                if let cell = collectionView?.cellForItem(at: indexPath) {
                     if cell is NCListCell {
                         let cell = cell as! NCListCell
                         if progressNumber.floatValue == 1 {
@@ -1384,11 +1377,11 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
     }
 
     func numberOfSections(in collectionView: UICollectionView) -> Int {
-        return 1
+        return dataSource.numberOfSections()
     }
 
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        let numberItems = dataSource.numberOfItems()
+        let numberItems = dataSource.numberOfItemsInSection(section)
         emptyDataSet?.numberOfItemsInSection(numberItems, section: section)
         return numberItems
     }

iOSClient/Select/NCSelect.swift

@@ -420,11 +420,11 @@ extension NCSelect: UICollectionViewDataSource {
     }
 
     func numberOfSections(in collectionView: UICollectionView) -> Int {
-        return 1
+        return dataSource.numberOfSections()
     }
 
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        let numberOfItems = dataSource.numberOfItems()
+        let numberOfItems = dataSource.numberOfItemsInSection(section)
         emptyDataSet?.numberOfItemsInSection(numberOfItems, section: section)
         return numberOfItems
     }