sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SettingsInterface: Add Error to Save()

Browse Source
This commit is contained in:
Stenzek
2024-03-31 15:50:29 +10:00
parent eb504143c1
commit 693982d755
7 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/util/ini_settings_interface.cpp
View File

@ -1,14 +1,18 @@
// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <stenzek@gmail.com>
// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
#include "ini_settings_interface.h"
#include "common/file_system.h"
#include "common/log.h"
#include "common/path.h"
#include "common/string_util.h"
#include "common/error.h"
#include <algorithm>
#include <iterator>
#include <mutex>
Log_SetChannel(INISettingsInterface);
#ifdef _WIN32
@ -64,15 +68,18 @@ bool INISettingsInterface::Load()
return (err == SI_OK);
}
bool INISettingsInterface::Save()
bool INISettingsInterface::Save(Error* error /* = nullptr */)
{
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);
@ -80,10 +87,12 @@ bool INISettingsInterface::Save()
if (err != SI_OK)
{
Error::SetStringFmt(error, "INI SaveFile() failed: {}", static_cast<int>(err));
// remove temporary file
FileSystem::DeleteFile(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))
{
Log_ErrorPrintf("Failed to rename '%s' to '%s'", temp_filename.c_str(), m_filename.c_str());
FileSystem::DeleteFile(temp_filename.c_str());