Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-08-12 20:28:11 -05:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Format json strings of user input and source settings

Browse Source 
Source settings and user specified settings might use different json
formatting and thus not match even though the json contents match.

It might not be possible to do the formatting for regex strings so
revert to the originally specified settings string if it cannot.
This commit is contained in:
WarmUpTill
2021-08-07 09:16:36 +02:00
committed by WarmUpTill
parent 7b2c2e91db
commit e3004184c4
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/utility.cpp
View File

@@ -283,14 +283,22 @@ bool compareSourceSettings(const OBSWeakSource &source,
{
bool ret = false;
std::string currentSettings = getSourceSettings(source);
// User input and source settings might be formatted differently
currentSettings = formatJsonString(currentSettings).toStdString();
std::string userSettings = formatJsonString(settings).toStdString();
if (userSettings.empty()) {
userSettings = settings;
}
if (useRegex) {
try {
std::regex expr(settings);
std::regex expr(userSettings);
ret = std::regex_match(currentSettings, expr);
} catch (const std::regex_error &) {
}
} else {
ret = currentSettings == settings;
ret = currentSettings == userSettings;
}
return ret;
}
@@ -304,12 +312,12 @@ std::string getDataFilePath(const std::string &file)
return "";
}
QString fromatJsonString(std::string s)
QString formatJsonString(std::string s)
{
return fromatJsonString(s.c_str());
return formatJsonString(s.c_str());
}
QString fromatJsonString(const char *json)
QString formatJsonString(const char *json)
{
QJsonDocument doc = QJsonDocument::fromJson(json);
return doc.toJson(QJsonDocument::Indented);