Improvements images

Brand/Database.swift

@@ -26,4 +26,4 @@ import Foundation
 // Database Realm
 //
 let databaseName                    = "nextcloud.realm"
-let databaseSchemaVersion: UInt64   = 358
+let databaseSchemaVersion: UInt64   = 359

iOSClient/Data/NCManageDatabase+Metadata.swift

@@ -75,6 +75,7 @@ class tableMetadata: Object {
     @objc dynamic var edited: Bool = false
     @objc dynamic var etag = ""
     @objc dynamic var etagResource = ""
+    let exifPhotos = List<NCKeyValue>()
     @objc dynamic var favorite: Bool = false
     @objc dynamic var fileId = ""
     @objc dynamic var fileName = ""
@@ -102,6 +103,7 @@ class tableMetadata: Object {
     @objc public var lockTimeOut: Date?
     @objc dynamic var path = ""
     @objc dynamic var permissions = ""
+    @objc dynamic var placePhotos: String?
     @objc dynamic var quotaUsedBytes: Int64 = 0
     @objc dynamic var quotaAvailableBytes: Int64 = 0
     @objc dynamic var resourceType = ""
@@ -353,6 +355,14 @@ extension NCManageDatabase {
         metadata.downloadURL = file.downloadURL
         metadata.e2eEncrypted = file.e2eEncrypted
         metadata.etag = file.etag
+        for dict in file.exifPhotos {
+            for (key, value) in dict {
+                let keyValue = NCKeyValue()
+                keyValue.key = key
+                keyValue.value = value
+                metadata.exifPhotos.append(keyValue)
+            }
+        }
         metadata.favorite = file.favorite
         metadata.fileId = file.fileId
         metadata.fileName = file.fileName
@@ -376,6 +386,7 @@ extension NCManageDatabase {
         metadata.lockTimeOut = file.lockTimeOut
         metadata.path = file.path
         metadata.permissions = file.permissions
+        metadata.placePhotos = file.placePhotos
         metadata.quotaUsedBytes = file.quotaUsedBytes
         metadata.quotaAvailableBytes = file.quotaAvailableBytes
         metadata.richWorkspace = file.richWorkspace
@@ -998,7 +1009,7 @@ extension NCManageDatabase {
         do {
             let realm = try Realm()
             realm.refresh()
-            let results = realm.objects(tableMetadata.self).filter(predicate).sorted(byKeyPath: "datePhotosOriginal", ascending: false)
+            let results = realm.objects(tableMetadata.self).filter(predicate).sorted(byKeyPath: "date", ascending: false)
             return Array(results)
         } catch let error as NSError {
             NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Could not access database: \(error)")

iOSClient/Data/NCManageDatabase.swift

@@ -41,7 +41,7 @@ class NCManageDatabase: NSObject {
 
     override init() {
         func migrationSchema(_ migration: Migration, _ oldSchemaVersion: UInt64) {
-            if oldSchemaVersion < 358 {
+            if oldSchemaVersion < 359 {
                 migration.deleteData(forType: tableMetadata.className())
                 migration.enumerateObjects(ofType: tableDirectory.className()) { _, newObject in
                     newObject?["etag"] = ""
@@ -267,3 +267,8 @@ class NCManageDatabase: NSObject {
         setAccountUserProfile(account: account2, userProfile: userProfile2)
     }
 }
+
+class NCKeyValue: Object {
+    @Persisted var key: String = ""
+    @Persisted var value: String? = nil
+}

iOSClient/Media/NCMedia+CollectionViewDataSource.swift

@@ -30,7 +30,7 @@ extension NCMedia: UICollectionViewDataSource {
         if kind == mediaSectionHeader {
             guard let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionFirstHeaderEmptyData", for: indexPath) as? NCSectionFirstHeaderEmptyData else { return NCSectionFirstHeaderEmptyData() }
             header.emptyImage.image = utility.loadImage(named: "photo", colors: [NCBrandColor.shared.getElement(account: session.account)])
-            if loadingTask != nil || imageCache.createCacheInProgress {
+            if self.hasRun || imageCache.createCacheInProgress {
                 header.emptyTitle.text = NSLocalizedString("_search_in_progress_", comment: "")
             } else {
                 header.emptyTitle.text = NSLocalizedString("_tutorial_photo_view_", comment: "")

iOSClient/Media/NCMedia.swift

@@ -35,6 +35,9 @@ class NCMedia: UIViewController {
     @IBOutlet weak var menuButton: UIButton!
     @IBOutlet weak var gradientView: UIView!
 
+    let lockQueue = DispatchQueue(label: "com.nextcloud.mediasearch.lockqueue")
+    var hasRun: Bool = false
+
     let layout = NCMediaLayout()
     var layoutType = NCGlobal.shared.mediaLayoutRatio
     var documentPickerViewController: NCDocumentPickerViewController?
@@ -46,7 +49,6 @@ class NCMedia: UIViewController {
     var dataSource = NCMediaDataSource()
     var serverUrl = ""
     let refreshControl = UIRefreshControl()
-    var loadingTask: Task<Void, any Error>?
     let taskDescriptionRetrievesProperties = "retrievesProperties"
     var isTop: Bool = true
     var isEditMode = false
@@ -127,20 +129,27 @@ class NCMedia: UIViewController {
         collectionView.refreshControl = refreshControl
         refreshControl.action(for: .valueChanged) { _ in
             self.reloadDataSource()
-            self.refreshControl.endRefreshing()
         }
 
         NotificationCenter.default.addObserver(forName: NSNotification.Name(rawValue: NCGlobal.shared.notificationCenterChangeUser), object: nil, queue: nil) { _ in
             self.layoutType = self.database.getLayoutForView(account: self.session.account, key: NCGlobal.shared.layoutViewMedia, serverUrl: "")?.layout ?? NCGlobal.shared.mediaLayoutRatio
             self.reloadDataSource()
+            self.searchMediaUI(true)
+        }
+
+        NotificationCenter.default.addObserver(forName: NSNotification.Name(rawValue: NCGlobal.shared.notificationCenterClearCache), object: nil, queue: nil) { _ in
+            self.dataSource.removeAll()
+            self.searchMediaUI(true)
         }
     }
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
 
         navigationController?.setMediaAppreance()
-        reloadDataSource()
+        if dataSource.isEmpty() {
+            reloadDataSource()
+        }
     }
 
     override func viewDidAppear(_ animated: Bool) {
@@ -152,7 +161,7 @@ class NCMedia: UIViewController {
         NotificationCenter.default.addObserver(self, selector: #selector(enterForeground(_:)), name: UIApplication.willEnterForegroundNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(uploadedFile(_:)), name: NSNotification.Name(rawValue: NCGlobal.shared.notificationCenterUploadedFile), object: nil)
 
-        startTimer()
+        searchMediaUI()
         createMenu()
     }
 
@@ -204,13 +213,13 @@ class NCMedia: UIViewController {
         gradient.frame = gradientView.bounds
     }
 
-    func startTimer() {
+    func searchNewMedia() {
         // don't start if media chage is in progress
         if imageCache.createCacheInProgress {
             return
         }
         timerSearchNewMedia?.invalidate()
-        timerSearchNewMedia = Timer.scheduledTimer(timeInterval: timeIntervalSearchNewMedia, target: self, selector: #selector(searchMediaUI), userInfo: nil, repeats: false)
+        timerSearchNewMedia = Timer.scheduledTimer(timeInterval: timeIntervalSearchNewMedia, target: self, selector: #selector(searchMediaUI(_:)), userInfo: nil, repeats: false)
     }
 
     // MARK: - NotificationCenter
@@ -221,15 +230,15 @@ class NCMedia: UIViewController {
               let error = userInfo["error"] as? NKError else { return }
 
         dataSource.removeMetadata(ocId)
-        self.collectionViewReloadData()
+        collectionView.reloadData()
 
         if error != .success {
             NCContentPresenter().showError(error: error)
         }
     }
 
     @objc func enterForeground(_ notification: NSNotification) {
-        startTimer()
+        searchNewMedia()
     }
 
     @objc func uploadedFile(_ notification: NSNotification) {
@@ -239,8 +248,8 @@ class NCMedia: UIViewController {
 
         if error == .success, let metadata = database.getMetadataFromOcId(ocId),
            metadata.isImageOrVideo {
-            self.dataSource.addMetadata(metadata)
-            self.collectionViewReloadData()
+            dataSource.addMetadata(metadata)
+            collectionView.reloadData()
         }
     }
 
@@ -347,13 +356,13 @@ extension NCMedia: UIScrollViewDelegate {
     func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) {
         if !decelerate {
             if !decelerate {
-                startTimer()
+                searchNewMedia()
             }
         }
     }
 
     func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) {
-        startTimer()
+        searchNewMedia()
     }
 
     func scrollViewDidScrollToTop(_ scrollView: UIScrollView) {
@@ -371,6 +380,6 @@ extension NCMedia: NCSelectDelegate {
         let mediaPath = serverUrl.replacingOccurrences(of: home, with: "")
         database.setAccountMediaPath(mediaPath, account: session.account)
         reloadDataSource()
-        startTimer()
+        searchNewMedia()
     }
 }

iOSClient/Media/NCMediaDataSource.swift

@@ -26,10 +26,14 @@ import NextcloudKit
 
 extension NCMedia {
     func reloadDataSource() {
-        DispatchQueue.global(qos: .userInteractive).async {
+        DispatchQueue.global().async {
             let metadatas = self.database.getResultsMediaMetadatas(predicate: self.getPredicate())
             self.dataSource = NCMediaDataSource(metadatas: metadatas)
-            self.collectionViewReloadData()
+            DispatchQueue.main.async {
+                self.collectionView.reloadData()
+                self.refreshControl.endRefreshing()
+                self.setTitleDate()
+            }
         }
     }
 
@@ -42,79 +46,77 @@ extension NCMedia {
 
     // MARK: - Search media
 
-    @objc func searchMediaUI() {
-        guard loadingTask == nil,
-              !isEditMode,
-              self.viewIfLoaded?.window != nil,
-              let visibleCells = self.collectionView?.indexPathsForVisibleItems.sorted(by: { $0.row < $1.row }).compactMap({ self.collectionView?.cellForItem(at: $0) }),
-              let tableAccount = database.getTableAccount(predicate: NSPredicate(format: "account == %@", session.account))
-        else {
-            return
-        }
-
-        var lessDate: Date?
-        var greaterDate: Date?
-        let firstMetadataDate = dataSource.getMetadatas().first?.date
-        let lastMetadataDate = dataSource.getMetadatas().last?.date
-        let countMetadatas = dataSource.getMetadatas().count
+    @objc func searchMediaUI(_ distant: Bool = false) {
+        self.lockQueue.sync {
+            guard !self.hasRun,
+                  !isEditMode,
+                  let tableAccount = database.getTableAccount(predicate: NSPredicate(format: "account == %@", session.account))
+            else { return }
+            self.hasRun = true
+
+            var lessDate = Date.distantFuture
+            var greaterDate = Date.distantPast
+            let firstMetadataDate = dataSource.getMetadatas().first?.date
+            let lastMetadataDate = dataSource.getMetadatas().last?.date
+            let countMetadatas = dataSource.getMetadatas().count
+            var limit = 300
+            let options = NKRequestOptions(timeout: 120, taskDescription: self.taskDescriptionRetrievesProperties, queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)
+
+            if let visibleCells = self.collectionView?.indexPathsForVisibleItems.sorted(by: { $0.row < $1.row }).compactMap({ self.collectionView?.cellForItem(at: $0) }), !distant {
+
+                // first date
+                let firstCellDate = (visibleCells.first as? NCGridMediaCell)?.date
+                if firstCellDate == firstMetadataDate {
+                    lessDate = Date.distantFuture
+                } else {
+                    if let date = firstCellDate {
+                        lessDate = Calendar.current.date(byAdding: .second, value: 1, to: date)!
+                    } else {
+                        lessDate = Date.distantFuture
+                    }
+                }
 
-        // first date
-        let firstCellDate = (visibleCells.first as? NCGridMediaCell)?.date
-        if firstCellDate == firstMetadataDate {
-            lessDate = Date.distantFuture
-        } else {
-            if let date = firstCellDate {
-                lessDate = Calendar.current.date(byAdding: .second, value: 1, to: date)!
-            } else {
-                lessDate = Date.distantFuture
+                // last date
+                let lastCellDate = (visibleCells.last as? NCGridMediaCell)?.date
+                if lastCellDate == lastMetadataDate {
+                    greaterDate = Date.distantPast
+                } else {
+                    if let date = lastCellDate {
+                        greaterDate = Calendar.current.date(byAdding: .second, value: -1, to: date)!
+                    } else {
+                        greaterDate = Date.distantPast
+                    }
+                }
             }
-        }
-        // last date
-        let lastCellDate = (visibleCells.last as? NCGridMediaCell)?.date
-        if lastCellDate == lastMetadataDate {
-            greaterDate = Date.distantPast
-        } else {
-            if let date = lastCellDate {
-                greaterDate = Calendar.current.date(byAdding: .second, value: -1, to: date)!
-            } else {
-                greaterDate = Date.distantPast
+
+            if countMetadatas == 0 { self.collectionViewReloadData() }
+            if self.collectionView.visibleCells.count * 2 > limit {
+                limit = self.collectionView.visibleCells.count * 2
             }
-        }
 
-        if lessDate == Date.distantFuture,
-           greaterDate == Date.distantPast,
-           countMetadatas > visibleCells.count {
-            NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Media search new media oops. something is bad (distantFuture, distantPast): \(countMetadatas)")
-            return
-        }
+            NextcloudKit.shared.nkCommonInstance.writeLog("[DEBUG] Start searchMedia with lessDate \(lessDate), greaterDate \(greaterDate) with limit \(limit)")
 
-        if let lessDate, let greaterDate {
             activityIndicator.startAnimating()
-            loadingTask = Task.detached {
-                if countMetadatas == 0 {
-                    await self.collectionViewReloadData()
-                }
-
-                var limit = 300
-                if await self.collectionView.visibleCells.count * 2 > limit {
-                    limit = await self.collectionView.visibleCells.count * 2
-                }
 
-                NextcloudKit.shared.nkCommonInstance.writeLog("[DEBUG] Start searchMedia with lessDate \(lessDate), greaterDate \(greaterDate) with limit \(limit)")
+            NextcloudKit.shared.searchMedia(path: tableAccount.mediaPath,
+                                            lessDate: lessDate,
+                                            greaterDate: greaterDate,
+                                            elementDate: "d:getlastmodified/",
+                                            limit: limit,
+                                            showHiddenFiles: NCKeychain().showHiddenFiles,
+                                            account: self.session.account,
+                                            options: options) { account, files, _, error in
+                if error == .success, let files, self.session.account == account {
 
-                let options = NKRequestOptions(timeout: 120, taskDescription: self.taskDescriptionRetrievesProperties, queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)
-                let results = await NCNetworking.shared.searchMedia(path: tableAccount.mediaPath, lessDate: lessDate, greaterDate: greaterDate, elementDate: "d:getlastmodified/", limit: limit, showHiddenFiles: NCKeychain().showHiddenFiles, account: self.session.account, options: options)
-
-                if results.error == .success, let files = results.files {
                     var predicate = NSPredicate(format: "date > %@ AND date < %@", greaterDate as NSDate, lessDate as NSDate)
-                    predicate = await NSCompoundPredicate(andPredicateWithSubpredicates: [predicate, self.getPredicate(showAll: true)])
+                    predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [predicate, self.getPredicate(showAll: true)])
+
+                    self.database.convertFilesToMetadatas(files, useFirstAsMetadataFolder: false) { _, metadatas in
+                        let resultsUpdate = self.database.updateMetadatas(metadatas, predicate: predicate)
+                        let isChanged: Bool = (resultsUpdate.metadatasDifferentCount != 0 || resultsUpdate.metadatasModified != 0)
 
-                    let metadatas = await self.database.convertFilesToMetadatas(files, useFirstAsMetadataFolder: false).metadatas
-                    let resultsUpdate = self.database.updateMetadatas(metadatas, predicate: predicate)
-                    let isChanged: Bool = (resultsUpdate.metadatasDifferentCount != 0 || resultsUpdate.metadatasModified != 0)
-                    NextcloudKit.shared.nkCommonInstance.writeLog("[DEBUG] End searchMedia UpdateMetadatas with differentCount \(resultsUpdate.metadatasDifferentCount), modified \(resultsUpdate.metadatasModified)")
+                        NextcloudKit.shared.nkCommonInstance.writeLog("[DEBUG] End searchMedia UpdateMetadatas with differentCount \(resultsUpdate.metadatasDifferentCount), modified \(resultsUpdate.metadatasModified)")
 
-                    Task { @MainActor in
                         if lessDate == Date.distantFuture, greaterDate == Date.distantPast, !isChanged, metadatas.count == 0 {
                             self.dataSource.removeAll()
                             self.collectionViewReloadData()
@@ -126,15 +128,13 @@ extension NCMedia {
                             print("searchMediaUI: nothing")
                         }
                     }
-
                 } else {
-                    NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Media search new media error code \(results.error.errorCode) " + results.error.errorDescription)
+                    NextcloudKit.shared.nkCommonInstance.writeLog("[ERROR] Media search new media error code \(error.errorCode) " + error.errorDescription)
                 }
-
-                Task { @MainActor in
-                    self.loadingTask = nil
+                DispatchQueue.main.async {
                     self.activityIndicator.stopAnimating()
                 }
+                self.hasRun = false
             }
         }
     }
@@ -210,6 +210,7 @@ public class NCMediaDataSource: NSObject {
 
     init(metadatas: [tableMetadata]) {
         super.init()
+        self.metadatas.removeAll()
         for metadata in metadatas {
             appendMetadata(metadata)
         }

iOSClient/NCGlobal.swift

@@ -293,6 +293,7 @@ class NCGlobal: NSObject {
     let notificationCenterReloadDataNCShare                     = "reloadDataNCShare"
     let notificationCenterCloseRichWorkspaceWebView             = "closeRichWorkspaceWebView"
     let notificationCenterReloadAvatar                          = "reloadAvatar"
+    let notificationCenterClearCache                            = "clearCache"
 
     let notificationCenterReloadDataSource                      = "reloadDataSource"
     let notificationCenterReloadDataSourceNetwork               = "reloadDataSourceNetwork"         // userInfo: withQueryDB