mirror of
https://github.com/akuker/RASCSI.git
synced 2024-06-15 06:29:29 +00:00
Renaming
This commit is contained in:
parent
6a84edd0fb
commit
c3ea3c8b37
|
@ -174,7 +174,7 @@ message PbOperationParameter {
|
||||||
// The list of parameters supported by an operation
|
// The list of parameters supported by an operation
|
||||||
message PbOperationMetaData {
|
message PbOperationMetaData {
|
||||||
// The operation name at the time the server-side protobuf code was generated.
|
// The operation name at the time the server-side protobuf code was generated.
|
||||||
string name = 1;
|
string server_side_name = 1;
|
||||||
// Optional short localized description, key is the lower case locale (e.g. en, de).
|
// Optional short localized description, key is the lower case locale (e.g. en, de).
|
||||||
// Falling back to "en" is recommended if a description for a particular language is missing.
|
// Falling back to "en" is recommended if a description for a particular language is missing.
|
||||||
map<string, string> description = 2;
|
map<string, string> description = 2;
|
||||||
|
|
|
@ -467,7 +467,7 @@ PbOperationInfo *RascsiResponse::GetOperationInfo(PbResult& result)
|
||||||
void RascsiResponse::CreateOperation(PbOperationInfo *operation_info, PbOperationMetaData *meta_data,
|
void RascsiResponse::CreateOperation(PbOperationInfo *operation_info, PbOperationMetaData *meta_data,
|
||||||
const PbOperation& operation, const string& description)
|
const PbOperation& operation, const string& description)
|
||||||
{
|
{
|
||||||
meta_data->set_name(PbOperation_Name(operation));
|
meta_data->set_server_side_name(PbOperation_Name(operation));
|
||||||
(*meta_data->mutable_description())["en"] = description;
|
(*meta_data->mutable_description())["en"] = description;
|
||||||
int ordinal = PbOperation_descriptor()->FindValueByName(PbOperation_Name(operation))->index();
|
int ordinal = PbOperation_descriptor()->FindValueByName(PbOperation_Name(operation))->index();
|
||||||
(*operation_info->mutable_operations())[ordinal] = *meta_data;
|
(*operation_info->mutable_operations())[ordinal] = *meta_data;
|
||||||
|
|
|
@ -279,7 +279,7 @@ void RasctlDisplay::DisplayOperationInfo(const PbOperationInfo& operation_info)
|
||||||
const map<int, PbOperationMetaData> operations = { operation_info.operations().begin(), operation_info.operations().end() };
|
const map<int, PbOperationMetaData> operations = { operation_info.operations().begin(), operation_info.operations().end() };
|
||||||
|
|
||||||
// Copies result into a map sorted by operation name
|
// Copies result into a map sorted by operation name
|
||||||
PbOperationMetaData *unknown_operation = new PbOperationMetaData();
|
const PbOperationMetaData *unknown_operation = new PbOperationMetaData();
|
||||||
map<string, PbOperationMetaData> sorted_operations;
|
map<string, PbOperationMetaData> sorted_operations;
|
||||||
for (const auto& operation : operations) {
|
for (const auto& operation : operations) {
|
||||||
if (PbOperation_IsValid(static_cast<PbOperation>(operation.first))) {
|
if (PbOperation_IsValid(static_cast<PbOperation>(operation.first))) {
|
||||||
|
@ -287,13 +287,13 @@ void RasctlDisplay::DisplayOperationInfo(const PbOperationInfo& operation_info)
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// If the server-side operation is unknown for the client use the server-provided operation name
|
// If the server-side operation is unknown for the client use the server-provided operation name
|
||||||
sorted_operations[operation.second.name()] = *unknown_operation;
|
sorted_operations[operation.second.server_side_name()] = *unknown_operation;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
cout << "Remote operations supported by rascsi and their parameters:" << endl;
|
cout << "Remote operations supported by rascsi and their parameters:" << endl;
|
||||||
for (const auto& operation : sorted_operations) {
|
for (const auto& operation : sorted_operations) {
|
||||||
if (!operation.second.name().empty()) {
|
if (!operation.second.server_side_name().empty()) {
|
||||||
cout << " " << operation.first;
|
cout << " " << operation.first;
|
||||||
if (!operation.second.description().empty()) {
|
if (!operation.second.description().empty()) {
|
||||||
cout << " (" << operation.second.description().at("en") << ")";
|
cout << " (" << operation.second.description().at("en") << ")";
|
||||||
|
|
Loading…
Reference in New Issue
Block a user