openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_ability_runtime synced 2024-11-23 07:10:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

IssueNo:#I6329Z

Browse Source 
Description:Optimize code of ability_tool, shield differences of c library.
Sig:SIG_ApplicationFramework
Feature or BugFix: Feature
Binary Source: No

Signed-off-by: zhangyafei.echo <zhangyafei12@huawei.com>
Change-Id: If612e4bbe7ac097c757cda9bd8b23f639c0ed029
This commit is contained in:
zhangyafei.echo 2022-11-25 11:38:37 +08:00
parent add521deec
commit 615cc49f14
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/aa/include/ability_tool_command.h
View File

@ -42,6 +42,7 @@ private:
ErrCode ParseStartAbilityArgsFromCmd(Want& want, StartOptions& startoptions);
ErrCode ParseStopServiceArgsFromCmd(Want& want);
ErrCode ParseTestArgsFromCmd(std::map<std::string, std::string>& params);
bool GetKeyAndValueByOpt(int optind, std::string &key, std::string &value);
std::shared_ptr<AbilityManagerShellCommand> aaShellCmd_;
};

43
tools/aa/src/ability_tool_command.cpp
View File

@ -96,6 +96,8 @@ const struct option LONG_OPTIONS_FOR_TEST[] = {
{"debug", no_argument, nullptr, 'D'},
{nullptr, 0, nullptr, 0},
};
const int32_t ARG_LIST_INDEX_OFFSET = 2;
} // namespace
AbilityToolCommand::AbilityToolCommand(int argc, char *argv[]) : ShellCommand(argc, argv, ABILITY_TOOL_NAME)
@ -279,14 +281,10 @@ ErrCode AbilityToolCommand::ParseStartAbilityArgsFromCmd(Want& want, StartOption
bundleName = optarg;
break;
case 'o':
if (optind >= argc_ - 1 || optind < 0) {
HILOG_DEBUG("'ability_tool %{public}s' %{public}s", cmd_.c_str(),
ABILITY_TOOL_HELP_MSG_LACK_VALUE.c_str());
resultReceiver_.append(ABILITY_TOOL_HELP_MSG_LACK_VALUE + "\n");
if (!GetKeyAndValueByOpt(optind, paramName, paramValue)) {
return OHOS::ERR_INVALID_VALUE;
}
paramName = optarg;
paramValue = argv_[optind + 1];
HILOG_DEBUG("paramName: %{public}s, paramValue: %{public}s", paramName.c_str(), paramValue.c_str());
if (paramName == "windowMode" &&
std::regex_match(paramValue, sm, std::regex(STRING_TEST_REGEX_INTEGER_NUMBERS))) {
windowMode = std::stoi(paramValue);
@ -412,6 +410,7 @@ ErrCode AbilityToolCommand::ParseStopServiceArgsFromCmd(Want& want)
ErrCode AbilityToolCommand::ParseTestArgsFromCmd(std::map<std::string, std::string>& params)
{
std::string tempKey;
std::string paramKey;
std::string paramValue;
std::smatch sm;
@ -428,15 +427,13 @@ ErrCode AbilityToolCommand::ParseTestArgsFromCmd(std::map<std::string, std::stri
params["-b"] = optarg;
break;
case 'o':
if (optind >= argc_ - 1 || optind < 0) {
HILOG_DEBUG("'ability_tool %{public}s' %{public}s", cmd_.c_str(),
ABILITY_TOOL_HELP_MSG_LACK_VALUE.c_str());
resultReceiver_.append(ABILITY_TOOL_HELP_MSG_LACK_VALUE + "\n");
if (!GetKeyAndValueByOpt(optind, tempKey, paramValue)) {
return OHOS::ERR_INVALID_VALUE;
}
HILOG_DEBUG("tempKey: %{public}s, paramValue: %{public}s", tempKey.c_str(), paramValue.c_str());
paramKey = "-s ";
paramKey.append(optarg);
params[paramKey] = argv_[optind + 1];
paramKey.append(tempKey);
params[paramKey] = paramValue;
break;
case 'p':
params["-p"] = optarg;
@ -463,5 +460,27 @@ ErrCode AbilityToolCommand::ParseTestArgsFromCmd(std::map<std::string, std::stri
return OHOS::ERR_OK;
}
bool AbilityToolCommand::GetKeyAndValueByOpt(int optind, std::string &key, std::string &value)
{
int argListIndex = optind - ARG_LIST_INDEX_OFFSET;
if (argListIndex < 1) {
return false;
}
bool isOption = (argList_[argListIndex - 1] == "-o" || argList_[argListIndex - 1] == "--options") ? true : false;
int keyIndex = isOption ? argListIndex : argListIndex - 1;
int valueIndex = isOption ? argListIndex + 1 : argListIndex;
if (keyIndex >= argList_.size() || keyIndex < 0 || valueIndex >= argList_.size() || valueIndex < 0) {
HILOG_DEBUG("'ability_tool %{public}s' %{public}s", cmd_.c_str(),
ABILITY_TOOL_HELP_MSG_LACK_VALUE.c_str());
resultReceiver_.append(ABILITY_TOOL_HELP_MSG_LACK_VALUE + "\n");
return false;
}
key = argList_[keyIndex];
value = argList_[valueIndex];
return true;
}
} // namespace AAFwk
} // namespace OHOS