Leahnaya/JKSV
1
0
Fork 0
mirror of https://github.com/J-D-K/JKSV.git synced 2026-09-12 12:35:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add fs::move_directory_recursively.

Browse Source
This commit is contained in:
J-D-K
2025-09-21 12:10:48 -04:00
parent f1f10a09e0
commit 418cd3c3d3
4 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/appstates/SettingsState.cpp
View File

@@ -6,6 +6,7 @@
#include "config/config.hpp"
#include "data/data.hpp"
#include "error.hpp"
#include "fs/fs.hpp"
#include "fslib.hpp"
#include "graphics/colors.hpp"
#include "input.hpp"
@@ -156,28 +157,34 @@ void SettingsState::change_working_directory()
const char *popSuccessFormat = strings::get_by_name(strings::names::SETTINGS_POPS, 1);
const char *popFailed = strings::get_by_name(strings::names::SETTINGS_POPS, 2);
const std::string oldPath = config::get_working_directory().string();
const fslib::Path oldPath = config::get_working_directory();
std::array<char, FS_MAX_PATH> pathBuffer = {0};
const bool input = keyboard::get_input(SwkbdType_Normal, oldPath, inputHeader, pathBuffer.data(), FS_MAX_PATH);
const bool input =
keyboard::get_input(SwkbdType_Normal, oldPath.string().c_str(), inputHeader, pathBuffer.data(), FS_MAX_PATH);
if (!input) { return; }
const fslib::Path newPath{pathBuffer.data()};
const bool exists = fslib::directory_exists(newPath);
if (exists)
if (!newPath.is_valid())
{
ui::PopMessageManager::push_message(popTicks, popFailed);
return;
}
const bool pathSet = config::set_working_directory(newPath);
const bool renameError = pathSet && error::fslib(fslib::rename_directory(oldPath, newPath));
if (!pathSet || renameError)
const bool exists = fslib::directory_exists(newPath);
bool moved{};
if (exists) { moved = fs::move_directory_recursively(oldPath, newPath); }
else { moved = fslib::rename_directory(oldPath, newPath); }
if (!moved)
{
ui::PopMessageManager::push_message(popTicks, popFailed);
return;
}
// Since the path was validated before, this shouldn't need to be checked.
config::set_working_directory(newPath);
const std::string newPathString = newPath.string();
std::string popMessage = stringutil::get_formatted_string(popSuccessFormat, newPathString.c_str());
ui::PopMessageManager::push_message(popTicks, popMessage);