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

Enable getting variable values from file condition

Browse Source
This commit is contained in:
WarmUpTill 2023-01-14 19:00:10 +01:00 committed by WarmUpTill
parent 87ed11d3bf
commit c4c4a27dcb
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/macro-core/macro-condition-file.cpp
View File

@ -66,6 +66,7 @@ bool MacroConditionFile::MatchFileContent(QString &filedata)
bool MacroConditionFile::CheckRemoteFileContent()
{
std::string data = getRemoteData(_file);
SetVariableValue(data);
QString qdata = QString::fromStdString(data);
return MatchFileContent(qdata);
}
@ -86,6 +87,7 @@ bool MacroConditionFile::CheckLocalFileContent()
}
QString filedata = QTextStream(&file).readAll();
SetVariableValue(filedata.toStdString());
bool match = MatchFileContent(filedata);
file.close();
@ -126,6 +128,7 @@ bool MacroConditionFile::CheckChangeDate()
QFile file(QString::fromStdString(_file));
QDateTime newLastMod = QFileInfo(file).lastModified();
SetVariableValue(newLastMod.toString().toStdString());
const bool dateChanged = _lastMod != newLastMod;
_lastMod = newLastMod;
return dateChanged;
@ -133,20 +136,29 @@ bool MacroConditionFile::CheckChangeDate()
bool MacroConditionFile::CheckCondition()
{
bool ret = false;
switch (_condition) {
case MacroConditionFile::ConditionType::MATCH:
if (_fileType == FileType::REMOTE) {
return CheckRemoteFileContent();
ret = CheckRemoteFileContent();
break;
}
return CheckLocalFileContent();
ret = CheckLocalFileContent();
break;
case MacroConditionFile::ConditionType::CONTENT_CHANGE:
return CheckChangeContent();
ret = CheckChangeContent();
break;
case MacroConditionFile::ConditionType::DATE_CHANGE:
return CheckChangeDate();
ret = CheckChangeDate();
break;
default:
break;
}
if (GetVariableValue().empty()) {
SetVariableValue(ret ? "true" : "false");
}
return false;
}

2
src/macro-core/macro-condition-file.hpp
View File

@ -13,7 +13,7 @@
class MacroConditionFile : public MacroCondition {
public:
MacroConditionFile(Macro *m) : MacroCondition(m) {}
MacroConditionFile(Macro *m) : MacroCondition(m, true) {}
bool CheckCondition();
bool Save(obs_data_t *obj) const;
bool Load(obs_data_t *obj);