openharmony/filemanagement_user_file_service
1
0
Fork 0
mirror of https://gitee.com/openharmony/filemanagement_user_file_service synced 2024-11-27 09:30:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

code bugfix

Browse Source 
Signed-off-by: zhaoyongjin1 <zhaoyongjin1@huawei.com>
This commit is contained in:
zhaoyongjin1 2024-01-03 21:05:43 +08:00
parent 99ce5439d2
commit ca6ed15093
3 changed files with 52 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frameworks/js/napi/file_access_module/napi_observer_callback.cpp
View File

@ -129,7 +129,6 @@ void NapiObserver::OnChange(NotifyMessage &notifyMessage)
[](uv_work_t *work) {},
[](uv_work_t *work, int status) {
NapiWorkScope(work, status);
return;
});
if (ret == 0) {
callbackParam.release();

59
frameworks/js/napi/file_access_module/napi_utils.cpp
View File

@ -59,8 +59,9 @@ bool CheckSuffix(std::vector<std::string> suffixs)
return true;
}
int GetSuffixDisplayNameMimeType(const NVal &argv, FileFilter &filter, bool ret)
static int GetSuffix(const NVal &argv, FileFilter &filter)
{
bool ret = false;
if (argv.HasProp("suffix")) {
std::vector<std::string> suffixs;
std::tie(ret, suffixs, std::ignore) = argv.GetProp("suffix").ToStringArray();
@ -75,6 +76,12 @@ int GetSuffixDisplayNameMimeType(const NVal &argv, FileFilter &filter, bool ret)
filter.SetHasFilter(true);
}
return ERR_OK;
}
static int GetDisplayName(const NVal &argv, FileFilter &filter)
{
bool ret = false;
if (argv.HasProp("displayName")) {
std::vector<std::string> displayNames;
std::tie(ret, displayNames, std::ignore) = argv.GetProp("displayName").ToStringArray();
@ -87,6 +94,12 @@ int GetSuffixDisplayNameMimeType(const NVal &argv, FileFilter &filter, bool ret)
filter.SetHasFilter(true);
}
return ERR_OK;
}
static int GetMimeType(const NVal &argv, FileFilter &filter)
{
bool ret = false;
if (argv.HasProp("mimeType")) {
std::vector<std::string> mimeTypes;
std::tie(ret, mimeTypes, std::ignore) = argv.GetProp("mimeType").ToStringArray();
@ -102,8 +115,9 @@ int GetSuffixDisplayNameMimeType(const NVal &argv, FileFilter &filter, bool ret)
return ERR_OK;
}
int GetFileSizeLastModified(const NVal &argv, FileFilter &filter, bool ret)
static int GetFileSize(const NVal &argv, FileFilter &filter)
{
bool ret = false;
if (argv.HasProp("fileSizeOver")) {
int64_t fileSizeOver;
std::tie(ret, fileSizeOver) = argv.GetProp("fileSizeOver").ToInt64();
@ -119,6 +133,12 @@ int GetFileSizeLastModified(const NVal &argv, FileFilter &filter, bool ret)
filter.SetHasFilter(true);
}
return ERR_OK;
}
static int GetLastMod(const NVal &argv, FileFilter &filter)
{
bool ret = false;
if (argv.HasProp("lastModifiedAfter")) {
double lastModifiedAfter;
std::tie(ret, lastModifiedAfter) = argv.GetProp("lastModifiedAfter").ToDouble();
@ -134,6 +154,12 @@ int GetFileSizeLastModified(const NVal &argv, FileFilter &filter, bool ret)
filter.SetHasFilter(true);
}
return ERR_OK;
}
static int GetexcludeMedia(const NVal &argv, FileFilter &filter)
{
bool ret = false;
if (argv.HasProp("excludeMedia")) {
bool excludeMedia;
std::tie(ret, excludeMedia) = argv.GetProp("excludeMedia").ToBool();
@ -151,19 +177,34 @@ int GetFileSizeLastModified(const NVal &argv, FileFilter &filter, bool ret)
int GetFileFilterParam(const NVal &argv, FileFilter &filter)
{
bool ret = false;
filter.SetHasFilter(false);
if (argv.TypeIs(napi_undefined)) {
return ERR_OK;
}
int ret1 = GetSuffixDisplayNameMimeType(argv, filter, ret);
if (ret1 != ERR_OK) {
return ret1;
int ret = GetSuffix(argv, filter);
if (ret != ERR_OK) {
return ret;
}
int ret2 = GetFileSizeLastModified(argv, filter, ret);
if (ret2 != ERR_OK) {
return ret1;
ret = GetDisplayName(argv, filter);
if (ret != ERR_OK) {
return ret;
}
ret = GetMimeType(argv, filter);
if (ret != ERR_OK) {
return ret;
}
ret = GetFileSize(argv, filter);
if (ret != ERR_OK) {
return ret;
}
ret = GetLastMod(argv, filter);
if (ret != ERR_OK) {
return ret;
}
ret = GetexcludeMedia(argv, filter);
if (ret != ERR_OK) {
return ret;
}
if (!filter.GetHasFilter()) {

15
interfaces/inner_api/file_access/src/file_access_helper.cpp
View File

@ -234,13 +234,7 @@ std::pair<std::shared_ptr<FileAccessHelper>, int> FileAccessHelper::Creator(
return {nullptr, E_GETINFO};
}
std::pair<std::shared_ptr<FileAccessHelper>, int>
ptrFileAccessHelper = DoCreatorHelper(context->GetToken(), FileAccessHelper::wants_);
if (ptrFileAccessHelper.second != ERR_OK) {
return ptrFileAccessHelper;
}
return {ptrFileAccessHelper.first, ERR_OK};
return DoCreatorHelper(context->GetToken(), FileAccessHelper::wants_);
}
std::pair<std::shared_ptr<FileAccessHelper>, int> FileAccessHelper::Creator(
@ -265,12 +259,7 @@ std::pair<std::shared_ptr<FileAccessHelper>, int> FileAccessHelper::Creator(
return {nullptr, E_GETINFO};
}
std::pair<std::shared_ptr<FileAccessHelper>, int> ptrFileAccessHelper = DoCreatorHelper(context->GetToken(), wants);
if (ptrFileAccessHelper.second != ERR_OK) {
return ptrFileAccessHelper;
}
return {ptrFileAccessHelper.first, ERR_OK};
return DoCreatorHelper(context->GetToken(), wants);
}
std::shared_ptr<FileAccessHelper> FileAccessHelper::Creator(const sptr<IRemoteObject> &token,