Compare commits

...

2 Commits

Author SHA1 Message Date
1e7694df63 Simplify self_link for build 2024-12-16 21:31:27 -06:00
32a4d23784 Make it clear this is an internal error 2024-12-16 21:30:25 -06:00
2 changed files with 2 additions and 9 deletions

View File

@ -51,14 +51,7 @@ void build::parse_json(const std::string& json_data) {
{"can_be_cancelled", [this](const nlohmann::json& val) { can_be_cancelled = val.get<bool>(); }}, {"can_be_cancelled", [this](const nlohmann::json& val) { can_be_cancelled = val.get<bool>(); }},
{"can_be_retried", [this](const nlohmann::json& val) { can_be_retried = val.get<bool>(); }}, {"can_be_retried", [this](const nlohmann::json& val) { can_be_retried = val.get<bool>(); }},
{"title", [this](const nlohmann::json& val) { title = val.get<std::string>(); }}, {"title", [this](const nlohmann::json& val) { title = val.get<std::string>(); }},
{"self_link", [this](const nlohmann::json& val) { {"self_link", [this](const nlohmann::json& val) { self_link = val.get<std::string>(); }},
self_link = val.get<std::string>();
std::regex rgx("/builds/(\\d+)");
std::smatch match;
if (std::regex_search(self_link, match, rgx)) {
id = std::stol(match[1]);
}
}},
{"build_log_url", [this](const nlohmann::json& val) { build_log_url = val.get<std::string>(); }}, {"build_log_url", [this](const nlohmann::json& val) { build_log_url = val.get<std::string>(); }},
{"upload_log_url", [this](const nlohmann::json& val) { upload_log_url = val.get<std::string>(); }}, {"upload_log_url", [this](const nlohmann::json& val) { upload_log_url = val.get<std::string>(); }},
{"duration", [this](const nlohmann::json& val) { duration = val.get<std::string>(); }}, {"duration", [this](const nlohmann::json& val) { duration = val.get<std::string>(); }},

View File

@ -214,7 +214,7 @@ std::string launchpad::build_full_url(const std::string& endpoint) const {
} else if (endpoint != "") { } else if (endpoint != "") {
return service_root + "/" + api_version + "/" + endpoint; return service_root + "/" + api_version + "/" + endpoint;
} }
std::cerr << "endpoint is empty" << std::endl; std::cerr << "Internal error: endpoint is empty" << std::endl;
return ""; return "";
} }