From 324932807ccad638c8e3dffbd73d9b71cb8dd1a5 Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Tue, 22 Feb 2022 18:04:15 +0800 Subject: [PATCH 1/3] optimize code Signed-off-by: linjun9528 --- interfaces/kits/js/src/file_manager_napi.cpp | 4 ++-- services/src/client/file_manager_proxy.cpp | 20 +++++++++---------- services/src/client/file_manager_proxy.h | 4 ++-- services/src/client/ifms_client.h | 4 ++-- services/src/fileoper/cmd_response.h | 18 ++++++++--------- .../src/fileoper/external_storage_oper.cpp | 4 ++-- .../src/fileoper/external_storage_utils.cpp | 14 ++++++------- .../src/fileoper/external_storage_utils.h | 4 ++-- services/src/fileoper/media_file_oper.cpp | 2 +- services/src/fileoper/media_file_utils.cpp | 8 ++++---- services/src/fileoper/media_file_utils.h | 4 ++-- 11 files changed, 43 insertions(+), 43 deletions(-) diff --git a/interfaces/kits/js/src/file_manager_napi.cpp b/interfaces/kits/js/src/file_manager_napi.cpp index d1fbe730..b3a6765e 100644 --- a/interfaces/kits/js/src/file_manager_napi.cpp +++ b/interfaces/kits/js/src/file_manager_napi.cpp @@ -32,7 +32,7 @@ using namespace std; using namespace DistributedFS; struct AsyncFileInfoArg { NRef ref_; - vector> fileRes_; + vector> fileRes_; explicit AsyncFileInfoArg(NVal ref) : ref_(ref), fileRes_() {}; ~AsyncFileInfoArg() = default; }; @@ -182,7 +182,7 @@ void CreateFileArray(napi_env env, shared_ptr arg) { for (unsigned int i = 0; i < arg->fileRes_.size(); i++) { NVal obj = NVal::CreateObject(env); - unique_ptr &res = arg->fileRes_[i]; + shared_ptr &res = arg->fileRes_[i]; obj.AddProp("name", NVal::CreateUTF8String(env, res->GetName()).val_); obj.AddProp("path", NVal::CreateUTF8String(env, res->GetPath()).val_); obj.AddProp("type", NVal::CreateUTF8String(env, res->GetType()).val_); diff --git a/services/src/client/file_manager_proxy.cpp b/services/src/client/file_manager_proxy.cpp index 21ce6e18..9a275221 100644 --- a/services/src/client/file_manager_proxy.cpp +++ b/services/src/client/file_manager_proxy.cpp @@ -38,7 +38,7 @@ static int GetCmdResponse(MessageParcel &reply, sptr &cmdResponse) FileManagerProxy::FileManagerProxy(const sptr &impl) : IRemoteProxy(impl) {} -int FileManagerProxy::GetRoot(const CmdOptions &option, vector> &fileRes) +int FileManagerProxy::GetRoot(const CmdOptions &option, vector> &fileRes) { CmdOptions op(option); if (op.GetDevInfo().GetName() == "external_storage") { @@ -60,14 +60,14 @@ int FileManagerProxy::GetRoot(const CmdOptions &option, vectorGetFileInfoList(); return err; } else { - unique_ptr image = make_unique(IMAGE_ROOT_NAME, FISRT_LEVEL_ALBUM, ALBUM_TYPE); - fileRes.emplace_back(move(image)); - unique_ptr video = make_unique(VIDEO_ROOT_NAME, FISRT_LEVEL_ALBUM, ALBUM_TYPE); - fileRes.emplace_back(move(video)); - unique_ptr audio = make_unique(AUDIO_ROOT_NAME, FISRT_LEVEL_ALBUM, ALBUM_TYPE); - fileRes.emplace_back(move(audio)); - unique_ptr file = make_unique(FILE_ROOT_NAME, FISRT_LEVEL_ALBUM, ALBUM_TYPE); - fileRes.emplace_back(move(file)); + shared_ptr image = make_shared(IMAGE_ROOT_NAME, FISRT_LEVEL_ALBUM, ALBUM_TYPE); + fileRes.emplace_back(image); + shared_ptr video = make_shared(VIDEO_ROOT_NAME, FISRT_LEVEL_ALBUM, ALBUM_TYPE); + fileRes.emplace_back(video); + shared_ptr audio = make_shared(AUDIO_ROOT_NAME, FISRT_LEVEL_ALBUM, ALBUM_TYPE); + fileRes.emplace_back(audio); + shared_ptr file = make_shared(FILE_ROOT_NAME, FISRT_LEVEL_ALBUM, ALBUM_TYPE); + fileRes.emplace_back(file); return SUCCESS; } } @@ -116,7 +116,7 @@ IFmsClient *IFmsClient::GetFmsInstance() } int FileManagerProxy::ListFile(const std::string &type, const std::string &path, const CmdOptions &option, - std::vector> &fileRes) + std::vector> &fileRes) { MessageParcel data; CmdOptions op(option); diff --git a/services/src/client/file_manager_proxy.h b/services/src/client/file_manager_proxy.h index 085d3236..494648ed 100644 --- a/services/src/client/file_manager_proxy.h +++ b/services/src/client/file_manager_proxy.h @@ -29,10 +29,10 @@ public: virtual ~FileManagerProxy() = default; int Mkdir(const std::string &name, const std::string &path) override; int ListFile(const std::string &type, const std::string &path, const CmdOptions &option, - std::vector> &fileRes) override; + std::vector> &fileRes) override; int CreateFile(const std::string &path, const std::string &fileName, const CmdOptions &option, std::string &uri) override; - int GetRoot(const CmdOptions &option, std::vector> &fileRes) override; + int GetRoot(const CmdOptions &option, std::vector> &fileRes) override; private: static inline BrokerDelegator delegator_; }; diff --git a/services/src/client/ifms_client.h b/services/src/client/ifms_client.h index 386c4feb..ba0ce14a 100644 --- a/services/src/client/ifms_client.h +++ b/services/src/client/ifms_client.h @@ -24,8 +24,8 @@ public: static IFmsClient *GetFmsInstance(); virtual int Mkdir(const std::string &name, const std::string &path) = 0; virtual int ListFile(const std::string &type, const std::string &path, const CmdOptions &option, - std::vector> &fileRes) = 0; - virtual int GetRoot(const CmdOptions &option, std::vector> &fileRes) = 0; + std::vector> &fileRes) = 0; + virtual int GetRoot(const CmdOptions &option, std::vector> &fileRes) = 0; virtual int CreateFile(const std::string &path, const std::string &fileName, const CmdOptions &option, std::string &uri) = 0; }; diff --git a/services/src/fileoper/cmd_response.h b/services/src/fileoper/cmd_response.h index be55b7f8..09d1a1f2 100644 --- a/services/src/fileoper/cmd_response.h +++ b/services/src/fileoper/cmd_response.h @@ -26,8 +26,8 @@ namespace FileManagerService { class CmdResponse : public Parcelable { public: CmdResponse() = default; - CmdResponse(int &err, std::string &uri, std::vector> &fileInfoList) - : err_(err), uri_(uri), vecFileInfo_(move(fileInfoList)) + CmdResponse(int &err, std::string &uri, std::vector> &fileInfoList) + : err_(err), uri_(uri), vecFileInfo_(fileInfoList) {} ~CmdResponse() = default; @@ -51,14 +51,14 @@ public: return uri_; } - void SetFileInfoList(std::vector> &fileInfoList) + void SetFileInfoList(std::vector> &fileInfoList) { - vecFileInfo_ = move(fileInfoList); + vecFileInfo_ = fileInfoList; } - std::vector> GetFileInfoList() + std::vector> GetFileInfoList() { - return move(vecFileInfo_); + return vecFileInfo_; } virtual bool Marshalling(Parcel &parcel) const override @@ -83,15 +83,15 @@ public: obj->uri_ = parcel.ReadString(); int fileCount = parcel.ReadInt32(); for (int i = 0; i < fileCount; i++) { - std::unique_ptr file(parcel.ReadParcelable()); - obj->vecFileInfo_.emplace_back(move(file)); + std::shared_ptr file(parcel.ReadParcelable()); + obj->vecFileInfo_.emplace_back(file); } return obj; } private: int err_; std::string uri_; - std::vector> vecFileInfo_; + std::vector> vecFileInfo_; }; } // FileManagerService } // namespace OHOS diff --git a/services/src/fileoper/external_storage_oper.cpp b/services/src/fileoper/external_storage_oper.cpp index 780ab8ea..fd36754f 100644 --- a/services/src/fileoper/external_storage_oper.cpp +++ b/services/src/fileoper/external_storage_oper.cpp @@ -67,7 +67,7 @@ int ExternalStorageOper::OperProcess(uint32_t code, MessageParcel &data, Message int ExternalStorageOper::GetRoot(const std::string &name, const std::string &path, MessageParcel &reply) const { - std::vector> fileList; + std::vector> fileList; int ret = ExternalStorageUtils::DoGetRoot(name, path, fileList); CmdResponse cmdResponse; cmdResponse.SetErr(ret); @@ -90,7 +90,7 @@ int ExternalStorageOper::CreateFile(const std::string &uri, const std::string &n int ExternalStorageOper::ListFile(const std::string &type, const std::string &uri, const CmdOptions &option, MessageParcel &reply) const { - std::vector> fileList; + std::vector> fileList; int ret = ExternalStorageUtils::DoListFile(type, uri, option, fileList); CmdResponse cmdResponse; cmdResponse.SetErr(ret); diff --git a/services/src/fileoper/external_storage_utils.cpp b/services/src/fileoper/external_storage_utils.cpp index ed99964b..b1aed3d1 100644 --- a/services/src/fileoper/external_storage_utils.cpp +++ b/services/src/fileoper/external_storage_utils.cpp @@ -59,7 +59,7 @@ static bool GetRealPath(string &path) return true; } -static bool GetFileInfo(const std::string &path, const std::string &name, unique_ptr &fileInfo) +static bool GetFileInfo(const std::string &path, const std::string &name, shared_ptr &fileInfo) { std::string fullPath(path); size_t len = fullPath.size(); @@ -105,7 +105,7 @@ static bool ConvertUriToAbsolutePath(const std::string &uri, std::string &path) } int ExternalStorageUtils::DoListFile(const std::string &type, const std::string &uri, const CmdOptions &option, - std::vector> &fileList) + std::vector> &fileList) { int64_t count = option.GetCount(); int64_t offset = option.GetOffset(); @@ -141,11 +141,11 @@ int ExternalStorageUtils::DoListFile(const std::string &type, const std::string continue; } if (count > 0) { - unique_ptr fileInfo = make_unique(); + shared_ptr fileInfo = make_unique(); if (!GetFileInfo(path, ent->d_name, fileInfo)) { continue; } - fileList.push_back(move(fileInfo)); + fileList.push_back(fileInfo); count--; if (count == 0) { break; @@ -188,7 +188,7 @@ int ExternalStorageUtils::DoCreateFile(const std::string &uri, const std::string } int ExternalStorageUtils::DoGetRoot(const std::string &name, const std::string &path, - std::vector> &fileList) + std::vector> &fileList) { vector vecRootPath; if (!StorageManagerInf::GetMountedVolumes(vecRootPath)) { @@ -196,8 +196,8 @@ int ExternalStorageUtils::DoGetRoot(const std::string &name, const std::string & return FAIL; } for (auto rootPath : vecRootPath) { - unique_ptr fileInfo = make_unique(FILE_ROOT_NAME, rootPath, ALBUM_TYPE); - fileList.push_back(move(fileInfo)); + shared_ptr fileInfo = make_shared(FILE_ROOT_NAME, rootPath, ALBUM_TYPE); + fileList.push_back(fileInfo); } return SUCCESS; } diff --git a/services/src/fileoper/external_storage_utils.h b/services/src/fileoper/external_storage_utils.h index 56d17871..a975ba17 100644 --- a/services/src/fileoper/external_storage_utils.h +++ b/services/src/fileoper/external_storage_utils.h @@ -30,10 +30,10 @@ public: ExternalStorageUtils(); ~ExternalStorageUtils(); static int DoListFile(const std::string &type, const std::string &uri, const CmdOptions &option, - std::vector> &fileList); + std::vector> &fileList); static int DoCreateFile(const std::string &uri, const std::string &name, std::string &resultUri); static int DoGetRoot(const std::string &name, const std::string &path, - std::vector> &fileList); + std::vector> &fileList); }; } // namespace FileManagerService } // namespace OHOS diff --git a/services/src/fileoper/media_file_oper.cpp b/services/src/fileoper/media_file_oper.cpp index f9d1b730..3e9fd3fe 100644 --- a/services/src/fileoper/media_file_oper.cpp +++ b/services/src/fileoper/media_file_oper.cpp @@ -90,7 +90,7 @@ int MediaFileOper::ListFile(const string &type, const string &path, int offset, return res; } - std::vector> fileList; + std::vector> fileList; res = MediaFileUtils::GetFileInfoFromResult(result, fileList); CmdResponse cmdResponse; cmdResponse.SetErr(res); diff --git a/services/src/fileoper/media_file_utils.cpp b/services/src/fileoper/media_file_utils.cpp index 6ccc7f1b..9c4889f5 100644 --- a/services/src/fileoper/media_file_utils.cpp +++ b/services/src/fileoper/media_file_utils.cpp @@ -358,7 +358,7 @@ bool MediaFileUtils::InitMediaTableColIndexMap(shared_ptr result, - unique_ptr &fileInfo) + shared_ptr &fileInfo) { if (!InitMediaTableColIndexMap(result)) { ERR_LOG("InitMediaTableColIndexMap returns fail"); @@ -389,7 +389,7 @@ bool MediaFileUtils::GetFileInfo(shared_ptr resul } int MediaFileUtils::GetFileInfoFromResult(shared_ptr result, - std::vector> &fileList) + std::vector> &fileList) { int count = 0; result->GetRowCount(count); @@ -399,9 +399,9 @@ int MediaFileUtils::GetFileInfoFromResult(shared_ptrGoToFirstRow(); for (int i = 0; i < count; i++) { - unique_ptr fileInfo = make_unique(); + shared_ptr fileInfo = make_shared(); GetFileInfo(result, fileInfo); - fileList.push_back(move(fileInfo)); + fileList.push_back(fileInfo); result->GoToNextRow(); } return SUCCESS; diff --git a/services/src/fileoper/media_file_utils.h b/services/src/fileoper/media_file_utils.h index 18b8bca5..2bdfdfa1 100644 --- a/services/src/fileoper/media_file_utils.h +++ b/services/src/fileoper/media_file_utils.h @@ -40,9 +40,9 @@ public: static std::shared_ptr DoQuery(const std::string &selection, const std::vector &selectionArgs); static int DoInsert(const std::string &name, const std::string &path, const std::string &type, std::string &uri); - static bool GetFileInfo(std::shared_ptr result, std::unique_ptr &fileInfo); + static bool GetFileInfo(std::shared_ptr result, std::shared_ptr &fileInfo); static int GetFileInfoFromResult(std::shared_ptr result, - std::vector> &fileList); + std::vector> &fileList); static bool InitMediaTableColIndexMap(std::shared_ptr result); static bool InitHelper(sptr obj); private: -- Gitee From fed18b1bf848119340eed16aa23db93f178f721a Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Tue, 22 Feb 2022 18:22:47 +0800 Subject: [PATCH 2/3] optimize code Signed-off-by: linjun9528 --- services/test/client/file_manager_proxy_test.cpp | 4 ++-- services/test/client/fms_manager_proxy_mock.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/test/client/file_manager_proxy_test.cpp b/services/test/client/file_manager_proxy_test.cpp index b51de72e..5b6e3fda 100644 --- a/services/test/client/file_manager_proxy_test.cpp +++ b/services/test/client/file_manager_proxy_test.cpp @@ -57,7 +57,7 @@ HWTEST_F(FileManagerProxyTest, File_Manager_Proxy_GetRoot_0000, testing::ext::Te { GTEST_LOG_(INFO) << "FileManagerProxyTest-begin File_Manager_Proxy_GetRoot_0000"; CmdOptions option; - std::vector> fileRes; + std::vector> fileRes; int ret = proxy_->GetRoot(option, fileRes); ASSERT_TRUE(ret == 0); GTEST_LOG_(INFO) << "FileManagerProxyTest-end File_Manager_Proxy_GetRoot_0000"; @@ -121,7 +121,7 @@ HWTEST_F(FileManagerProxyTest, File_Manager_Proxy_ListFile_0000, testing::ext::T std::string type = "file"; std::string path = "dataability:///album"; CmdOptions option; - std::vector> fileRes; + std::vector> fileRes; EXPECT_CALL(*mock_, SendRequest(testing::_, testing::_, testing::_, testing::_)) .Times(1) .WillOnce(testing::Invoke(mock_.GetRefPtr(), &FmsManagerProxyMock::InvokeSendRequest)); diff --git a/services/test/client/fms_manager_proxy_mock.h b/services/test/client/fms_manager_proxy_mock.h index ae04272a..4b1aed96 100644 --- a/services/test/client/fms_manager_proxy_mock.h +++ b/services/test/client/fms_manager_proxy_mock.h @@ -38,11 +38,11 @@ public: return ERR_NONE; } virtual int ListFile(const std::string &type, const std::string &path, const CmdOptions &option, - std::vector> &fileRes) override + std::vector> &fileRes) override { return ERR_NONE; } - virtual int GetRoot(const CmdOptions &option, std::vector> &fileRes) override + virtual int GetRoot(const CmdOptions &option, std::vector> &fileRes) override { return ERR_NONE; } -- Gitee From 05516e842e532a3e9e9e61734f9292be7118db9e Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Tue, 22 Feb 2022 21:16:33 +0800 Subject: [PATCH 3/3] optimize code Signed-off-by: root --- services/src/fileoper/external_storage_utils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/src/fileoper/external_storage_utils.cpp b/services/src/fileoper/external_storage_utils.cpp index b1aed3d1..715bcfc7 100644 --- a/services/src/fileoper/external_storage_utils.cpp +++ b/services/src/fileoper/external_storage_utils.cpp @@ -141,7 +141,7 @@ int ExternalStorageUtils::DoListFile(const std::string &type, const std::string continue; } if (count > 0) { - shared_ptr fileInfo = make_unique(); + shared_ptr fileInfo = make_shared(); if (!GetFileInfo(path, ent->d_name, fileInfo)) { continue; } -- Gitee