openharmony/customization_config_policy
1
0
Fork 0
mirror of https://github.com/openharmony/customization_config_policy.git synced 2026-07-01 22:04:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

!72 解决函数体超大问题

Browse Source 
Merge pull request !72 from 谢凯明/master
This commit is contained in:
openharmony_ci
2023-10-21 13:47:47 +00:00
committed by Gitee
parent 81673f5d90 e4d21b6878
commit 8f4319f1f5
2 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interfaces/kits/js/include/config_policy_napi.h
+1 -1
View File
@@ -70,7 +70,7 @@ private:
static napi_value NativeGetCfgDirListSync(napi_env env, std::shared_ptr<ConfigAsyncContext> context);
static void NativeCallbackComplete(napi_env env, napi_status status, void *data);
static napi_value ParseRelPath(napi_env env, std::string &param, napi_value args);
static napi_value ParseFollowMode(napi_env env, int32_t &param, napi_value args);
static napi_value ParseFollowMode(napi_env env, int32_t &param, napi_value args, bool hasExtra);
static napi_value ParseExtra(napi_env env, std::string &param, napi_value args);
static napi_value CreateArraysValue(napi_env env, std::shared_ptr<ConfigAsyncContext> context);
static void CreateArraysValueFunc(ConfigAsyncContext &context);
interfaces/kits/js/src/config_policy_napi.cpp
+18 -21
View File
@@ -108,21 +108,19 @@ napi_value ConfigPolicyNapi::GetOneCfgFileOrAllCfgFilesSync(napi_env env, napi_c
auto asyncContext = std::make_shared<ConfigAsyncContext>();
asyncContext->followMode_ = FOLLOWX_MODE_DEFAULT;
bool hasExtra = false;
if (ParseRelPath(env, asyncContext->relPath_, argv[ARR_INDEX_ZERO]) == nullptr) {
return nullptr;
}
if (argc == ARGS_SIZE_TWO) {
if (ParseFollowMode(env, asyncContext->followMode_, argv[ARR_INDEX_ONE]) == nullptr) {
if (ParseFollowMode(env, asyncContext->followMode_, argv[ARR_INDEX_ONE], hasExtra) == nullptr) {
return nullptr;
}
if (asyncContext->followMode_ == FOLLOWX_MODE_USER_DEFINED) {
return ThrowNapiError(env, PARAM_ERROR,
"Parameter error. The followMode is USER_DEFINED, extra must be set.");
}
}
if (argc >= ARGS_SIZE_THREE) {
if (ParseFollowMode(env, asyncContext->followMode_, argv[ARR_INDEX_ONE]) == nullptr ||
hasExtra = true;
if (ParseFollowMode(env, asyncContext->followMode_, argv[ARR_INDEX_ONE], hasExtra) == nullptr ||
ParseExtra(env, asyncContext->extra_, argv[ARR_INDEX_TWO]) == nullptr) {
return nullptr;
}
@@ -144,6 +142,7 @@ napi_value ConfigPolicyNapi::GetOneCfgFileOrAllCfgFiles(napi_env env, napi_callb
auto asyncContext = std::make_unique<ConfigAsyncContext>();
asyncContext->followMode_ = FOLLOWX_MODE_DEFAULT;
bool hasExtra = false;
if (ParseRelPath(env, asyncContext->relPath_, argv[ARR_INDEX_ZERO]) == nullptr) {
return nullptr;
}
@@ -151,35 +150,29 @@ napi_value ConfigPolicyNapi::GetOneCfgFileOrAllCfgFiles(napi_env env, napi_callb
if (MatchValueType(env, argv[ARR_INDEX_ONE], napi_function)) {
napi_create_reference(env, argv[ARR_INDEX_ONE], NAPI_RETURN_ONE, &asyncContext->callbackRef_);
} else {
if (ParseFollowMode(env, asyncContext->followMode_, argv[ARR_INDEX_ONE]) == nullptr) {
if (ParseFollowMode(env, asyncContext->followMode_, argv[ARR_INDEX_ONE], hasExtra) == nullptr) {
return nullptr;
}
if (asyncContext->followMode_ == FOLLOWX_MODE_USER_DEFINED) {
return ThrowNapiError(env, PARAM_ERROR,
"Parameter error. The followMode is USER_DEFINED, extra must be set.");
}
}
}
if (argc == ARGS_SIZE_THREE) {
if (ParseFollowMode(env, asyncContext->followMode_, argv[ARR_INDEX_ONE]) == nullptr) {
return nullptr;
}
if (MatchValueType(env, argv[ARR_INDEX_TWO], napi_function)) {
if (asyncContext->followMode_ == FOLLOWX_MODE_USER_DEFINED) {
return ThrowNapiError(env, PARAM_ERROR,
"Parameter error. The followMode is USER_DEFINED, extra must be set.");
}
napi_create_reference(env, argv[ARR_INDEX_TWO], NAPI_RETURN_ONE, &asyncContext->callbackRef_);
} else {
if (ParseExtra(env, asyncContext->extra_, argv[ARR_INDEX_TWO]) == nullptr) {
return nullptr;
}
hasExtra = true;
}
if (ParseFollowMode(env, asyncContext->followMode_, argv[ARR_INDEX_ONE], hasExtra) == nullptr) {
return nullptr;
}
}
if (argc == ARGS_SIZE_FOUR) {
if (ParseFollowMode(env, asyncContext->followMode_, argv[ARR_INDEX_ONE]) == nullptr ||
hasExtra = true;
if (ParseFollowMode(env, asyncContext->followMode_, argv[ARR_INDEX_ONE], hasExtra) == nullptr ||
ParseExtra(env, asyncContext->extra_, argv[ARR_INDEX_TWO]) == nullptr) {
return nullptr;
}
@@ -473,7 +466,7 @@ napi_value ConfigPolicyNapi::ParseExtra(napi_env env, std::string &param, napi_v
return result;
}
napi_value ConfigPolicyNapi::ParseFollowMode(napi_env env, int32_t &param, napi_value args)
napi_value ConfigPolicyNapi::ParseFollowMode(napi_env env, int32_t &param, napi_value args, bool hasExtra)
{
bool matchFlag = MatchValueType(env, args, napi_number);
if (!matchFlag) {
@@ -494,8 +487,12 @@ napi_value ConfigPolicyNapi::ParseFollowMode(napi_env env, int32_t &param, napi_
case FOLLOWX_MODE_SIM_1:
[[fallthrough]];
case FOLLOWX_MODE_SIM_2:
[[fallthrough]];
break;
case FOLLOWX_MODE_USER_DEFINED:
if (!hasExtra) {
return ThrowNapiError(env, PARAM_ERROR,
"Parameter error. The followMode is USER_DEFINED, extra must be set.");
}
break;
default:
return ThrowNapiError(env, PARAM_ERROR,