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

allow passing poll prio in topic suffix

Browse Source
This commit is contained in:
John
2022-02-12 09:20:55 +01:00
parent 7337dd9e52
commit bfa6f68045
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/mqtthandler.cpp
+17 -8
View File
@@ -1193,6 +1193,13 @@ void MqttHandler::notifyTopic(const string& topic, const string& data) {
if (direction.empty()) { if (direction.empty()) {
return; return;
} }
pos = direction.find('?');
string args;
if (pos != string::npos) {
// support e.g. ?1 in topic for poll prio
args = direction.substr(pos+1);
direction = direction.substr(0, pos);
}
bool isWrite = direction == "set"; bool isWrite = direction == "set";
bool isList = !isWrite && direction == "list"; bool isList = !isWrite && direction == "list";
if (!isWrite && !isList && direction != "get") { if (!isWrite && !isList && direction != "get") {
@@ -1258,15 +1265,17 @@ void MqttHandler::notifyTopic(const string& topic, const string& data) {
pos = string::npos; pos = string::npos;
} }
if (pos != string::npos) { if (pos != string::npos) {
string args = useData.substr(pos + 1); if (args.empty()) {
useData = useData.substr(0, pos > 0 ? pos - 1 : pos); args = useData.substr(pos + 1);
if (!args.empty()) {
result_t ret = RESULT_OK;
auto pollPriority = (size_t)parseInt(args.c_str(), 10, 1, 9, &ret);
if (ret == RESULT_OK && pollPriority > 0 && message->setPollPriority(pollPriority)) {
m_messages->addPollMessage(false, message);
}
} }
useData = useData.substr(0, pos > 0 ? pos - 1 : pos);
}
}
if (!args.empty()) {
result_t ret = RESULT_OK;
auto pollPriority = (size_t)parseInt(args.c_str(), 10, 1, 9, &ret);
if (ret == RESULT_OK && pollPriority > 0 && message->setPollPriority(pollPriority)) {
m_messages->addPollMessage(false, message);
} }
} }
result_t result = m_busHandler->readFromBus(message, useData); result_t result = m_busHandler->readFromBus(message, useData);