SeanOMik
/
libki
mirror of https://github.com/SeanOMik/libki.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add auto_sort parameter for adding message templates, improve error msg

This commit is contained in:
SeanOMik 2020-12-16 00:36:51 -06:00
parent 77b1e05b0a
commit e8d25eeb67
No known key found for this signature in database
GPG Key ID: E5B8A9E070F831BE
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/ki/protocol/dml/MessageModule.h
View File

@ -27,7 +27,7 @@ namespace dml
std::string get_protocol_desription() const; std::string get_protocol_desription() const;
void set_protocol_description(std::string protocol_description); void set_protocol_description(std::string protocol_description);
void add_message_template(MessageTemplate *message_template); void add_message_template(MessageTemplate *message_template, bool auto_sort = false);
const MessageTemplate *add_message_template(std::string name, const MessageTemplate *add_message_template(std::string name,
ki::dml::Record *record, bool auto_sort = true); ki::dml::Record *record, bool auto_sort = true);
const MessageTemplate *get_message_template(uint8_t type) const; const MessageTemplate *get_message_template(uint8_t type) const;

4
src/protocol/dml/MessageManager.cpp
View File

@ -234,7 +234,7 @@ namespace dml
if (!message_template) if (!message_template)
{ {
std::ostringstream oss; std::ostringstream oss;
oss << "No message exists with type: " << (uint16_t)header.get_service_id(); oss << "No message exists with type: " << (uint16_t)header.get_type();
oss << "(service=" << message_module->get_protocol_type() << ")"; oss << "(service=" << message_module->get_protocol_type() << ")";
throw value_error(oss.str(), value_error::DML_INVALID_MESSAGE_TYPE); throw value_error(oss.str(), value_error::DML_INVALID_MESSAGE_TYPE);
} }
@ -259,7 +259,7 @@ namespace dml
catch (ki::dml::parse_error &e) catch (ki::dml::parse_error &e)
{ {
delete message; delete message;
throw parse_error("Failed to read DML message payload.", parse_error::INVALID_MESSAGE_DATA); throw parse_error("Failed to read DML message payload. (" + std::string(e.what()) + ")", parse_error::INVALID_MESSAGE_DATA);
} }
return message; return message;
} }

8
src/protocol/dml/MessageModule.cpp
View File

@ -55,10 +55,14 @@ namespace dml
m_protocol_description = protocol_description; m_protocol_description = protocol_description;
} }
void MessageModule::add_message_template(MessageTemplate *message_template) { void MessageModule::add_message_template(MessageTemplate *message_template, bool auto_sort) {
m_templates.push_back(message_template); m_templates.push_back(message_template);
m_message_name_map.emplace(message_template->get_name(), message_template); m_message_name_map.emplace(message_template->get_name(), message_template);
m_message_type_map.emplace(message_template->get_type(), message_template); m_message_type_map.emplace(message_template->get_type(), message_template);
if (auto_sort) {
sort_lookup();
}
} }
const MessageTemplate *MessageModule::add_message_template(std::string name, const MessageTemplate *MessageModule::add_message_template(std::string name,
@ -128,7 +132,7 @@ namespace dml
// First, clear the message type map since we're going to be // First, clear the message type map since we're going to be
// moving everything around // moving everything around
m_message_type_map.clear(); m_message_type_map.clear();
// Iterating over a map with std::string as the key // Iterating over a map with std::string as the key
// is guaranteed to be in alphabetical order // is guaranteed to be in alphabetical order
for (auto it = m_message_name_map.begin(); for (auto it = m_message_name_map.begin();