From 21f6d936ec7bd6cbb9a8c2b09a78a67c12f5d551 Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Mon, 5 Sep 2022 21:37:38 +0800 Subject: [PATCH] fix code review Signed-off-by: linjun9528 --- .../include/file_access_extension_info.h | 24 ++-- .../file_access/src/file_access_ext_proxy.cpp | 30 ++-- .../file_access/src/file_access_helper.cpp | 26 ++-- .../src/js_file_access_ext_ability.cpp | 130 +++++++++++++++++- .../file_info/file_info_entity.h | 6 +- .../file_info/file_iterator_entity.h | 12 +- .../file_info/napi_file_iterator_exporter.cpp | 37 ++--- .../napi_fileaccess_helper.cpp | 12 +- .../napi/file_access_module/napi_utils.cpp | 38 ++--- .../native_fileaccess_module.cpp | 2 +- .../root_info/napi_root_iterator_exporter.cpp | 13 +- .../root_info/root_info_entity.h | 4 +- .../root_info/root_iterator_entity.h | 6 +- .../FileExtensionAbility.ts | 4 +- 14 files changed, 242 insertions(+), 102 deletions(-) diff --git a/frameworks/innerkits/file_access/include/file_access_extension_info.h b/frameworks/innerkits/file_access/include/file_access_extension_info.h index e9afe522..896f96e3 100644 --- a/frameworks/innerkits/file_access/include/file_access_extension_info.h +++ b/frameworks/innerkits/file_access/include/file_access_extension_info.h @@ -51,16 +51,16 @@ const int32_t DOCUMENT_FLAG_SUPPORTS_WRITE = 1 << 3; struct FileInfo : public virtual OHOS::Parcelable { public: - std::string uri; - std::string fileName; - int32_t mode; - int64_t size; - int64_t mtime; - std::string mimeType; + std::string uri { "" }; + std::string fileName { "" }; + int32_t mode { 0 }; + int64_t size { 0 }; + int64_t mtime { 0 }; + std::string mimeType { "" }; FileInfo() = default; - FileInfo(std::string uriIn, std::string fileNameIn, int32_t modeIn, std::string mimeTypeIn) - : uri(uriIn), fileName(fileNameIn), mode(modeIn), mimeType(mimeTypeIn) + FileInfo(std::string uri, std::string fileName, int32_t mode, std::string mimeType) + : uri(uri), fileName(fileName), mode(mode), mimeType(mimeType) {} bool ReadFromParcel(Parcel &parcel) @@ -114,10 +114,10 @@ public: struct RootInfo : public virtual OHOS::Parcelable { public: - int32_t deviceType; - std::string uri; - std::string displayName; - int32_t deviceFlags; + int32_t deviceType { 0 }; + std::string uri { "" }; + std::string displayName { "" }; + int32_t deviceFlags { 0 }; bool ReadFromParcel(Parcel &parcel) { diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index 2f41d118..9e398832 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -48,7 +48,7 @@ int FileAccessExtProxy::OpenFile(const Uri &uri, const int flags, int &fd) MessageParcel reply; MessageOption option; - int32_t err = Remote()->SendRequest(CMD_OPEN_FILE, data, reply, option); + int err = Remote()->SendRequest(CMD_OPEN_FILE, data, reply, option); if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -103,7 +103,7 @@ int FileAccessExtProxy::CreateFile(const Uri &parent, const std::string &display MessageParcel reply; MessageOption option; - int32_t err = Remote()->SendRequest(CMD_CREATE_FILE, data, reply, option); + int err = Remote()->SendRequest(CMD_CREATE_FILE, data, reply, option); if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -163,7 +163,7 @@ int FileAccessExtProxy::Mkdir(const Uri &parent, const std::string &displayName, MessageParcel reply; MessageOption option; - int32_t err = Remote()->SendRequest(CMD_MKDIR, data, reply, option); + int err = Remote()->SendRequest(CMD_MKDIR, data, reply, option); if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -217,7 +217,7 @@ int FileAccessExtProxy::Delete(const Uri &sourceFile) MessageParcel reply; MessageOption option; - int32_t err = Remote()->SendRequest(CMD_DELETE, data, reply, option); + int err = Remote()->SendRequest(CMD_DELETE, data, reply, option); if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -265,7 +265,7 @@ int FileAccessExtProxy::Move(const Uri &sourceFile, const Uri &targetParent, Uri MessageParcel reply; MessageOption option; - int32_t err = Remote()->SendRequest(CMD_MOVE, data, reply, option); + int err = Remote()->SendRequest(CMD_MOVE, data, reply, option); if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -325,7 +325,7 @@ int FileAccessExtProxy::Rename(const Uri &sourceFile, const std::string &display MessageParcel reply; MessageOption option; - int32_t err = Remote()->SendRequest(CMD_RENAME, data, reply, option); + int err = Remote()->SendRequest(CMD_RENAME, data, reply, option); if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -366,20 +366,17 @@ static int GetListFileResult(MessageParcel &reply, std::vector &fileIn int ret = ERR_PARCEL_FAIL; if (!reply.ReadInt32(ret)) { HILOG_ERROR("fail to ReadInt32 ret"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } if (ret != ERR_OK) { HILOG_ERROR("ListFile operation failed ret : %{public}d", ret); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } int64_t count = 0; if (!reply.ReadInt64(count)) { HILOG_ERROR("ListFile operation failed to Read count"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_RESULT; } @@ -430,15 +427,22 @@ int FileAccessExtProxy::ListFile(const FileInfo &fileInfo, const int64_t offset, MessageParcel reply; MessageOption option; - int32_t err = Remote()->SendRequest(CMD_LIST_FILE, data, reply, option); + int err = Remote()->SendRequest(CMD_LIST_FILE, data, reply, option); if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return err; } + err = GetListFileResult(reply, fileInfoVec); + if (err != ERR_OK) { + HILOG_ERROR("fail to GetListFileResult. err: %{public}d", err); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return err; + } + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return GetListFileResult(reply, fileInfoVec); + return ERR_OK; } int FileAccessExtProxy::GetRoots(std::vector &rootInfoVec) @@ -453,7 +457,7 @@ int FileAccessExtProxy::GetRoots(std::vector &rootInfoVec) MessageParcel reply; MessageOption option; - int32_t err = Remote()->SendRequest(CMD_GET_ROOTS, data, reply, option); + int err = Remote()->SendRequest(CMD_GET_ROOTS, data, reply, option); if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -510,7 +514,7 @@ int FileAccessExtProxy::Access(const Uri &uri, bool &isExist) MessageParcel reply; MessageOption option; - int32_t err = Remote()->SendRequest(CMD_ACCESS, data, reply, option); + int err = Remote()->SendRequest(CMD_ACCESS, data, reply, option); if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index a01e95c1..12975b03 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -431,7 +431,7 @@ int FileAccessHelper::OpenFile(Uri &uri, int flags, int &fd) } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessHelper::CreateFile(Uri &parent, const std::string &displayName, Uri &newFile) @@ -458,7 +458,7 @@ int FileAccessHelper::CreateFile(Uri &parent, const std::string &displayName, Ur } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessHelper::Mkdir(Uri &parent, const std::string &displayName, Uri &newDir) @@ -485,7 +485,7 @@ int FileAccessHelper::Mkdir(Uri &parent, const std::string &displayName, Uri &ne } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessHelper::Delete(Uri &selectFile) @@ -512,7 +512,7 @@ int FileAccessHelper::Delete(Uri &selectFile) } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessHelper::Move(Uri &sourceFile, Uri &targetParent, Uri &newFile) @@ -552,7 +552,7 @@ int FileAccessHelper::Move(Uri &sourceFile, Uri &targetParent, Uri &newFile) } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessHelper::Rename(Uri &sourceFile, const std::string &displayName, Uri &newFile) @@ -579,7 +579,7 @@ int FileAccessHelper::Rename(Uri &sourceFile, const std::string &displayName, Ur } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessHelper::ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, @@ -638,7 +638,7 @@ int FileAccessHelper::GetRoots(std::vector &rootInfoVec) rootInfoVec.insert(rootInfoVec.end(), results.begin(), results.end()); } - return ret; + return ERR_OK; } int FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(std::vector &wantVec) @@ -681,8 +681,14 @@ int FileAccessHelper::Access(Uri &uri, bool &isExist) } int ret = fileExtProxy->Access(uri, isExist); + if (ret != ERR_OK) { + HILOG_ERROR("Access get result error, code:%{public}d", ret); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ret; + } + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessHelper::On(std::shared_ptr &callback) @@ -729,7 +735,7 @@ int FileAccessHelper::On(std::shared_ptr &callback) } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return errorCode; + return ERR_OK; } int FileAccessHelper::Off() @@ -762,7 +768,7 @@ int FileAccessHelper::Off() notifyAgent_.clear(); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return errorCode; + return ERR_OK; } void FileAccessDeathRecipient::OnRemoteDied(const wptr &remote) diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index 0bf058f9..e73cf404 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -39,6 +39,7 @@ namespace { constexpr size_t ARGC_ONE = 1; constexpr size_t ARGC_TWO = 2; constexpr size_t ARGC_THREE = 3; + constexpr size_t ARGC_FOUR = 4; constexpr size_t MAX_ARG_COUNT = 5; } @@ -720,6 +721,117 @@ static bool ParserListFileJsResult(NativeEngine &engine, NativeValue *nativeValu return true; } +static int MakeStringNativeArray(NativeEngine &engine, std::vector &inputArray, NativeValue *resultArray) +{ + NativeArray *nativeArray = ConvertNativeValueTo(resultArray); + if (nativeArray == nullptr) { + HILOG_ERROR("Create NativeArray nullptr"); + return ERR_NULL_POINTER; + } + + bool ret = false; + for (uint32_t i = 0; i < nativeArray->GetLength(); i++) { + NativeValue* nativeValue = engine.CreateString(inputArray[i].c_str(), inputArray[i].length()); + if (nativeValue == nullptr) { + HILOG_ERROR("Create NativeValue fail."); + return ERR_NULL_POINTER; + } + + ret = nativeArray->SetElement(i, nativeValue); + if (!ret) { + HILOG_ERROR("Add NativeValue to NativeArray fail."); + return ERR_INVALID_RESULT; + } + } + + return ERR_OK; +} + +static int MakeJsNativeFileFilter(NativeEngine &engine, const FileFilter &filter, NativeValue* nativeFilter) +{ + nativeFilter = engine.CreateObject(); + if (nativeFilter == nullptr) { + HILOG_ERROR("Create js NativeValue fail."); + return ERR_NULL_POINTER; + } + + NativeValue *suffixArray = engine.CreateArray(filter.GetSuffix().size()); + if (suffixArray == nullptr) { + HILOG_ERROR("Create Suffix native array value fail."); + return ERR_NULL_POINTER; + } + + std::vector suffixVec = filter.GetSuffix(); + int errorCode = MakeStringNativeArray(engine, suffixVec, suffixArray); + if (errorCode != ERR_OK) { + HILOG_ERROR("Create Suffix native array value fail, code:%{public}d.", errorCode); + return errorCode; + } + + NativeValue *displayNameArray = engine.CreateArray(filter.GetDisplayName().size()); + if (displayNameArray == nullptr) { + HILOG_ERROR("Create DisplayName native array value fail."); + return ERR_NULL_POINTER; + } + + std::vector displayNameVec = filter.GetDisplayName(); + errorCode = MakeStringNativeArray(engine, displayNameVec, displayNameArray); + if (errorCode != ERR_OK) { + HILOG_ERROR("Create DisplayName native array value fail, code:%{public}d.", errorCode); + return errorCode; + } + + NativeValue *mimeTypeArray = engine.CreateArray(filter.GetMimeType().size()); + if (mimeTypeArray == nullptr) { + HILOG_ERROR("Create MimeType native array value fail."); + return ERR_NULL_POINTER; + } + + std::vector mimeTypeVec = filter.GetMimeType(); + errorCode = MakeStringNativeArray(engine, mimeTypeVec, mimeTypeArray); + if (errorCode != ERR_OK) { + HILOG_ERROR("Create MimeType native array value fail, code:%{public}d.", errorCode); + return errorCode; + } + + NativeValue *nativeFileSizeOver = engine.CreateNumber(filter.GetFileSizeOver()); + if (nativeFileSizeOver == nullptr) { + HILOG_ERROR("Create NativeFileSizeOver native js value fail."); + return ERR_NULL_POINTER; + } + + NativeValue *nativeLastModifiedAfter = engine.CreateNumber(filter.GetLastModifiedAfter()); + if (nativeLastModifiedAfter == nullptr) { + HILOG_ERROR("Create NativeLastModifiedAfter native js value fail."); + return ERR_NULL_POINTER; + } + + NativeValue *nativeExcludeMedia = engine.CreateBoolean(filter.GetExcludeMedia()); + if (nativeExcludeMedia == nullptr) { + HILOG_ERROR("Create NativeExcludeMedia native js value fail."); + return ERR_NULL_POINTER; + } + + NativeObject *objFilter = ConvertNativeValueTo(nativeFilter); + if (objFilter == nullptr) { + HILOG_ERROR("Convert js object fail."); + return ERR_NULL_POINTER; + } + + bool ret = objFilter->SetProperty("suffix", suffixArray); + ret = ret && objFilter->SetProperty("display_name", displayNameArray); + ret = ret && objFilter->SetProperty("mime_type", mimeTypeArray); + ret = ret && objFilter->SetProperty("file_size_over", nativeFileSizeOver); + ret = ret && objFilter->SetProperty("last_modified_after", nativeLastModifiedAfter); + ret = ret && objFilter->SetProperty("exclude_media", nativeExcludeMedia); + if (!ret) { + HILOG_ERROR("Set property to Filter NativeValue fail."); + return ERR_INVALID_RESULT; + } + + return ERR_OK; +} + int JsFileAccessExtAbility::ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, const FileFilter &filter, std::vector &fileInfoVec) { @@ -750,10 +862,26 @@ int JsFileAccessExtAbility::ListFile(const FileInfo &fileInfo, const int64_t off return false; } + NativeValue* nativeFilter = nullptr; + if (filter.GetHasFilter()) { + int ret = MakeJsNativeFileFilter(engine ,filter, nativeFilter); + if (ret) { + HILOG_ERROR("Create js NativeValue fail."); + return ret; + } + } else { + nativeFilter = engine.CreateNull(); + if (nativeFilter == nullptr) { + HILOG_ERROR("Create js NativeValue fail."); + return ERR_NULL_POINTER; + } + } + argv[ARGC_ZERO] = uri; argv[ARGC_ONE] = nativeOffset; argv[ARGC_TWO] = nativeMaxCount; - argc = ARGC_THREE; + argv[ARGC_THREE] = nativeFilter; + argc = ARGC_FOUR; return true; }; auto retParser = [value](NativeEngine &engine, NativeValue *result) -> bool { diff --git a/interfaces/kits/napi/file_access_module/file_info/file_info_entity.h b/interfaces/kits/napi/file_access_module/file_info/file_info_entity.h index d71f1a0f..b9ce9e4a 100644 --- a/interfaces/kits/napi/file_access_module/file_info/file_info_entity.h +++ b/interfaces/kits/napi/file_access_module/file_info/file_info_entity.h @@ -25,9 +25,9 @@ namespace FileAccessFwk { using namespace DistributedFS; struct FileInfoEntity { - FileAccessHelper *fileAccessHelper; - FileInfo fileInfo; - FileFilter filter; + FileAccessHelper *fileAccessHelper { nullptr }; + FileInfo fileInfo {}; + FileFilter filter { {}, {}, {}, 0, 0, false, false }; }; } // namespace FileAccessFwk } // namespace OHOS diff --git a/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h b/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h index 44562ce3..3992c4a1 100644 --- a/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h +++ b/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h @@ -30,13 +30,13 @@ using namespace DistributedFS; constexpr int64_t MAX_COUNT = 1000; // ListFile get file's max count struct FileIteratorEntity { - FileAccessHelper *fileAccessHelper; + FileAccessHelper *fileAccessHelper { nullptr }; std::mutex entityOperateMutex; - FileInfo fileInfo; - std::vector fileInfoVec; - int64_t offset; - int64_t pos; - FileFilter filter; + FileInfo fileInfo {}; + std::vector fileInfoVec {}; + int64_t offset { 0 }; + int64_t pos { 0 }; + FileFilter filter { {}, {}, {}, 0, 0, false, false }; }; } // namespace FileAccessFwk } // namespace OHOS diff --git a/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp b/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp index 71f062f4..3a70ff8d 100644 --- a/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp @@ -72,25 +72,21 @@ napi_value NapiFileIteratorExporter::Constructor(napi_env env, napi_callback_inf return funcArg.GetThisVar(); } -static int MakeResult(napi_value objFileInfoExporter, FileIteratorEntity *fileIteratorEntity, +static int MakeResult(napi_value &objFileInfoExporter, FileIteratorEntity *fileIteratorEntity, FileInfoEntity *fileInfoEntity, napi_env env, NVal &nVal) { std::lock_guard lock(fileIteratorEntity->entityOperateMutex); - bool done = true; if (fileIteratorEntity->fileInfoVec.size() == 0) { - nVal.AddProp("value", NVal::CreateUndefined(env).val_); - nVal.AddProp("done", NVal::CreateBool(env, done).val_); + fileIteratorEntity->fileInfoVec.clear(); + fileIteratorEntity->offset = 0; + fileIteratorEntity->pos = 0; + fileInfoEntity = nullptr; + objFileInfoExporter = NVal::CreateUndefined(env).val_; + nVal.AddProp("value", objFileInfoExporter); + nVal.AddProp("done", NVal::CreateBool(env, true).val_); return ERR_OK; } - if (fileIteratorEntity->pos == fileIteratorEntity->fileInfoVec.size()) { - HILOG_ERROR("pos out of index."); - return ERR_INVALID_RESULT; - } - - fileInfoEntity->fileAccessHelper = fileIteratorEntity->fileAccessHelper; - fileInfoEntity->fileInfo = fileIteratorEntity->fileInfoVec[fileIteratorEntity->pos]; - fileIteratorEntity->pos++; if (fileIteratorEntity->pos == MAX_COUNT) { fileIteratorEntity->fileInfoVec.clear(); fileIteratorEntity->offset += MAX_COUNT; @@ -101,15 +97,24 @@ static int MakeResult(napi_value objFileInfoExporter, FileIteratorEntity *fileIt HILOG_ERROR("exec ListFile fail, code:%{public}d", ret); return ret; } - } else if (fileIteratorEntity->pos == fileIteratorEntity->fileInfoVec.size()) { + } + + if (fileIteratorEntity->pos == fileIteratorEntity->fileInfoVec.size()) { fileIteratorEntity->fileInfoVec.clear(); - fileIteratorEntity->pos = 0; fileIteratorEntity->offset = 0; + fileIteratorEntity->pos = 0; + fileInfoEntity = nullptr; + objFileInfoExporter = NVal::CreateUndefined(env).val_; + nVal.AddProp("value",objFileInfoExporter); + nVal.AddProp("done", NVal::CreateBool(env, true).val_); + return ERR_OK; } - done = (fileIteratorEntity->pos == fileIteratorEntity->fileInfoVec.size()); + fileInfoEntity->fileAccessHelper = fileIteratorEntity->fileAccessHelper; + fileInfoEntity->fileInfo = fileIteratorEntity->fileInfoVec[fileIteratorEntity->pos]; + fileIteratorEntity->pos++; nVal.AddProp("value", objFileInfoExporter); - nVal.AddProp("done", NVal::CreateBool(env, done).val_); + nVal.AddProp("done", NVal::CreateBool(env, false).val_); return ERR_OK; } diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp index cbba5049..078c0905 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp @@ -603,13 +603,11 @@ static int MakeGetRootsResult(napi_env &env, FileAccessHelper *helper, std::vect return ERR_NULL_POINTER; } - { - std::lock_guard lock(rootIteratorEntity->entityOperateMutex); - rootIteratorEntity->fileAccessHelper = helper; - rootIteratorEntity->devVec = std::move(rootInfoVec); - rootIteratorEntity->pos = 0; - nVal = { env, objRootIterator }; - } + std::lock_guard lock(rootIteratorEntity->entityOperateMutex); + rootIteratorEntity->fileAccessHelper = helper; + rootIteratorEntity->devVec = std::move(rootInfoVec); + rootIteratorEntity->pos = 0; + nVal = { env, objRootIterator }; return ERR_OK; } diff --git a/interfaces/kits/napi/file_access_module/napi_utils.cpp b/interfaces/kits/napi/file_access_module/napi_utils.cpp index 5cf0c5d8..6de2b402 100644 --- a/interfaces/kits/napi/file_access_module/napi_utils.cpp +++ b/interfaces/kits/napi/file_access_module/napi_utils.cpp @@ -45,74 +45,74 @@ int GetFileFilterParam(const NVal &argv, FileFilter &filter) bool ret = false; filter.SetHasFilter(false); if (argv.HasProp("suffix")) { - std::vector filter_suffix; - std::tie(ret, filter_suffix, std::ignore) = argv.GetProp("suffix").ToStringArray(); + std::vector suffixs; + std::tie(ret, suffixs, std::ignore) = argv.GetProp("suffix").ToStringArray(); if (!ret) { HILOG_ERROR("FileFilter get suffix param fail."); return ERR_INVALID_PARAM; } - filter.SetSuffix(filter_suffix); + filter.SetSuffix(suffixs); filter.SetHasFilter(true); } if (argv.HasProp("display_name")) { - std::vector display_name; - std::tie(ret, display_name, std::ignore) = argv.GetProp("display_name").ToStringArray(); + std::vector displayNames; + std::tie(ret, displayNames, std::ignore) = argv.GetProp("display_name").ToStringArray(); if (!ret) { HILOG_ERROR("FileFilter get display_name param fail."); return ERR_INVALID_PARAM; } - filter.SetDisplayName(display_name); - filter.SetHasFilter(true); + filter.SetDisplayName(displayNames); + filter.SetHasFilter(true); } if (argv.HasProp("mime_type")) { - std::vector mime_type; - std::tie(ret, mime_type, std::ignore) = argv.GetProp("mime_type").ToStringArray(); + std::vector mimeTypes; + std::tie(ret, mimeTypes, std::ignore) = argv.GetProp("mime_type").ToStringArray(); if (!ret) { HILOG_ERROR("FileFilter get mime_type param fail."); return ERR_INVALID_PARAM; } - filter.SetMimeType(mime_type); + filter.SetMimeType(mimeTypes); filter.SetHasFilter(true); } if (argv.HasProp("file_size_over")) { - int64_t file_size_over; - std::tie(ret, file_size_over) = argv.GetProp("file_size_over").ToInt64(); + int64_t fileSizeOver; + std::tie(ret, fileSizeOver) = argv.GetProp("file_size_over").ToInt64(); if (!ret) { HILOG_ERROR("FileFilter get file_size_over param fail."); return ERR_INVALID_PARAM; } - filter.SetFileSizeOver(file_size_over); + filter.SetFileSizeOver(fileSizeOver); filter.SetHasFilter(true); } if (argv.HasProp("last_modified_after")) { - double last_modified_after; - std::tie(ret, last_modified_after) = argv.GetProp("last_modified_after").ToDouble(); + double lastModifiedAfter; + std::tie(ret, lastModifiedAfter) = argv.GetProp("last_modified_after").ToDouble(); if (!ret) { HILOG_ERROR("FileFilter get last_modified_after param fail."); return ERR_INVALID_PARAM; } - filter.SetLastModifiedAfter(last_modified_after); + filter.SetLastModifiedAfter(lastModifiedAfter); filter.SetHasFilter(true); } if (argv.HasProp("exclude_media")) { - bool exclude_media; - std::tie(ret, exclude_media) = argv.GetProp("exclude_media").ToBool(); + bool excludeMedia; + std::tie(ret, excludeMedia) = argv.GetProp("exclude_media").ToBool(); if (!ret) { HILOG_ERROR("FileFilter get exclude_media param fail."); return ERR_INVALID_PARAM; } - filter.SetExcludeMedia(exclude_media); + filter.SetExcludeMedia(excludeMedia); filter.SetHasFilter(true); } diff --git a/interfaces/kits/napi/file_access_module/native_fileaccess_module.cpp b/interfaces/kits/napi/file_access_module/native_fileaccess_module.cpp index 8ccb330d..e737fb26 100644 --- a/interfaces/kits/napi/file_access_module/native_fileaccess_module.cpp +++ b/interfaces/kits/napi/file_access_module/native_fileaccess_module.cpp @@ -48,7 +48,7 @@ static napi_value Init(napi_env env, napi_value exports) products.emplace_back(std::make_unique(env, exports)); products.emplace_back(std::make_unique(env, exports)); products.emplace_back(std::make_unique(env, exports)); - for (auto &&product : products) { + for (auto &product : products) { if (!product->Export()) { HILOG_ERROR("INNER BUG. Failed to export class %{public}s", product->GetClassName().c_str()); return nullptr; diff --git a/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp b/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp index 91c6d832..047f08d8 100644 --- a/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp @@ -86,8 +86,8 @@ napi_value NapiRootIteratorExporter::Next(napi_env env, napi_callback_info info) return nullptr; } - auto rootEntity = NClass::GetEntityOf(env, objRootInfoExporter); - if (rootEntity == nullptr) { + auto rootInfoEntity = NClass::GetEntityOf(env, objRootInfoExporter); + if (rootInfoEntity == nullptr) { NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get the entity of RootInfoEntity"); return nullptr; } @@ -97,14 +97,13 @@ napi_value NapiRootIteratorExporter::Next(napi_env env, napi_callback_info info) { std::lock_guard lock(rootIterator->entityOperateMutex); auto len = (int64_t)rootIterator->devVec.size(); - rootEntity->fileAccessHelper = rootIterator->fileAccessHelper; + rootInfoEntity->fileAccessHelper = rootIterator->fileAccessHelper; if (rootIterator->pos < len) { - rootEntity->rootInfo = rootIterator->devVec[rootIterator->pos]; - rootIterator->pos++; + rootInfoEntity->rootInfo = rootIterator->devVec[rootIterator->pos]; done = (rootIterator->pos == len); - } else { rootIterator->pos++; - rootEntity = nullptr; + } else { + rootInfoEntity = nullptr; objRootInfoExporter = NVal::CreateUndefined(env).val_; done = true; } diff --git a/interfaces/kits/napi/file_access_module/root_info/root_info_entity.h b/interfaces/kits/napi/file_access_module/root_info/root_info_entity.h index cd9a2a50..bfeef115 100644 --- a/interfaces/kits/napi/file_access_module/root_info/root_info_entity.h +++ b/interfaces/kits/napi/file_access_module/root_info/root_info_entity.h @@ -22,8 +22,8 @@ namespace OHOS { namespace FileAccessFwk { struct RootInfoEntity { - FileAccessHelper *fileAccessHelper; - RootInfo rootInfo; + FileAccessHelper *fileAccessHelper { nullptr }; + RootInfo rootInfo {}; }; } // namespace FileAccessFwk } // namespace OHOS diff --git a/interfaces/kits/napi/file_access_module/root_info/root_iterator_entity.h b/interfaces/kits/napi/file_access_module/root_info/root_iterator_entity.h index e8ca260a..8e746cf9 100644 --- a/interfaces/kits/napi/file_access_module/root_info/root_iterator_entity.h +++ b/interfaces/kits/napi/file_access_module/root_info/root_iterator_entity.h @@ -25,10 +25,10 @@ namespace OHOS { namespace FileAccessFwk { struct RootIteratorEntity { - FileAccessHelper *fileAccessHelper; - std::vector devVec; + FileAccessHelper *fileAccessHelper { nullptr }; + std::vector devVec {}; std::mutex entityOperateMutex; - int64_t pos; + int64_t pos { 0 }; }; } // namespace FileAccessFwk } // namespace OHOS diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts index ba224e1a..99ee1b7b 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts @@ -471,7 +471,7 @@ export default class FileExtAbility extends Extension { } if (offset > i) { - i ++; + i++; continue; } @@ -484,7 +484,7 @@ export default class FileExtAbility extends Extension { mimeType: '', }); - i ++; + i++; if (i == (offset + count)) { hasNextFile = false; break; -- Gitee