Macintosh-HW
/
RASCSI
mirror of https://github.com/akuker/RASCSI.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added support for default value

This commit is contained in:
Uwe Seimet 2021-12-17 23:09:18 +01:00
parent 2da717a0a0
commit ff468aafa8
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/raspberrypi/rascsi_interface.proto
View File

@ -169,7 +169,9 @@ message PbOperationParameter {
string type = 3;
// There is no specific set of values if empty
repeated string values = 4;
bool is_mandatory = 5;
// Optional default value
string default_value = 5;
bool is_mandatory = 6;
}
// The list of parameters supported by an operation

15
src/raspberrypi/rascsi_response.cpp
View File

@ -344,8 +344,8 @@ PbOperationInfo *RascsiResponse::GetOperationInfo(PbResult& result)
PbOperationParameter *parameter;
parameters = AddOperation(*operation_info, ATTACH, "Attach device, a device-specific parameter is required");
AddOperationParameter(*parameters, "name", "Image file name for a mass storage device", "string", false);
AddOperationParameter(*parameters, "interfaces", "Comma-separated prioritized network interface list", "string", false);
AddOperationParameter(*parameters, "name", "Image file name for a mass storage device", "string");
AddOperationParameter(*parameters, "interfaces", "Comma-separated prioritized network interface list", "string");
AddOperation(*operation_info, DETACH, "Detach device");
@ -403,7 +403,7 @@ PbOperationInfo *RascsiResponse::GetOperationInfo(PbResult& result)
parameters = AddOperation(*operation_info, CREATE_IMAGE, "Create an image file");
AddOperationParameter(*parameters, "file", "Image file name");
AddOperationParameter(*parameters, "size", "Image file size in bytes", "int");
parameter = AddOperationParameter(*parameters, "read_only", "Read-only flag, true if missing", "boolean", false);
parameter = AddOperationParameter(*parameters, "read_only", "Read-only flag", "boolean", "false");
parameter->add_values("true");
parameter->add_values("false");
@ -417,7 +417,7 @@ PbOperationInfo *RascsiResponse::GetOperationInfo(PbResult& result)
parameters = AddOperation(*operation_info, COPY_IMAGE, "Copy image file");
AddOperationParameter(*parameters, "from", "Source image file name image file name");
AddOperationParameter(*parameters, "to", "Destination image file name");
parameter = AddOperationParameter(*parameters, "read_only", "Read-only flag, true if missing", "boolean", false);
parameter = AddOperationParameter(*parameters, "read_only", "Read-only flag", "boolean", "false");
parameter->add_values("true");
parameter->add_values("false");
@ -448,13 +448,16 @@ PbOperationParameters *RascsiResponse::AddOperation(PbOperationInfo& operation_i
}
PbOperationParameter *RascsiResponse::AddOperationParameter(PbOperationParameters& parameters, const string& name,
const string& description, const string& type, bool is_mandatory)
const string& description, const string& type, const string& default_value)
{
PbOperationParameter *parameter = parameters.add_parameters();
parameter->set_name(name);
(*parameter->mutable_description())["en"] = description;
parameter->set_type(type);
parameter->set_is_mandatory(is_mandatory);
if (!default_value.empty()) {
parameter->set_default_value(default_value);
}
parameter->set_is_mandatory(default_value.empty());
return parameter;
}

3
src/raspberrypi/rascsi_response.h
View File

@ -54,5 +54,6 @@ private:
void GetDeviceTypeProperties(PbDeviceTypesInfo&, PbDeviceType);
void GetAvailableImages(PbResult& result, PbServerInfo&);
PbOperationParameters *AddOperation(PbOperationInfo&, const PbOperation&, const string&);
PbOperationParameter *AddOperationParameter(PbOperationParameters&, const string&, const string&, const string& = "string", bool = true);
PbOperationParameter *AddOperationParameter(PbOperationParameters&, const string&, const string&,
const string& = "string", const string& = "");
};

4
src/raspberrypi/rasctl_display.cpp
View File

@ -308,6 +308,10 @@ void RasctlDisplay::DisplayOperationInfo(const PbOperationInfo& operation_info)
}
cout << endl;
}
if (!parameter.default_value().empty()) {
cout << " Default value: " << parameter.default_value() << endl;
}
}
}
}