From 040a03299e9257a8a437489eb0787a63f1082bc1 Mon Sep 17 00:00:00 2001
From: renhongyujie <renhongyujie@huawei.com>
Date: Tue, 26 Dec 2023 19:05:08 +0800
Subject: [PATCH] =?UTF-8?q?GetFileFilterParam=E8=B6=85=E5=A4=A7=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E6=95=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: renhongyujie <renhongyujie@huawei.com>
---
 .../js/napi/file_access_module/napi_utils.cpp | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/frameworks/js/napi/file_access_module/napi_utils.cpp b/frameworks/js/napi/file_access_module/napi_utils.cpp
index 3257720d..9e321859 100644
--- a/frameworks/js/napi/file_access_module/napi_utils.cpp
+++ b/frameworks/js/napi/file_access_module/napi_utils.cpp
@@ -59,13 +59,12 @@ bool CheckSuffix(std::vector<std::string> suffixs)
     return true;
 }
 
-int GetFileFilterParam(const NVal &argv, FileFilter &filter)
+int GetFileFilterParamFirst(const NVal &argv, FileFilter &filter, bool ret)
 {
-    bool ret = false;
-    filter.SetHasFilter(false);
     if (argv.TypeIs(napi_undefined)) {
         return ERR_OK;
     }
+
     if (argv.HasProp("suffix")) {
         std::vector<std::string> suffixs;
         std::tie(ret, suffixs, std::ignore) = argv.GetProp("suffix").ToStringArray();
@@ -104,6 +103,11 @@ int GetFileFilterParam(const NVal &argv, FileFilter &filter)
         filter.SetHasFilter(true);
     }
 
+    return ERR_OK;
+}
+
+int GetFileFilterParamSecond(const NVal &argv, FileFilter &filter, bool ret)
+{
     if (argv.HasProp("fileSizeOver")) {
         int64_t fileSizeOver;
         std::tie(ret, fileSizeOver) = argv.GetProp("fileSizeOver").ToInt64();
@@ -150,6 +154,24 @@ int GetFileFilterParam(const NVal &argv, FileFilter &filter)
         HILOG_ERROR("FileFilter must have one property.");
         return EINVAL;
     }
+
+    return ERR_OK;
+}
+
+int GetFileFilterParam(const NVal &argv, FileFilter &filter)
+{
+    bool ret = false;
+    filter.SetHasFilter(false);
+
+    int ret1 = GetFileFilterParamFirst(argv, filter, ret);
+    if (ret1 == EINVAL) {
+        return ret1;
+    }
+    ret1 = GetFileFilterParamSecond(argv, filter, ret);
+    if (ret1 == EINVAL) {
+        return ret1;
+    }
+
     return ERR_OK;
 }
 } // namespace FileAccessFwk
-- 
Gitee