diff options
Diffstat (limited to 'toolsrc/src/StatusParagraph.cpp')
| -rw-r--r-- | toolsrc/src/StatusParagraph.cpp | 56 |
1 files changed, 23 insertions, 33 deletions
diff --git a/toolsrc/src/StatusParagraph.cpp b/toolsrc/src/StatusParagraph.cpp index 63bfb2f9b..b9ceed278 100644 --- a/toolsrc/src/StatusParagraph.cpp +++ b/toolsrc/src/StatusParagraph.cpp @@ -1,4 +1,5 @@ #include "pch.h" + #include "StatusParagraph.h" #include "vcpkglib_helpers.h" @@ -6,24 +7,24 @@ using namespace vcpkg::details; namespace vcpkg { - // namespace BinaryParagraphRequiredField { static const std::string STATUS = "Status"; } - StatusParagraph::StatusParagraph() : want(Want::ERROR_STATE), state(InstallState::ERROR_STATE) - { - } + StatusParagraph::StatusParagraph() : want(Want::ERROR_STATE), state(InstallState::ERROR_STATE) {} void serialize(const StatusParagraph& pgh, std::string& out_str) { serialize(pgh.package, out_str); - out_str.append("Status: ").append(to_string(pgh.want)).append(" ok ").append(to_string(pgh.state)).push_back('\n'); + out_str.append("Status: ") + .append(to_string(pgh.want)) + .append(" ok ") + .append(to_string(pgh.state)) + .push_back('\n'); } - StatusParagraph::StatusParagraph(const std::unordered_map<std::string, std::string>& fields) - : package(fields) + StatusParagraph::StatusParagraph(const std::unordered_map<std::string, std::string>& fields) : package(fields) { std::string status_field = required_field(fields, BinaryParagraphRequiredField::STATUS); @@ -35,35 +36,24 @@ namespace vcpkg while (b != e && *b != ' ') ++b; - want = [](const std::string& text) - { - if (text == "unknown") - return Want::UNKNOWN; - if (text == "install") - return Want::INSTALL; - if (text == "hold") - return Want::HOLD; - if (text == "deinstall") - return Want::DEINSTALL; - if (text == "purge") - return Want::PURGE; - return Want::ERROR_STATE; - }(std::string(mark, b)); + want = [](const std::string& text) { + if (text == "unknown") return Want::UNKNOWN; + if (text == "install") return Want::INSTALL; + if (text == "hold") return Want::HOLD; + if (text == "deinstall") return Want::DEINSTALL; + if (text == "purge") return Want::PURGE; + return Want::ERROR_STATE; + }(std::string(mark, b)); - if (std::distance(b, e) < 4) - return; + if (std::distance(b, e) < 4) return; b += 4; - state = [](const std::string& text) - { - if (text == "not-installed") - return InstallState::NOT_INSTALLED; - if (text == "installed") - return InstallState::INSTALLED; - if (text == "half-installed") - return InstallState::HALF_INSTALLED; - return InstallState::ERROR_STATE; - }(std::string(b, e)); + state = [](const std::string& text) { + if (text == "not-installed") return InstallState::NOT_INSTALLED; + if (text == "installed") return InstallState::INSTALLED; + if (text == "half-installed") return InstallState::HALF_INSTALLED; + return InstallState::ERROR_STATE; + }(std::string(b, e)); } std::string to_string(InstallState f) |
