speed up parseAndSaveShares

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

app/src/main/java/com/nextcloud/utils/extensions/FileDataStorageManagerExtensions.kt

@@ -15,7 +15,7 @@ import kotlinx.coroutines.withContext
 
 suspend fun FileDataStorageManager.saveShares(shares: List<OCShare>, accountName: String) {
     withContext(Dispatchers.IO) {
-        //shareDao.clearSharesForAccount(accountName)
+        // shareDao.clearSharesForAccount(accountName)
 
         val entities = shares.map { share ->
             share.toEntity(accountName)
@@ -25,7 +25,6 @@ suspend fun FileDataStorageManager.saveShares(shares: List<OCShare>, accountName
     }
 }
 
-
 fun FileDataStorageManager.searchFilesByName(file: OCFile, accountName: String, query: String): List<OCFile> =
     fileDao.searchFilesInFolder(file.fileId, accountName, query).map {
         createFileInstance(it)

app/src/main/java/com/nextcloud/utils/extensions/OCShareExtensions.kt

@@ -14,30 +14,28 @@ fun OCShare.hasFileRequestPermission(): Boolean = (isFolder && shareType?.isPubl
 
 fun List<OCShare>.mergeDistinctByToken(other: List<OCShare>): List<OCShare> = (this + other).distinctBy { it.token }
 
-fun OCShare.toEntity(accountName: String): ShareEntity {
-    return ShareEntity(
-        id = remoteId.toInt(), // so that db is not keep updating same files
-        idRemoteShared = remoteId.toInt(),
-        path = path,
-        itemSource = itemSource.toInt(),
-        fileSource = fileSource.toInt(),
-        shareType = shareType?.value,
-        shareWith = shareWith,
-        permissions = permissions,
-        sharedDate = sharedDate.toInt(),
-        expirationDate = expirationDate.toInt(),
-        token = token,
-        shareWithDisplayName = sharedWithDisplayName,
-        isDirectory = if (isFolder) 1 else 0,
-        userId = userId,
-        accountOwner = accountName,
-        isPasswordProtected = if (isPasswordProtected) 1 else 0,
-        note = note,
-        hideDownload = if (isHideFileDownload) 1 else 0,
-        shareLink = shareLink,
-        shareLabel = label,
-        attributes = attributes,
-        downloadLimitLimit = fileDownloadLimit?.limit,
-        downloadLimitCount = fileDownloadLimit?.count
-    )
-}
+fun OCShare.toEntity(accountName: String): ShareEntity = ShareEntity(
+    id = remoteId.toInt(), // so that db is not keep updating same files
+    idRemoteShared = remoteId.toInt(),
+    path = path,
+    itemSource = itemSource.toInt(),
+    fileSource = fileSource.toInt(),
+    shareType = shareType?.value,
+    shareWith = shareWith,
+    permissions = permissions,
+    sharedDate = sharedDate.toInt(),
+    expirationDate = expirationDate.toInt(),
+    token = token,
+    shareWithDisplayName = sharedWithDisplayName,
+    isDirectory = if (isFolder) 1 else 0,
+    userId = userId,
+    accountOwner = accountName,
+    isPasswordProtected = if (isPasswordProtected) 1 else 0,
+    note = note,
+    hideDownload = if (isHideFileDownload) 1 else 0,
+    shareLink = shareLink,
+    shareLabel = label,
+    attributes = attributes,
+    downloadLimitLimit = fileDownloadLimit?.limit,
+    downloadLimitCount = fileDownloadLimit?.count
+)

app/src/main/java/com/owncloud/android/ui/adapter/OCShareToOCFileConverter.kt

@@ -45,6 +45,7 @@ object OCShareToOCFileConverter {
     }
 
     suspend fun parseAndSaveShares(
+        cachedFiles: List<OCFile>,
         data: List<Any>,
         storageManager: FileDataStorageManager?,
         accountName: String
@@ -58,11 +59,27 @@ object OCShareToOCFileConverter {
             return@withContext emptyList()
         }
 
-        val files = buildOCFilesFromShares(shares)
+        val cachedPaths = cachedFiles.map { it.decryptedRemotePath }.toSet()
+
+        // Group shares by path to identify unique files
+        val sharesByPath = shares
+            .filter { it.path != null }
+            .groupBy { it.path!! }
+
+        // Identify ONLY new file paths that aren't in cache
+        val newSharesByPath = sharesByPath.filterKeys { path ->
+            path !in cachedPaths
+        }
+
+        if (newSharesByPath.isEmpty()) {
+            return@withContext cachedFiles
+        }
+
+        val newShares = newSharesByPath.values.flatten()
+        val newFiles = buildOCFilesFromShares(newShares)
         val baseSavePath = FileStorageUtils.getSavePath(accountName)
 
-        // Parallelized file lookup
-        val resolvedFiles = files.map { file ->
+        val resolvedNewFiles = newFiles.map { file ->
             async {
                 if (!file.isFolder && (file.storagePath == null || !File(file.storagePath).exists())) {
                     val fullPath = baseSavePath + file.decryptedRemotePath
@@ -77,12 +94,10 @@ object OCShareToOCFileConverter {
             }
         }.awaitAll()
 
-        storageManager?.saveShares(shares, accountName)
-
-        resolvedFiles
+        storageManager?.saveShares(newShares, accountName)
+        cachedFiles + resolvedNewFiles
     }
 
-
     private fun buildOcFile(path: String, shares: List<OCShare>): OCFile {
         require(shares.all { it.path == path })
         // common attributes

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt

@@ -95,6 +95,7 @@ class OCFileListSearchTask(
 
                 val newList = if (searchType == SearchType.SHARED_FILTER) {
                     OCShareToOCFileConverter.parseAndSaveShares(
+                        sortedFilesInDb,
                         result.resultData ?: listOf(),
                         fileDataStorageManager,
                         currentUser.accountName