Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-03-22 01:44:49 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Add support for using variables in URL field of http action

Browse Source
This commit is contained in:
WarmUpTill 2023-02-23 00:47:43 +01:00 committed by WarmUpTill
parent a82a2ccffe
commit c8722c9f62
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/macro-core/macro-action-http.cpp
View File

@ -90,7 +90,7 @@ void MacroActionHttp::LogAction() const
bool MacroActionHttp::Save(obs_data_t *obj) const
{
MacroAction::Save(obj);
obs_data_set_string(obj, "url", _url.c_str());
_url.Save(obj, "url");
_data.Save(obj, "data");
obs_data_set_int(obj, "method", static_cast<int>(_method));
_timeout.Save(obj);
@ -100,7 +100,7 @@ bool MacroActionHttp::Save(obs_data_t *obj) const
bool MacroActionHttp::Load(obs_data_t *obj)
{
MacroAction::Load(obj);
_url = obs_data_get_string(obj, "url");
_url.Load(obj, "url");
_data.Load(obj, "data");
_method = static_cast<Method>(obs_data_get_int(obj, "method"));
_timeout.Load(obj);
@ -109,7 +109,7 @@ bool MacroActionHttp::Load(obs_data_t *obj)
std::string MacroActionHttp::GetShortDesc() const
{
return _url;
return _url.UnresolvedValue();
}
static inline void populateMethodSelection(QComboBox *list)
@ -122,7 +122,7 @@ static inline void populateMethodSelection(QComboBox *list)
MacroActionHttpEdit::MacroActionHttpEdit(
QWidget *parent, std::shared_ptr<MacroActionHttp> entryData)
: QWidget(parent),
_url(new QLineEdit()),
_url(new VariableLineEdit(this)),
_methods(new QComboBox()),
_data(new VariableTextEdit(this)),
_timeout(new DurationSelection(this, false))
@ -170,7 +170,7 @@ void MacroActionHttpEdit::UpdateEntryData()
return;
}
_url->setText(QString::fromStdString(_entryData->_url));
_url->setText(_entryData->_url);
_data->setPlainText(_entryData->_data);
_methods->setCurrentIndex(static_cast<int>(_entryData->_method));
_timeout->SetDuration(_entryData->_timeout);

6
src/macro-core/macro-action-http.hpp
View File

@ -1,6 +1,7 @@
#pragma once
#include "macro-action-edit.hpp"
#include "variable-text-edit.hpp"
#include "variable-line-edit.hpp"
#include "duration-control.hpp"
#include <QLineEdit>
@ -25,7 +26,8 @@ public:
POST,
};
std::string _url = obs_module_text("AdvSceneSwitcher.enterURL");
VariableResolvingString _url =
obs_module_text("AdvSceneSwitcher.enterURL");
VariableResolvingString _data =
obs_module_text("AdvSceneSwitcher.enterText");
Method _method = Method::GET;
@ -69,7 +71,7 @@ protected:
private:
void SetWidgetVisibility();
QLineEdit *_url;
VariableLineEdit *_url;
QComboBox *_methods;
VariableTextEdit *_data;
DurationSelection *_timeout;