nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add /templates endpoint and include types+templates+conditions+chains in dump output

Browse Source
This commit is contained in:
John
2023-10-22 12:17:43 +02:00
parent b752062d5c
commit b901232678
9 changed files with 311 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/data.cpp
+27 -1
View File
@@ -482,7 +482,10 @@ void SingleDataField::dumpPrefix(bool prependFieldSeparator, OutputFormat output
dumpString(prependFieldSeparator, m_name, output);
}
if (outputFormat & OF_JSON) {
*output << ", \"slave\": " << (m_partType == pt_slaveData ? "true" : "false") << ", ";
if (m_partType != pt_any) {
*output << ", \"slave\": " << (m_partType == pt_slaveData ? "true" : "false");
}
*output << ", ";
} else {
*output << FIELD_SEPARATOR;
if (m_partType == pt_masterData) {
@@ -1459,4 +1462,27 @@ const DataField* DataFieldTemplates::get(const string& name) const {
return ref->second;
}
bool DataFieldTemplates::dump(OutputFormat outputFormat, ostream* output) const {
bool prependFieldSeparator = false;
for (const auto &it : m_fieldsByName) {
const DataField *dataField = it.second;
if (outputFormat & OF_JSON) {
if (dataField->isSet()) {
if (prependFieldSeparator) {
*output << ",\n";
}
*output << "{\"name\":\"" << dataField->getName(-1) << "\", \"sequence\": [";
dataField->dump(false, outputFormat, output);
*output << "]}";
} else {
dataField->dump(prependFieldSeparator, outputFormat, output);
}
} else {
dataField->dump(prependFieldSeparator, outputFormat, output);
}
prependFieldSeparator = true;
}
return !prependFieldSeparator;
}
} // namespace ebusd