TeaSpeak/TeaSpeakLibrary
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some minor and small fixes

Browse Source
This commit is contained in:
WolverinDEV 2020-12-05 16:27:40 +01:00
parent 38cebf23a1
commit d2720897c4
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/query/command3.h
View File

@ -317,37 +317,45 @@ namespace ts {
template <typename vector_t = std::vector<std::string>> template <typename vector_t = std::vector<std::string>>
class command_builder_impl { class command_builder_impl {
public: public:
explicit command_builder_impl(std::string command, size_t expected_bulk_size = 128, size_t expected_bulks = 1) : _identifier{std::move(command)}, expected_bulk_size{expected_bulk_size} { explicit command_builder_impl(std::string command, size_t expected_bulk_size = 128, size_t expected_bulks = 1) : identifier_{std::move(command)}, expected_bulk_size{expected_bulk_size} {
for(size_t index = 0; index < expected_bulks; index++) for(size_t index = 0; index < expected_bulks; index++)
this->bulks.emplace_back(" ").reserve(expected_bulk_size); this->bulks.emplace_back("").reserve(expected_bulk_size);
} }
inline command_builder_impl<std::vector<std::string>> as_normalized() { inline command_builder_impl<std::vector<std::string>> as_normalized() {
return command_builder_impl<std::vector<std::string>>{this->expected_bulk_size, this->_identifier, this->bulks.begin(), this->bulks.end()}; return command_builder_impl<std::vector<std::string>>{this->expected_bulk_size, this->identifier_, this->bulks.begin(), this->bulks.end()};
} }
inline std::string build(bool with_empty = false) const { inline std::string build(bool with_empty = false) const {
if(this->builded.has_value() && !this->flag_changed) if(this->builded.has_value() && !this->flag_changed) {
return this->builded.value(); return this->builded.value();
}
std::string result{}; std::string result{};
size_t required_size{this->_identifier.size()}; size_t required_size{this->identifier_.size()};
for(auto& entry : this->bulks) for(auto& entry : this->bulks) {
required_size += entry.size() + 1; required_size += entry.size() + 1;
}
result.append(this->identifier_);
result.append(this->_identifier);
for(auto it = this->bulks.begin(); it != this->bulks.end(); it++) { for(auto it = this->bulks.begin(); it != this->bulks.end(); it++) {
if(it->empty() && !with_empty) continue; if(it->empty() && !with_empty) {
continue;
}
result.append(*it, 0, it->length() - 1); result.append(*it, 0, it->length() - 1);
if(it + 1 != this->bulks.end()) if(it + 1 != this->bulks.end()) {
result.append("|"); result.append("|");
}
} }
if(!with_empty && !result.empty() && result.back() == '|') { if(!with_empty && !result.empty() && result.back() == '|') {
this->builded = result.substr(0, result.length() - 1); this->builded = result.substr(0, result.length() - 1);
} else { } else {
this->builded = result; this->builded = result;
} }
this->flag_changed = false; this->flag_changed = false;
return this->builded.value(); return this->builded.value();
} }
@ -398,10 +406,10 @@ namespace ts {
bulk = " "; bulk = " ";
} }
private: private:
command_builder_impl(size_t expected, std::string identifier, typename vector_t::iterator begin, typename vector_t::iterator end) : expected_bulk_size{expected}, _identifier{std::move(identifier)}, bulks{begin, end} {} command_builder_impl(size_t expected, std::string identifier, typename vector_t::iterator begin, typename vector_t::iterator end) : expected_bulk_size{expected}, identifier_{std::move(identifier)}, bulks{begin, end} {}
const size_t expected_bulk_size; const size_t expected_bulk_size;
const std::string _identifier; const std::string identifier_;
mutable bool flag_changed{false}; mutable bool flag_changed{false};
mutable std::optional<std::string> builded{}; mutable std::optional<std::string> builded{};
vector_t bulks{}; vector_t bulks{};