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

UpdaterCommon: Replace FindOrCreateTempDir with File::CreateTempDir()

This commit is contained in:
OatmealDome 2020-06-29 13:54:39 -04:00
parent c87241479a
commit 243c6b58fe
1 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Source/Core/UpdaterCommon/UpdaterCommon.cpp
View File

@ -37,8 +37,6 @@ const std::array<u8, 32> UPDATE_PUB_KEY = {
0x2a, 0xb3, 0xd1, 0xdc, 0x6e, 0xf5, 0x07, 0xf6, 0xa0, 0x6c, 0x7c, 0x54, 0xdf, 0x54, 0xf4, 0x42, 0x2a, 0xb3, 0xd1, 0xdc, 0x6e, 0xf5, 0x07, 0xf6, 0xa0, 0x6c, 0x7c, 0x54, 0xdf, 0x54, 0xf4, 0x42,
0x80, 0xa6, 0x28, 0x8b, 0x6d, 0x70, 0x14, 0xb5, 0x4c, 0x34, 0x95, 0x20, 0x4d, 0xd4, 0xd3, 0x5d}; 0x80, 0xa6, 0x28, 0x8b, 0x6d, 0x70, 0x14, 0xb5, 0x4c, 0x34, 0x95, 0x20, 0x4d, 0xd4, 0xd3, 0x5d};
const char UPDATE_TEMP_DIR[] = "TempUpdate";
struct Manifest struct Manifest
{ {
using Filename = std::string; using Filename = std::string;
@ -323,33 +321,6 @@ TodoList ComputeActionsToDo(Manifest this_manifest, Manifest next_manifest)
return todo; return todo;
} }
std::optional<std::string> FindOrCreateTempDir(const std::string& base_path)
{
std::string temp_path = base_path + DIR_SEP + UPDATE_TEMP_DIR;
int counter = 0;
File::DeleteDirRecursively(temp_path);
do
{
if (File::CreateDir(temp_path))
{
return temp_path;
}
else
{
fprintf(log_fp, "Couldn't create temp directory.\n");
// Try again with a counter appended to the path.
std::string suffix = UPDATE_TEMP_DIR + std::to_string(counter);
temp_path = base_path + DIR_SEP + suffix;
}
} while (counter++ < 10);
fprintf(log_fp, "Could not find an appropriate temp directory name. Giving up.\n");
return {};
}
void CleanUpTempDir(const std::string& temp_dir, const TodoList& todo) void CleanUpTempDir(const std::string& temp_dir, const TodoList& todo)
{ {
// This is best-effort cleanup, we ignore most errors. // This is best-effort cleanup, we ignore most errors.
@ -749,10 +720,12 @@ bool RunUpdater(std::vector<std::string> args)
TodoList todo = ComputeActionsToDo(this_manifest, next_manifest); TodoList todo = ComputeActionsToDo(this_manifest, next_manifest);
todo.Log(); todo.Log();
std::optional<std::string> maybe_temp_dir = FindOrCreateTempDir(opts.install_base_path); std::string temp_dir = File::CreateTempDir();
if (!maybe_temp_dir) if (temp_dir.empty())
{
FatalError("Could not create temporary directory. Aborting.");
return false; return false;
std::string temp_dir = std::move(*maybe_temp_dir); }
UI::SetDescription("Performing Update..."); UI::SetDescription("Performing Update...");