ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SettingsInterface: Add Error to Save()

This commit is contained in:
Stenzek 2024-04-01 20:57:04 +10:00 committed by Connor McLaughlin
parent 81502e6c7d
commit 332be6c771
7 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/MemorySettingsInterface.cpp
View File

@ -1,15 +1,17 @@
// SPDX-FileCopyrightText: 2002-2023 PCSX2 Dev Team
// SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team
// SPDX-License-Identifier: LGPL-3.0+
#include "common/MemorySettingsInterface.h"
#include "common/StringUtil.h"
#include "MemorySettingsInterface.h"
#include "Error.h"
#include "StringUtil.h"
MemorySettingsInterface::MemorySettingsInterface() = default;
MemorySettingsInterface::~MemorySettingsInterface() = default;
bool MemorySettingsInterface::Save()
bool MemorySettingsInterface::Save(Error* error)
{
Error::SetStringView(error, "Memory settings cannot be saved.");
return false;
}

4
common/MemorySettingsInterface.h
View File

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2002-2023 PCSX2 Dev Team
// SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team
// SPDX-License-Identifier: LGPL-3.0+
#pragma once
@ -12,7 +12,7 @@ public:
MemorySettingsInterface();
~MemorySettingsInterface();
bool Save() override;
bool Save(Error* error = nullptr) override;
void Clear() override;

7
common/SettingsInterface.h
View File

@ -1,19 +1,22 @@
// SPDX-FileCopyrightText: 2002-2023 PCSX2 Dev Team
// SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team
// SPDX-License-Identifier: LGPL-3.0+
#pragma once
#include "Pcsx2Defs.h"
#include <string>
#include <optional>
#include <vector>
class Error;
class SettingsInterface
{
public:
virtual ~SettingsInterface() = default;
virtual bool Save() = 0;
virtual bool Save(Error* error = nullptr) = 0;
virtual void Clear() = 0;
virtual bool GetIntValue(const char* section, const char* key, int* value) const = 0;

16
pcsx2/INISettingsInterface.cpp
View File

@ -1,10 +1,13 @@
// SPDX-FileCopyrightText: 2002-2023 PCSX2 Dev Team
// SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team
// SPDX-License-Identifier: LGPL-3.0+
#include "INISettingsInterface.h"
#include "common/Error.h"
#include "common/FileSystem.h"
#include "common/Console.h"
#include "common/StringUtil.h"
#include <algorithm>
#include <iterator>
#include <mutex>
@ -66,15 +69,18 @@ bool INISettingsInterface::Load()
return (err == SI_OK);
}
bool INISettingsInterface::Save()
bool INISettingsInterface::Save(Error* error)
{
if (m_filename.empty())
{
Error::SetStringView(error, "Filename is not set.");
return false;
}
std::unique_lock lock(s_ini_load_save_mutex);
std::string temp_filename(GetTemporaryFileName(m_filename));
SI_Error err = SI_FAIL;
std::FILE* fp = FileSystem::OpenCFile(temp_filename.c_str(), "wb");
std::FILE* fp = FileSystem::OpenCFile(temp_filename.c_str(), "wb", error);
if (fp)
{
err = m_ini.SaveFile(fp, false);
@ -82,10 +88,12 @@ bool INISettingsInterface::Save()
if (err != SI_OK)
{
Error::SetStringFmt(error, "INI SaveFile() failed: {}", static_cast<int>(err));
// remove temporary file
FileSystem::DeleteFilePath(temp_filename.c_str());
}
else if (!FileSystem::RenamePath(temp_filename.c_str(), m_filename.c_str()))
else if (!FileSystem::RenamePath(temp_filename.c_str(), m_filename.c_str(), error))
{
Console.Error("Failed to rename '%s' to '%s'", temp_filename.c_str(), m_filename.c_str());
FileSystem::DeleteFilePath(temp_filename.c_str());

4
pcsx2/INISettingsInterface.h
View File

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2002-2023 PCSX2 Dev Team
// SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team
// SPDX-License-Identifier: LGPL-3.0+
#pragma once
@ -20,7 +20,7 @@ public:
bool IsDirty() const { return m_dirty; }
bool Load();
bool Save() override;
bool Save(Error* error = nullptr) override;
void Clear() override;

5
pcsx2/LayeredSettingsInterface.cpp
View File

@ -1,7 +1,8 @@
// SPDX-FileCopyrightText: 2002-2023 PCSX2 Dev Team
// SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team
// SPDX-License-Identifier: LGPL-3.0+
#include "LayeredSettingsInterface.h"
#include "common/Assertions.h"
#include <unordered_set>
@ -10,7 +11,7 @@ LayeredSettingsInterface::LayeredSettingsInterface() = default;
LayeredSettingsInterface::~LayeredSettingsInterface() = default;
bool LayeredSettingsInterface::Save()
bool LayeredSettingsInterface::Save(Error* error)
{
pxFailRel("Attempting to save layered settings interface");
return false;

6
pcsx2/LayeredSettingsInterface.h
View File

@ -1,8 +1,10 @@
// SPDX-FileCopyrightText: 2002-2023 PCSX2 Dev Team
// SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team
// SPDX-License-Identifier: LGPL-3.0+
#pragma once
#include "common/SettingsInterface.h"
#include <array>
class LayeredSettingsInterface final : public SettingsInterface
@ -23,7 +25,7 @@ public:
SettingsInterface* GetLayer(Layer layer) const { return m_layers[layer]; }
void SetLayer(Layer layer, SettingsInterface* sif) { m_layers[layer] = sif; }
bool Save() override;
bool Save(Error* error = nullptr) override;
void Clear() override;