Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-03-21 17:34:57 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Keep URL parameters if parameters input is not used

Browse Source
This commit is contained in:
WarmUpTill 2026-01-04 22:26:24 +01:00 committed by WarmUpTill
parent a8d483f5a7
commit 4c493451f4
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/http/macro-action-http.cpp
View File

@ -70,7 +70,7 @@ struct URLInfo {
std::string path;
};
static URLInfo getURLInfo(const std::string &input)
static URLInfo getURLInfo(const std::string &input, bool keepParams)
{
if (input.empty()) {
return {};
@ -84,21 +84,35 @@ static URLInfo getURLInfo(const std::string &input)
const QUrl url(urlInput);
auto host =
url.scheme().toStdString() + "://" + url.host().toStdString();
int port = url.port();
const int port = url.port();
if (port != -1) {
host += ":" + std::to_string(port);
}
auto path = url.path().toStdString();
if (path.empty()) {
path = "/";
}
const auto query = url.query().toStdString();
if (!query.empty()) {
if (keepParams) {
path += "?" + query;
} else {
blog(LOG_WARNING,
"ignoring query parameters \"%s\" in URL field. "
"Using parameter field values instead.",
query.c_str());
}
}
return {host, path};
}
bool MacroActionHttp::PerformAction()
{
const auto [host, path] = getURLInfo(_url);
const auto [host, path] = getURLInfo(_url, !_setParams);
httplib::Client cli(host);
setTimeout(cli, _timeout);