From 6a3fb3c566354378afad61f899718c7f8a38b365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=92=E6=99=B6=E6=99=B6?= <maojingjing1@huawei.com>
Date: Sat, 9 Dec 2023 10:04:38 +0000
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!879=20:?=
 =?UTF-8?q?=20modify=20update=20all=20albums'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gallery_data_sync/file_data_handler.h      |  2 ++
 .../gallery_data_sync/file_data_handler.cpp    | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/services/cloudsyncservice/include/data_sync/gallery_data_sync/file_data_handler.h b/services/cloudsyncservice/include/data_sync/gallery_data_sync/file_data_handler.h
index 1043d57fc..0d6535158 100644
--- a/services/cloudsyncservice/include/data_sync/gallery_data_sync/file_data_handler.h
+++ b/services/cloudsyncservice/include/data_sync/gallery_data_sync/file_data_handler.h
@@ -79,6 +79,8 @@ public:
     int32_t UpdateAgingFile(const std::string cloudId);
     int32_t FileAgingDelete(const int64_t agingTime, const int64_t deleteSize);
 
+    void UpdateAlbumInternal();
+
     /* reset */
     void Reset();
 
diff --git a/services/cloudsyncservice/src/data_sync/gallery_data_sync/file_data_handler.cpp b/services/cloudsyncservice/src/data_sync/gallery_data_sync/file_data_handler.cpp
index fc51a253f..0bad8dde3 100644
--- a/services/cloudsyncservice/src/data_sync/gallery_data_sync/file_data_handler.cpp
+++ b/services/cloudsyncservice/src/data_sync/gallery_data_sync/file_data_handler.cpp
@@ -327,7 +327,7 @@ int32_t FileDataHandler::OnFetchRecords(shared_ptr<vector<DKRecord>> &records, O
             BatchInsertAssetMaps(params);
         }
     }
-    MediaLibraryRdbUtils::UpdateAllAlbums(GetRaw());
+    UpdateAlbumInternal();
     LOGI("after BatchInsert ret %{public}d", ret);
     DataSyncNotifier::GetInstance().TryNotify(PHOTO_URI_PREFIX, ChangeType::INSERT,
                                               INVALID_ASSET_ID);
@@ -1041,7 +1041,7 @@ int32_t FileDataHandler::OnDownloadAssets(const map<DKDownloadAsset, DKDownloadR
         }
     }
 
-    MediaLibraryRdbUtils::UpdateAllAlbums(GetRaw());
+    UpdateAlbumInternal();
     return E_OK;
 }
 
@@ -1065,7 +1065,7 @@ int32_t FileDataHandler::OnDownloadAssets(const DKDownloadAsset &asset)
     }
 
     DentryRemoveThumb(asset.downLoadPath + "/" + asset.asset.assetName);
-    MediaLibraryRdbUtils::UpdateAllAlbums(GetRaw());
+    UpdateAlbumInternal();
     MetaFileMgr::GetInstance().ClearAll();
     return E_OK;
 }
@@ -1136,6 +1136,12 @@ static bool LocalWriteOpen(const string &dfsPath)
     return writeOpenCnt != 0;
 }
 
+void FileDataHandler::UpdateAlbumInternal()
+{
+    MediaLibraryRdbUtils::UpdateSystemAlbumInternal(GetRaw());
+    MediaLibraryRdbUtils::UpdateUserAlbumInternal(GetRaw());
+}
+
 int FileDataHandler::SetRetry(const string &recordId)
 {
     LOGI("set retry of record %s", recordId.c_str());
@@ -1802,7 +1808,7 @@ int32_t FileDataHandler::Clean(const int action)
         LOGE("Clean remove dentry failed, res:%{public}d", res);
         return res;
     }
-    MediaLibraryRdbUtils::UpdateAllAlbums(GetRaw());
+    UpdateAlbumInternal();
     DataSyncNotifier::GetInstance().TryNotify(PHOTO_URI_PREFIX, ChangeType::INSERT,
                                               INVALID_ASSET_ID);
     DataSyncNotifier::GetInstance().FinalNotify();
@@ -1937,7 +1943,7 @@ int32_t FileDataHandler::UnMarkClean()
     int32_t ret =
         Update(changedRows, PC::PHOTOS_TABLE, values,
         PC::PHOTO_CLEAN_FLAG + " = ?", whereArgs);
-    MediaLibraryRdbUtils::UpdateAllAlbums(GetRaw());
+    UpdateAlbumInternal();
     DataSyncNotifier::GetInstance().TryNotify(PHOTO_URI_PREFIX, ChangeType::INSERT,
                                               INVALID_ASSET_ID);
     DataSyncNotifier::GetInstance().FinalNotify();
@@ -1959,7 +1965,7 @@ int32_t FileDataHandler::MarkClean(const int32_t action)
     }
     int32_t ret =
         Update(changedRows, PC::PHOTOS_TABLE, values, whereClause, whereArgs);
-    MediaLibraryRdbUtils::UpdateAllAlbums(GetRaw());
+    UpdateAlbumInternal();
     DataSyncNotifier::GetInstance().TryNotify(PHOTO_URI_PREFIX, ChangeType::INSERT,
                                               INVALID_ASSET_ID);
     DataSyncNotifier::GetInstance().FinalNotify();
-- 
Gitee