pEp.foundation
/
libpEpAdapter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Utils: add to_string() 

* bloblist_t
* stringpair_list_t
* message
LIB-11
heck 4 years ago
parent
f05879b7b2
commit
4d5a64908b
2 changed files with 124 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 137
      src/utils.cc
  2. 6
      src/utils.hh

137
src/utils.cc
View File

@ -14,7 +14,7 @@ namespace pEp {
{
vector<pEp_identity *> ret{};
for (const ::identity_list *curr = &idl; curr != nullptr; curr = curr->next) {
if(curr->ident) {
if (curr->ident) {
ret.push_back(curr->ident);
}
}
@ -29,19 +29,18 @@ namespace pEp {
builder << endl;
builder << std::string(indent, '\t') << "{" << endl;
indent++;
builder << std::string(indent, '\t')
<< "address: " << (ident->address != nullptr ? ident->address : "NULL")
builder << std::string(indent, '\t') << "address: \""
<< (ident->address != nullptr ? ident->address : "NULL") << "\"" << endl;
builder << std::string(indent, '\t') << "user_id: \""
<< (ident->user_id != nullptr ? ident->user_id : "NULL") << "\"" << endl;
builder << std::string(indent, '\t') << "username: \""
<< (ident->username != nullptr ? ident->username : "NULL") << "\""
<< endl;
builder << std::string(indent, '\t')
<< "user_id: " << (ident->user_id != nullptr ? ident->user_id : "NULL")
<< endl;
builder << std::string(indent, '\t') << "username: "
<< (ident->username != nullptr ? ident->username : "NULL") << endl;
builder << std::string(indent, '\t')
<< "fpr: " << (ident->fpr != nullptr ? ident->fpr : "NULL") << endl;
builder << std::string(indent, '\t') << "fpr: \""
<< (ident->fpr != nullptr ? ident->fpr : "NULL") << "\"" << endl;
builder << std::string(indent, '\t') << "comm_type: " << ident->comm_type << endl;
builder << std::string(indent, '\t')
<< "lang: " << static_cast<string>(ident->lang) << endl;
builder << std::string(indent, '\t') << "lang: \""
<< static_cast<string>(ident->lang) << "\"" << endl;
builder << std::string(indent, '\t') << "me: " << ident->me << endl;
builder << std::string(indent, '\t') << "major_ver: " << ident->major_ver << endl;
builder << std::string(indent, '\t') << "minor_ver: " << ident->minor_ver << endl;
@ -51,10 +50,11 @@ namespace pEp {
indent--;
builder << std::string(indent, '\t') << "}";
} else {
builder << "{ " << (ident->address != nullptr ? ident->address : "NULL") << "/"
<< (ident->user_id != nullptr ? ident->user_id : "NULL") << "/"
<< (ident->username != nullptr ? ident->username : "NULL") << "/"
<< (ident->fpr != nullptr ? ident->fpr : "NULL") << " }";
builder << std::string(indent, '\t') <<
"{ \"" << (ident->address != nullptr ? ident->address : "NULL") << "\" / \""
<< (ident->user_id != nullptr ? ident->user_id : "NULL") << "\" / \""
<< (ident->username != nullptr ? ident->username : "NULL") << "\" / \""
<< (ident->fpr != nullptr ? ident->fpr : "NULL") << " \" }";
}
} else {
builder << "NULL";
@ -63,6 +63,99 @@ namespace pEp {
return builder.str();
}
std::string to_string(const ::bloblist_t *const blob, bool full, int indent)
{
stringstream builder;
if (blob != nullptr) {
builder << endl;
builder << std::string(indent, '\t') << "[" << endl;
indent++;
for (const ::bloblist_t *curr = blob; curr != nullptr; curr = curr->next) {
builder << std::string(indent, '\t') << "{" << endl;
indent++;
builder << std::string(indent, '\t') << "filename: \""
<< (curr->filename != nullptr ? curr->filename : "NULL") << "\"" << endl;
builder << std::string(indent, '\t') << "mime_type: \""
<< (curr->mime_type != nullptr ? std::string(curr->mime_type) : "NULL")
<< "\"" << endl;
builder << std::string(indent, '\t') << "size: " << curr->size << endl;
builder << std::string(indent, '\t') << "value: \""
<< (curr->value != nullptr ? Utils::tldr(std::string(curr->value), 300)
: "NULL")
<< "\"" << endl;
indent--;
builder << std::string(indent, '\t') << "}" << endl;
}
indent--;
builder << std::string(indent, '\t') << "]" << endl;
} else {
builder << "NULL";
}
return builder.str();
}
std::string to_string(const ::stringpair_list_t *const spl, bool full, int indent)
{
stringstream builder;
if (spl != nullptr) {
builder << endl;
builder << std::string(indent, '\t') << "[" << endl;
indent++;
for (const ::stringpair_list_t *curr = spl; curr != nullptr; curr = curr->next) {
builder << std::string(indent, '\t') << "{ \"";
if (curr->value != nullptr) {
builder << (curr->value->key ? curr->value->key : "NULL");
builder << "\" : \"";
builder << (curr->value->value ? curr->value->value : "NULL");
}
builder << "\" }" << endl;
}
indent--;
builder << std::string(indent, '\t') << "]" << endl;
} else {
builder << "NULL";
}
return builder.str();
}
std::string to_string(const ::message *const msg, bool full, int indent)
{
stringstream builder;
if (msg != nullptr) {
builder << endl;
builder << std::string(indent, '\t') << "{" << endl;
indent++;
builder << std::string(indent, '\t') << "from: "
<< (msg->from != nullptr ? to_string(msg->from, full, indent) : "NULL")
<< endl;
builder << std::string(indent, '\t') << "to: "
<< (msg->to != nullptr ? to_string(msg->to, full, indent) : "NULL") << endl;
builder << std::string(indent, '\t') << "shortmsg: \""
<< (msg->shortmsg != nullptr ? msg->shortmsg : "NULL") << "\"" << endl;
builder << std::string(indent, '\t') << "longmsg: \""
<< (msg->longmsg != nullptr ? msg->longmsg : "NULL") << "\"" << endl;
builder << std::string(indent, '\t') << "enc_format: " << msg->enc_format << endl;
builder << std::string(indent, '\t')
<< "dir: " << (msg->dir == 0 ? "incomming" : "outgoing") << endl;
builder << std::string(indent, '\t') << "id: \""
<< (msg->id != nullptr ? msg->id : "NULL") << "\"" << endl;
builder << std::string(indent, '\t') << "opt_fields: "
<< (msg->opt_fields ? to_string(msg->opt_fields, full, indent) : "NULL")
<< endl;
builder << std::string(indent, '\t') << "attachments: "
<< (msg->attachments ? to_string(msg->attachments, full, indent) : "NULL")
<< endl;
indent--;
builder << std::string(indent, '\t') << "}" << endl;
} else {
builder << "NULL";
}
return builder.str();
}
std::string to_string(const ::identity_list *const idl, bool full, int indent)
{
stringstream builder;
@ -107,9 +200,8 @@ namespace pEp {
builder << endl;
builder << std::string(indent, '\t') << "[" << endl;
indent++;
for (const member_list *curr_member = mbl; curr_member != nullptr;
curr_member = curr_member->next) {
builder << to_string(curr_member->member, full, indent) << endl;
for (const member_list *curr = mbl; curr != nullptr; curr = curr->next) {
builder << to_string(curr->member, full, indent) << endl;
}
indent--;
builder << std::string(indent, '\t') << "]";
@ -143,5 +235,12 @@ namespace pEp {
return builder.str();
}
std::string readKey()
{
std::string ret;
std::cin >> ret;
return ret;
}
} // namespace Utils
} // namespace pEp

6
src/utils.hh
View File

@ -19,11 +19,17 @@ namespace pEp {
// pEpEngine datatypes to string
std::string to_string(const ::pEp_identity *const ident, bool full = true, int indent = 0);
std::string to_string(const ::bloblist_t *const ident, bool full = true, int indent = 0);
std::string to_string(const ::stringpair_list_t *const spl, bool full = true, int indent = 0);
std::string to_string(const ::message *const msg, bool full = true, int indent = 0);
std::string to_string(const ::identity_list *const idl, bool full = true, int indent = 0);
std::string to_string(const ::pEp_member *const member, bool full = true, int indent = 0);
std::string to_string(const ::member_list *const mbl, bool full = true, int indent = 0);
std::string to_string(const ::pEp_group *const group, bool full = true, int indent = 0);
// Misc
std::string readKey();
} // namespace Utils
} // namespace pEp
#endif // LIBPEPADAPTER_UTILS_HH
Write Preview
Loading…
Cancel
Save