From 31a20b446fecf7d951ed15da5ae9666fe6750f62 Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Mon, 14 Feb 2022 17:02:54 +0800 Subject: [PATCH 1/2] alter listfile interface's return Signed-off-by: linjun9528 --- interfaces/kits/js/src/file_manager_napi.cpp | 4 +- services/src/client/file_manager_proxy.cpp | 18 ++-- services/src/client/file_manager_proxy.h | 4 +- services/src/client/ifms_client.h | 4 +- services/src/fileoper/cmd_response.h | 98 +++++++++++++++++++ .../src/fileoper/external_storage_oper.cpp | 9 +- .../src/fileoper/external_storage_utils.cpp | 19 +--- .../src/fileoper/external_storage_utils.h | 4 +- services/src/fileoper/file_info.cpp | 2 + 9 files changed, 130 insertions(+), 32 deletions(-) create mode 100644 services/src/fileoper/cmd_response.h diff --git a/interfaces/kits/js/src/file_manager_napi.cpp b/interfaces/kits/js/src/file_manager_napi.cpp index 8d9d0add..bf6732d6 100644 --- a/interfaces/kits/js/src/file_manager_napi.cpp +++ b/interfaces/kits/js/src/file_manager_napi.cpp @@ -31,7 +31,7 @@ using namespace std; using namespace DistributedFS; struct AsyncFileInfoArg { NRef ref_; - vector> fileRes_; + vector> fileRes_; explicit AsyncFileInfoArg(NVal ref) : ref_(ref), fileRes_() {}; ~AsyncFileInfoArg() = default; }; @@ -181,7 +181,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 b3a120ba..1aa46d18 100644 --- a/services/src/client/file_manager_proxy.cpp +++ b/services/src/client/file_manager_proxy.cpp @@ -14,6 +14,7 @@ */ #include "file_manager_proxy.h" +#include "cmd_response.h" #include "file_info.h" #include "file_manager_service_def.h" #include "file_manager_service_errno.h" @@ -27,7 +28,7 @@ namespace OHOS { namespace FileManagerService { 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") { @@ -104,7 +105,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); @@ -130,14 +131,13 @@ int FileManagerProxy::ListFile(const std::string &type, const std::string &path, ERR_LOG("inner error send request fail %{public}d", err); return FAIL; } - int fileInfoNum = 0; - reply.ReadInt32(fileInfoNum); - while (fileInfoNum) { - unique_ptr file(reply.ReadParcelable()); - fileRes.emplace_back(move(file)); - fileInfoNum--; + + sptr cmdResponse = reply.ReadParcelable(); + if (cmdResponse == nullptr) { + ERR_LOG("Unmarshalling cmdResponse fail %{public}d", err); + return FAIL; } - reply.ReadInt32(err); + fileRes = cmdResponse->GetFileInfoList(); return err; } 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 new file mode 100644 index 00000000..eb65bac4 --- /dev/null +++ b/services/src/fileoper/cmd_response.h @@ -0,0 +1,98 @@ +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef STORAGE_SERVICES_CMD_RESPONSE_H +#define STORAGE_SERVICES_CMD_RESPONSE_H + +#include +#include +#include + +#include "file_info.h" +#include "parcel.h" +namespace OHOS { +namespace FileManagerService { +class CmdResponse : public Parcelable { +public: + CmdResponse() = default; + CmdResponse(int &err, std::string &uri, std::vector> &fileInfoList) + : err_(err), uri_(uri), vecFileInfo_(fileInfoList) + {} + ~CmdResponse() = default; + + void SetErr(const int err) + { + err_ = err; + } + + int GetErr() const + { + return err_; + } + + void SetUri(const std::string &uri) + { + uri_ = uri; + } + + std::string GetUri() const + { + return uri_; + } + + void SetFileInfoList(std::vector> &fileInfoList) + { + vecFileInfo_ = fileInfoList; + } + + std::vector> GetFileInfoList() + { + return vecFileInfo_; + } + + virtual bool Marshalling(Parcel &parcel) const override + { + parcel.WriteInt32(err_); + parcel.WriteString(uri_); + int fileCount = vecFileInfo_.size(); + parcel.WriteInt32(fileCount); + for (int i = 0; i < fileCount; i++) { + parcel.WriteParcelable(vecFileInfo_[i].get()); + } + return true; + } + + static CmdResponse* Unmarshalling(Parcel &parcel) + { + auto *obj = new (std::nothrow) CmdResponse(); + if (obj == nullptr) { + return nullptr; + } + obj->err_ = parcel.ReadInt32(); + obj->uri_ = parcel.ReadString(); + int fileCount = parcel.ReadInt32(); + for (int i = 0; i < fileCount; i++) { + std::shared_ptr file(parcel.ReadParcelable()); + obj->vecFileInfo_.emplace_back(move(file)); + } + return obj; + } +private: + int err_; + std::string uri_; + std::vector> vecFileInfo_; +}; +} // FileManagerService +} // namespace OHOS +#endif // STORAGE_SERVICES_CMD_RESPONSE_H \ No newline at end of file diff --git a/services/src/fileoper/external_storage_oper.cpp b/services/src/fileoper/external_storage_oper.cpp index a23e5b92..ee69bfe1 100644 --- a/services/src/fileoper/external_storage_oper.cpp +++ b/services/src/fileoper/external_storage_oper.cpp @@ -17,6 +17,7 @@ #include +#include "cmd_response.h" #include "external_storage_utils.h" #include "file_info.h" #include "file_manager_service_def.h" @@ -77,7 +78,13 @@ 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 { - return ExternalStorageUtils::DoListFile(type, uri, reply); + std::vector> fileList; + int ret = ExternalStorageUtils::DoListFile(type, uri, fileList); + CmdResponse cmdResponse; + cmdResponse.SetErr(ret); + cmdResponse.SetFileInfoList(fileList); + reply.WriteParcelable(&cmdResponse); + return ret; } } // namespace FileManagerService } // namespace OHOS \ No newline at end of file diff --git a/services/src/fileoper/external_storage_utils.cpp b/services/src/fileoper/external_storage_utils.cpp index 27db06ac..432a53ea 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(); @@ -104,42 +104,31 @@ static bool ConvertUriToAbsolutePath(const std::string &uri, std::string &path) return true; } -int ExternalStorageUtils::DoListFile(const std::string &type, const std::string &uri, MessageParcel &reply) +int ExternalStorageUtils::DoListFile(const std::string &type, const std::string &uri, + std::vector> &fileList) { std::string path; - int fileCount = 0; if (!ConvertUriToAbsolutePath(uri, path)) { ERR_LOG("invalid uri[%{public}s].", uri.c_str()); - reply.WriteInt32(fileCount); return E_NOEXIST; } DIR *dir = opendir(path.c_str()); if (!dir) { ERR_LOG("opendir path[%{public}s] fail.", path.c_str()); - reply.WriteInt32(fileCount); return E_NOEXIST; } - std::vector> fileList; for (struct dirent *ent = readdir(dir); ent != nullptr; ent = readdir(dir)) { if (strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0) { continue; } - unique_ptr fileInfo = make_unique(); + shared_ptr fileInfo = make_shared(); if (!GetFileInfo(path, ent->d_name, fileInfo)) { continue; } fileList.push_back(move(fileInfo)); } closedir(dir); - fileCount = static_cast(fileList.size()); - reply.WriteInt32(fileCount); - if (fileCount == 0) { - return E_EMPTYFOLDER; - } - for (int i = 0; i < fileCount; i++) { - reply.WriteParcelable(fileList[i].get()); - } return SUCCESS; } diff --git a/services/src/fileoper/external_storage_utils.h b/services/src/fileoper/external_storage_utils.h index 61a139da..c11bcbef 100644 --- a/services/src/fileoper/external_storage_utils.h +++ b/services/src/fileoper/external_storage_utils.h @@ -15,6 +15,7 @@ #ifndef STORAGE_SERIVCES_EXTERNAL_STORAGE_UTILS_H #define STORAGE_SERIVCES_EXTERNAL_STORAGE_UTILS_H +#include #include #include @@ -28,7 +29,8 @@ class ExternalStorageUtils { public: ExternalStorageUtils(); ~ExternalStorageUtils(); - static int DoListFile(const std::string &type, const std::string &uri, MessageParcel &reply); + static int DoListFile(const std::string &type, const std::string &uri, + std::vector> &fileList); static int DoCreateFile(const std::string &uri, const std::string &name, MessageParcel &reply); static bool PopFileInfo(FileInfo &fileInfo, MessageParcel &reply); static int DoGetRoot(const std::string &name, const std::string &path, MessageParcel &reply); diff --git a/services/src/fileoper/file_info.cpp b/services/src/fileoper/file_info.cpp index 46168b76..3eaf9006 100644 --- a/services/src/fileoper/file_info.cpp +++ b/services/src/fileoper/file_info.cpp @@ -28,11 +28,13 @@ bool FileInfo::Marshalling(Parcel &parcel) const parcel.WriteInt64(modifiedTime_); return true; } + FileInfo* FileInfo::Unmarshalling(Parcel &parcel) { auto *obj = new (std::nothrow) FileInfo(); if (obj == nullptr) { ERR_LOG("Unmarshalling fail"); + return nullptr; } obj->path_ = parcel.ReadString(); obj->name_ = parcel.ReadString(); -- Gitee From 3940cbc6e6fc6cd180a1b14ff2e4c50769b9b381 Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Mon, 14 Feb 2022 22:08:31 +0800 Subject: [PATCH 2/2] alter listfile,getroot,createfile process Signed-off-by: linjun9528 --- services/src/client/file_manager_proxy.cpp | 40 ++++++++------ .../src/fileoper/external_storage_oper.cpp | 16 +++++- .../src/fileoper/external_storage_utils.cpp | 37 +++---------- .../src/fileoper/external_storage_utils.h | 6 +-- services/src/fileoper/media_file_oper.cpp | 27 +++++++--- services/src/fileoper/media_file_oper.h | 2 +- services/src/fileoper/media_file_utils.cpp | 53 +++++-------------- services/src/fileoper/media_file_utils.h | 5 +- 8 files changed, 85 insertions(+), 101 deletions(-) diff --git a/services/src/client/file_manager_proxy.cpp b/services/src/client/file_manager_proxy.cpp index 1aa46d18..629e95a8 100644 --- a/services/src/client/file_manager_proxy.cpp +++ b/services/src/client/file_manager_proxy.cpp @@ -26,6 +26,16 @@ using namespace std; namespace OHOS { namespace FileManagerService { +static int GetCmdResponse(MessageParcel &reply, sptr &cmdResponse) +{ + cmdResponse = reply.ReadParcelable(); + if (cmdResponse == nullptr) { + ERR_LOG("Unmarshalling cmdResponse fail"); + return FAIL; + } + return cmdResponse->GetErr(); +} + FileManagerProxy::FileManagerProxy(const sptr &impl) : IRemoteProxy(impl) {} int FileManagerProxy::GetRoot(const CmdOptions &option, vector> &fileRes) @@ -42,15 +52,12 @@ int FileManagerProxy::GetRoot(const CmdOptions &option, vector file = make_unique(FILE_ROOT_NAME, rootPath, ALBUM_TYPE); - fileRes.emplace_back(move(file)); + sptr cmdResponse; + err = GetCmdResponse(reply, cmdResponse); + if (err != ERR_NONE) { + return err; } - reply.ReadInt32(err); + fileRes = cmdResponse->GetFileInfoList(); return err; } else { unique_ptr image = make_unique(IMAGE_ROOT_NAME, FISRT_LEVEL_ALBUM, ALBUM_TYPE); @@ -83,8 +90,12 @@ int FileManagerProxy::CreateFile(const std::string &path, const std::string &fil ERR_LOG("inner error send request fail %{public}d", err); return FAIL; } - reply.ReadString(uri); - reply.ReadInt32(err); + sptr cmdResponse; + err = GetCmdResponse(reply, cmdResponse); + if (err != ERR_NONE) { + return err; + } + uri = cmdResponse->GetUri(); return err; } @@ -131,11 +142,10 @@ int FileManagerProxy::ListFile(const std::string &type, const std::string &path, ERR_LOG("inner error send request fail %{public}d", err); return FAIL; } - - sptr cmdResponse = reply.ReadParcelable(); - if (cmdResponse == nullptr) { - ERR_LOG("Unmarshalling cmdResponse fail %{public}d", err); - return FAIL; + sptr cmdResponse; + err = GetCmdResponse(reply, cmdResponse); + if (err != ERR_NONE) { + return err; } fileRes = cmdResponse->GetFileInfoList(); return err; diff --git a/services/src/fileoper/external_storage_oper.cpp b/services/src/fileoper/external_storage_oper.cpp index ee69bfe1..af53f499 100644 --- a/services/src/fileoper/external_storage_oper.cpp +++ b/services/src/fileoper/external_storage_oper.cpp @@ -67,12 +67,24 @@ int ExternalStorageOper::OperProcess(uint32_t code, MessageParcel &data, Message int ExternalStorageOper::GetRoot(const std::string &name, const std::string &path, MessageParcel &reply) const { - return ExternalStorageUtils::DoGetRoot(name, path, reply); + std::vector> fileList; + int ret = ExternalStorageUtils::DoGetRoot(name, path, fileList); + CmdResponse cmdResponse; + cmdResponse.SetErr(ret); + cmdResponse.SetFileInfoList(fileList); + reply.WriteParcelable(&cmdResponse); + return ret; } int ExternalStorageOper::CreateFile(const std::string &uri, const std::string &name, MessageParcel &reply) const { - return ExternalStorageUtils::DoCreateFile(uri, name, reply); + std::string resultUir; + int ret = ExternalStorageUtils::DoCreateFile(uri, name, resultUir); + CmdResponse cmdResponse; + cmdResponse.SetErr(ret); + cmdResponse.SetUri(resultUir); + reply.WriteParcelable(&cmdResponse); + return ret; } int ExternalStorageOper::ListFile(const std::string &type, const std::string &uri, const CmdOptions &option, diff --git a/services/src/fileoper/external_storage_utils.cpp b/services/src/fileoper/external_storage_utils.cpp index 432a53ea..fba7dd0c 100644 --- a/services/src/fileoper/external_storage_utils.cpp +++ b/services/src/fileoper/external_storage_utils.cpp @@ -132,7 +132,7 @@ int ExternalStorageUtils::DoListFile(const std::string &type, const std::string return SUCCESS; } -int ExternalStorageUtils::DoCreateFile(const std::string &uri, const std::string &name, MessageParcel &reply) +int ExternalStorageUtils::DoCreateFile(const std::string &uri, const std::string &name, std::string &resultUri) { std::string path; if (!ConvertUriToAbsolutePath(uri, path)) { @@ -156,48 +156,23 @@ int ExternalStorageUtils::DoCreateFile(const std::string &uri, const std::string return E_CREATE_FAIL; } close(fd); - - std::string fullUri(EXTERNAL_STORAGE_URI); - fullUri.append(path); - reply.WriteString(fullUri); + resultUri = EXTERNAL_STORAGE_URI + path; return SUCCESS; } -int ExternalStorageUtils::DoGetRoot(const std::string &name, const std::string &path, MessageParcel &reply) +int ExternalStorageUtils::DoGetRoot(const std::string &name, const std::string &path, + std::vector> &fileList) { vector vecRootPath; if (!StorageManagerInf::GetMountedVolumes(vecRootPath)) { ERR_LOG("there is valid extorage storage"); - reply.WriteInt32(0); return FAIL; } - reply.WriteInt32(vecRootPath.size()); for (auto rootPath : vecRootPath) { - reply.WriteString(rootPath); + shared_ptr fileInfo = make_shared(FILE_ROOT_NAME, rootPath, ALBUM_TYPE); + fileList.push_back(move(fileInfo)); } return SUCCESS; } - -bool ExternalStorageUtils::PopFileInfo(FileInfo &fileInfo, MessageParcel &reply) -{ - std::string path; - std::string type; - std::string name; - int64_t size = 0; - int64_t at = 0; - int64_t mt = 0; - - reply.ReadString(path); - reply.ReadString(type); - reply.ReadString(name); - reply.ReadInt64(size); - reply.ReadInt64(at); - reply.ReadInt64(mt); - fileInfo = FileInfo(name, path, type); - fileInfo.SetSize(size); - fileInfo.SetAddedTime(at); - fileInfo.SetModifiedTime(mt); - return true; -} } // namespace FileManagerService } // namespace OHOS \ No newline at end of file diff --git a/services/src/fileoper/external_storage_utils.h b/services/src/fileoper/external_storage_utils.h index c11bcbef..52687984 100644 --- a/services/src/fileoper/external_storage_utils.h +++ b/services/src/fileoper/external_storage_utils.h @@ -31,9 +31,9 @@ public: ~ExternalStorageUtils(); static int DoListFile(const std::string &type, const std::string &uri, std::vector> &fileList); - static int DoCreateFile(const std::string &uri, const std::string &name, MessageParcel &reply); - static bool PopFileInfo(FileInfo &fileInfo, MessageParcel &reply); - static int DoGetRoot(const std::string &name, const std::string &path, MessageParcel &reply); + 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); }; } // namespace FileManagerService } // namespace OHOS diff --git a/services/src/fileoper/media_file_oper.cpp b/services/src/fileoper/media_file_oper.cpp index dbc2520c..3e9fd3fe 100644 --- a/services/src/fileoper/media_file_oper.cpp +++ b/services/src/fileoper/media_file_oper.cpp @@ -18,6 +18,7 @@ #include #include "cmd_options.h" +#include "cmd_response.h" #include "file_info.h" #include "file_manager_service_def.h" #include "file_manager_service_errno.h" @@ -58,9 +59,7 @@ int MediaFileOper::OperProcess(uint32_t code, MessageParcel &data, MessageParcel case Operation::CREATE_FILE: { string name = data.ReadString(); string path = data.ReadString(); - string uri; - errCode = CreateFile(name, path, uri); - reply.WriteString(uri); + errCode = CreateFile(name, path, reply); break; } default: { @@ -71,17 +70,33 @@ int MediaFileOper::OperProcess(uint32_t code, MessageParcel &data, MessageParcel return errCode; } -int MediaFileOper::CreateFile(const std::string &name, const std::string &path, std::string &uri) const +int MediaFileOper::CreateFile(const std::string &name, const std::string &path, MessageParcel &reply) const { string type = "file"; - return MediaFileUtils::DoInsert(name, path, type, uri); + std::string uri; + int ret = MediaFileUtils::DoInsert(name, path, type, uri); + CmdResponse cmdResponse; + cmdResponse.SetErr(ret); + cmdResponse.SetUri(uri); + reply.WriteParcelable(&cmdResponse); + return ret; } int MediaFileOper::ListFile(const string &type, const string &path, int offset, int count, MessageParcel &reply) const { shared_ptr result; int res = MediaFileUtils::DoListFile(type, path, offset, count, result); - return MediaFileUtils::GetFileInfoFromResult(result, reply, res); + if (res != SUCCESS) { + return res; + } + + std::vector> fileList; + res = MediaFileUtils::GetFileInfoFromResult(result, fileList); + CmdResponse cmdResponse; + cmdResponse.SetErr(res); + cmdResponse.SetFileInfoList(fileList); + reply.WriteParcelable(&cmdResponse); + return res; } int MediaFileOper::Mkdir(const string &name, const string &path) const diff --git a/services/src/fileoper/media_file_oper.h b/services/src/fileoper/media_file_oper.h index 8220a0ca..0652065d 100644 --- a/services/src/fileoper/media_file_oper.h +++ b/services/src/fileoper/media_file_oper.h @@ -25,7 +25,7 @@ public: virtual ~MediaFileOper() = default; int OperProcess(uint32_t code, MessageParcel &data, MessageParcel &reply) const override; private: - int CreateFile(const std::string &name, const std::string &path, std::string &uri) const; + int CreateFile(const std::string &name, const std::string &path, MessageParcel &reply) const; int ListFile(const std::string &type, const std::string &path, int offset, int count, MessageParcel &data) const; int Mkdir(const std::string &name, const std::string &path) const; }; diff --git a/services/src/fileoper/media_file_utils.cpp b/services/src/fileoper/media_file_utils.cpp index bf30808a..7f2249f9 100644 --- a/services/src/fileoper/media_file_utils.cpp +++ b/services/src/fileoper/media_file_utils.cpp @@ -349,7 +349,8 @@ bool MediaFileUtils::InitMediaTableColIndexMap(shared_ptr result, MessageParcel &reply) +bool MediaFileUtils::GetFileInfo(shared_ptr result, + shared_ptr &fileInfo) { if (!InitMediaTableColIndexMap(result)) { ERR_LOG("InitMediaTableColIndexMap returns fail"); @@ -360,67 +361,39 @@ bool MediaFileUtils::PushFileInfo(shared_ptr resu result->GetString(mediaTableMap[index++].first, id); string uri; result->GetString(mediaTableMap[index++].first, uri); - unique_ptr file = make_unique(); + string path = uri + "/" + id; - file->SetPath(path); + fileInfo->SetPath(path); string type; result->GetString(mediaTableMap[index++].first, type); - file->SetType(type); + fileInfo->SetType(type); string name; result->GetString(mediaTableMap[index++].first, name); - file->SetName(name); + fileInfo->SetName(name); int64_t value; result->GetLong(mediaTableMap[index++].first, value); - file->SetSize(value); + fileInfo->SetSize(value); result->GetLong(mediaTableMap[index++].first, value); - file->SetAddedTime(value); + fileInfo->SetAddedTime(value); result->GetLong(mediaTableMap[index++].first, value); - file->SetModifiedTime(value); - reply.WriteParcelable(file.get()); - return true; -} - -bool MediaFileUtils::PopFileInfo(FileInfo &file, MessageParcel &reply) -{ - string path; - string name; - string type; - int64_t size = 0; - int64_t at = 0; - int64_t mt = 0; - - reply.ReadString(path); - reply.ReadString(type); - reply.ReadString(name); - reply.ReadInt64(size); - reply.ReadInt64(at); - reply.ReadInt64(mt); - file = FileInfo(name, path, type); - file.SetSize(size); - file.SetAddedTime(at); - file.SetModifiedTime(mt); + fileInfo->SetModifiedTime(value); return true; } int MediaFileUtils::GetFileInfoFromResult(shared_ptr result, - MessageParcel &reply, int res) + std::vector> &fileList) { int count = 0; - if (res) { - // deal with status isn't succ; - ERR_LOG("AbsSharedResultSet status isn't succ"); - reply.WriteInt32(count); - return res; - } result->GetRowCount(count); - reply.WriteInt32(count); if (count == 0) { ERR_LOG("AbsSharedResultSet null"); return E_EMPTYFOLDER; } result->GoToFirstRow(); for (int i = 0; i < count; i++) { - PushFileInfo(result, reply); + shared_ptr fileInfo = make_shared(); + GetFileInfo(result, fileInfo); + fileList.push_back(move(fileInfo)); result->GoToNextRow(); } return SUCCESS; diff --git a/services/src/fileoper/media_file_utils.h b/services/src/fileoper/media_file_utils.h index 371eb535..06f099ce 100644 --- a/services/src/fileoper/media_file_utils.h +++ b/services/src/fileoper/media_file_utils.h @@ -33,10 +33,9 @@ public: static std::shared_ptr DoQuery(std::string selection, std::vector selectionArgs); static int DoInsert(const std::string &name, const std::string &path, const std::string &type, std::string &uri); - static bool PushFileInfo(std::shared_ptr result, MessageParcel &reply); - static bool PopFileInfo(FileInfo &file, MessageParcel &reply); + static bool GetFileInfo(std::shared_ptr result, std::shared_ptr &fileInfo); static int GetFileInfoFromResult(std::shared_ptr result, - MessageParcel &reply, int res); + std::vector> &fileList); static bool InitMediaTableColIndexMap(std::shared_ptr result); private: inline static std::vector> mediaTableMap = {}; -- Gitee