mirror of
https://github.com/WarmUpTill/SceneSwitcher.git
synced 2026-03-21 17:34:57 -05:00
Backup setting on exit to plugin config dir
Only one version of the settings file will be kept per scene collection and plugin version combination
This commit is contained in:
parent
f50f31ec4c
commit
2b2bab8fbc
|
|
@ -147,6 +147,8 @@ target_sources(
|
||||||
${LIB_NAME}
|
${LIB_NAME}
|
||||||
PRIVATE lib/utils/action-queue.cpp
|
PRIVATE lib/utils/action-queue.cpp
|
||||||
lib/utils/action-queue.hpp
|
lib/utils/action-queue.hpp
|
||||||
|
lib/utils/backup.cpp
|
||||||
|
lib/utils/backup.hpp
|
||||||
lib/utils/curl-helper.cpp
|
lib/utils/curl-helper.cpp
|
||||||
lib/utils/curl-helper.hpp
|
lib/utils/curl-helper.hpp
|
||||||
lib/utils/duration-control.cpp
|
lib/utils/duration-control.cpp
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
#include "advanced-scene-switcher.hpp"
|
#include "advanced-scene-switcher.hpp"
|
||||||
|
#include "backup.hpp"
|
||||||
#include "curl-helper.hpp"
|
#include "curl-helper.hpp"
|
||||||
#include "log-helper.hpp"
|
#include "log-helper.hpp"
|
||||||
#include "macro-helpers.hpp"
|
#include "macro-helpers.hpp"
|
||||||
|
|
@ -17,7 +18,6 @@
|
||||||
#include <obs-frontend-api.h>
|
#include <obs-frontend-api.h>
|
||||||
#include <QAction>
|
#include <QAction>
|
||||||
#include <QDirIterator>
|
#include <QDirIterator>
|
||||||
#include <QFileDialog>
|
|
||||||
#include <QMainWindow>
|
#include <QMainWindow>
|
||||||
#include <QTextStream>
|
#include <QTextStream>
|
||||||
#include <regex>
|
#include <regex>
|
||||||
|
|
@ -143,7 +143,6 @@ bool AdvSceneSwitcher::eventFilter(QObject *obj, QEvent *event)
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* Saving and loading
|
* Saving and loading
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
static void AskForBackup(const QString &json);
|
|
||||||
|
|
||||||
static void SaveSceneSwitcher(obs_data_t *save_data, bool saving, void *)
|
static void SaveSceneSwitcher(obs_data_t *save_data, bool saving, void *)
|
||||||
{
|
{
|
||||||
|
|
@ -192,34 +191,6 @@ static void SaveSceneSwitcher(obs_data_t *save_data, bool saving, void *)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void AskForBackup(const QString &json)
|
|
||||||
{
|
|
||||||
const bool backupWasConfirmed = DisplayMessage(
|
|
||||||
obs_module_text("AdvSceneSwitcher.askBackup"), true, false);
|
|
||||||
|
|
||||||
if (!backupWasConfirmed) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
QString path = QFileDialog::getSaveFileName(
|
|
||||||
nullptr,
|
|
||||||
obs_module_text(
|
|
||||||
"AdvSceneSwitcher.generalTab.saveOrLoadsettings.exportWindowTitle"),
|
|
||||||
GetDefaultSettingsSaveLocation(),
|
|
||||||
obs_module_text(
|
|
||||||
"AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType"));
|
|
||||||
if (path.isEmpty()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
QFile file(path);
|
|
||||||
if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
auto out = QTextStream(&file);
|
|
||||||
out << json;
|
|
||||||
}
|
|
||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* Main switcher thread
|
* Main switcher thread
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
|
|
@ -635,6 +606,8 @@ static void handleShutdown()
|
||||||
// TODO: Look for a way to possibly resolve this
|
// TODO: Look for a way to possibly resolve this
|
||||||
obs_frontend_save();
|
obs_frontend_save();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BackupSettingsOfCurrentVersion();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void handleSceneCollectionChanging()
|
static void handleSceneCollectionChanging()
|
||||||
|
|
|
||||||
86
lib/utils/backup.cpp
Normal file
86
lib/utils/backup.cpp
Normal file
|
|
@ -0,0 +1,86 @@
|
||||||
|
#include "backup.hpp"
|
||||||
|
#include "log-helper.hpp"
|
||||||
|
#include "obs-module-helper.hpp"
|
||||||
|
#include "path-helpers.hpp"
|
||||||
|
#include "plugin-state-helpers.hpp"
|
||||||
|
#include "ui-helpers.hpp"
|
||||||
|
#include "version.h"
|
||||||
|
|
||||||
|
#include <obs-frontend-api.h>
|
||||||
|
#include <obs-module.h>
|
||||||
|
#include <QFileDialog>
|
||||||
|
#include <QTextStream>
|
||||||
|
#include <util/config-file.h>
|
||||||
|
|
||||||
|
namespace advss {
|
||||||
|
|
||||||
|
void AskForBackup(const QString &json)
|
||||||
|
{
|
||||||
|
const bool backupWasConfirmed = DisplayMessage(
|
||||||
|
obs_module_text("AdvSceneSwitcher.askBackup"), true, false);
|
||||||
|
|
||||||
|
if (!backupWasConfirmed) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString path = QFileDialog::getSaveFileName(
|
||||||
|
nullptr,
|
||||||
|
obs_module_text(
|
||||||
|
"AdvSceneSwitcher.generalTab.saveOrLoadsettings.exportWindowTitle"),
|
||||||
|
GetDefaultSettingsSaveLocation(),
|
||||||
|
obs_module_text(
|
||||||
|
"AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType"));
|
||||||
|
if (path.isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
QFile file(path);
|
||||||
|
if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
auto out = QTextStream(&file);
|
||||||
|
out << json;
|
||||||
|
}
|
||||||
|
|
||||||
|
void BackupSettingsOfCurrentVersion()
|
||||||
|
{
|
||||||
|
auto sceneCollectionName = obs_frontend_get_current_scene_collection();
|
||||||
|
const std::string fileName =
|
||||||
|
std::string("settings-backup-") +
|
||||||
|
(sceneCollectionName ? sceneCollectionName : "-") + "-" +
|
||||||
|
g_GIT_TAG + ".json";
|
||||||
|
bfree(sceneCollectionName);
|
||||||
|
auto settingsFile = obs_module_config_path(fileName.c_str());
|
||||||
|
if (!settingsFile) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString dirPath = QFileInfo(settingsFile).absolutePath();
|
||||||
|
QDir dir(dirPath);
|
||||||
|
if (!dir.exists()) {
|
||||||
|
if (!dir.mkpath(dirPath)) {
|
||||||
|
blog(LOG_WARNING,
|
||||||
|
"failed to create directory to save automated backup");
|
||||||
|
bfree(settingsFile);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QFile file(settingsFile);
|
||||||
|
if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
|
||||||
|
bfree(settingsFile);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
OBSDataAutoRelease data = obs_data_create();
|
||||||
|
SavePluginSettings(data);
|
||||||
|
|
||||||
|
auto settings = obs_data_get_json(data);
|
||||||
|
QString settingsString = QString(settings ? settings : "");
|
||||||
|
|
||||||
|
auto out = QTextStream(&file);
|
||||||
|
out << settingsString;
|
||||||
|
bfree(settingsFile);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace advss
|
||||||
9
lib/utils/backup.hpp
Normal file
9
lib/utils/backup.hpp
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
#pragma once
|
||||||
|
#include <QString>
|
||||||
|
|
||||||
|
namespace advss {
|
||||||
|
|
||||||
|
void AskForBackup(const QString &json);
|
||||||
|
void BackupSettingsOfCurrentVersion();
|
||||||
|
|
||||||
|
} // namespace advss
|
||||||
|
|
@ -3,6 +3,11 @@
|
||||||
|
|
||||||
namespace advss {
|
namespace advss {
|
||||||
|
|
||||||
|
void SavePluginSettings(obs_data_t *obj)
|
||||||
|
{
|
||||||
|
GetSwitcher()->SaveSettings(obj);
|
||||||
|
}
|
||||||
|
|
||||||
void LoadPluginSettings(obs_data_t *obj)
|
void LoadPluginSettings(obs_data_t *obj)
|
||||||
{
|
{
|
||||||
GetSwitcher()->LoadSettings(obj);
|
GetSwitcher()->LoadSettings(obj);
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
|
|
||||||
namespace advss {
|
namespace advss {
|
||||||
|
|
||||||
|
void SavePluginSettings(obs_data_t *);
|
||||||
EXPORT void LoadPluginSettings(obs_data_t *);
|
EXPORT void LoadPluginSettings(obs_data_t *);
|
||||||
|
|
||||||
EXPORT void AddSaveStep(std::function<void(obs_data_t *)>);
|
EXPORT void AddSaveStep(std::function<void(obs_data_t *)>);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user