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

Code style update.

Browse Source
This commit is contained in:
J-D-K
2025-02-21 13:31:40 -05:00
parent 88e66992ed
commit 11672043c3
71 changed files with 1027 additions and 810 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
source/appstates/UserOptionState.cpp
View File

@@ -35,11 +35,11 @@ typedef struct
// Declarations here. Defintions after class.
// Backs up all save data for the target user.
static void backupAllForUser(sys::ProgressTask *task, std::shared_ptr<UserStruct> dataStruct);
static void backup_all_for_user(sys::ProgressTask *task, std::shared_ptr<UserStruct> dataStruct);
// // Creates all save data for the current user.
static void createAllSaveDataForUser(sys::Task *task, std::shared_ptr<UserStruct> dataStruct);
static void create_all_save_data_for_user(sys::Task *task, std::shared_ptr<UserStruct> dataStruct);
// // Deletes all save data from the system for the target user.
static void deleteAllSaveDataForUser(sys::Task *task, std::shared_ptr<UserStruct> dataStruct);
static void delete_all_save_data_for_user(sys::Task *task, std::shared_ptr<UserStruct> dataStruct);
UserOptionState::UserOptionState(data::User *user, TitleSelectCommon *titleSelect)
: m_user(user), m_titleSelect(titleSelect), m_userOptionMenu(8, 8, 460, 22, 720)
@@ -52,91 +52,100 @@ UserOptionState::UserOptionState(data::User *user, TitleSelectCommon *titleSelec
int currentStringIndex = 0;
const char *currentString = nullptr;
while ((currentString = strings::getByName(strings::names::USER_OPTIONS, currentStringIndex++)) != nullptr)
while ((currentString = strings::get_by_name(strings::names::USER_OPTIONS, currentStringIndex++)) != nullptr)
{
m_userOptionMenu.addOption(stringutil::getFormattedString(currentString, m_user->getNickname()));
m_userOptionMenu.add_option(stringutil::get_formatted_string(currentString, m_user->get_nickname()));
}
}
void UserOptionState::update(void)
{
m_menuPanel->update(AppState::hasFocus());
m_menuPanel->update(AppState::has_focus());
if (input::buttonPressed(HidNpadButton_A) && m_user->getAccountSaveType() != FsSaveDataType_System)
if (input::button_pressed(HidNpadButton_A) && m_user->get_account_save_type() != FsSaveDataType_System)
{
switch (m_userOptionMenu.getSelected())
switch (m_userOptionMenu.get_selected())
{
case BACKUP_ALL:
{
// This is broken down to make it easier to read.
std::string queryString =
stringutil::getFormattedString(strings::getByName(strings::names::USER_OPTION_CONFIRMATIONS, 0), m_user->getNickname());
stringutil::get_formatted_string(strings::get_by_name(strings::names::USER_OPTION_CONFIRMATIONS, 0),
m_user->get_nickname());
// Data to send if confirmed.
std::shared_ptr<UserStruct> dataStruct(new UserStruct);
dataStruct->m_targetUser = m_user;
// State to push
std::shared_ptr<ConfirmState<sys::ProgressTask, ProgressState, UserStruct>> confirmBackupAll =
auto confirmBackupAll =
std::make_shared<ConfirmState<sys::ProgressTask, ProgressState, UserStruct>>(queryString,
false,
backupAllForUser,
backup_all_for_user,
dataStruct);
JKSV::pushState(confirmBackupAll);
JKSV::push_state(confirmBackupAll);
}
break;
case CREATE_SAVE:
{
// This just pushes the state with the menu to select.
JKSV::pushState(std::make_shared<SaveCreateState>(m_user, m_titleSelect));
JKSV::push_state(std::make_shared<SaveCreateState>(m_user, m_titleSelect));
}
break;
case CREATE_ALL_SAVE:
{
std::string queryString =
stringutil::getFormattedString(strings::getByName(strings::names::USER_OPTION_CONFIRMATIONS, 1), m_user->getNickname());
stringutil::get_formatted_string(strings::get_by_name(strings::names::USER_OPTION_CONFIRMATIONS, 1),
m_user->get_nickname());
std::shared_ptr<UserStruct> dataStruct(new UserStruct);
dataStruct->m_targetUser = m_user;
std::shared_ptr<ConfirmState<sys::Task, TaskState, UserStruct>> confirmCreateAll =
std::make_shared<ConfirmState<sys::Task, TaskState, UserStruct>>(queryString, true, createAllSaveDataForUser, dataStruct);
auto confirmCreateAll =
std::make_shared<ConfirmState<sys::Task, TaskState, UserStruct>>(queryString,
true,
create_all_save_data_for_user,
dataStruct);
// Done?
JKSV::pushState(confirmCreateAll);
JKSV::push_state(confirmCreateAll);
}
break;
case DELETE_ALL_SAVE:
{
std::string queryString =
stringutil::getFormattedString(strings::getByName(strings::names::USER_OPTION_CONFIRMATIONS, 2), m_user->getNickname());
stringutil::get_formatted_string(strings::get_by_name(strings::names::USER_OPTION_CONFIRMATIONS, 2),
m_user->get_nickname());
std::shared_ptr<UserStruct> dataStruct(new UserStruct);
dataStruct->m_targetUser = m_user;
std::shared_ptr<ConfirmState<sys::Task, TaskState, UserStruct>> confirmDeleteAll =
std::make_shared<ConfirmState<sys::Task, TaskState, UserStruct>>(queryString, true, deleteAllSaveDataForUser, dataStruct);
auto confirmDeleteAll =
std::make_shared<ConfirmState<sys::Task, TaskState, UserStruct>>(queryString,
true,
delete_all_save_data_for_user,
dataStruct);
JKSV::pushState(confirmDeleteAll);
JKSV::push_state(confirmDeleteAll);
}
break;
}
}
else if (input::buttonPressed(HidNpadButton_B))
else if (input::button_pressed(HidNpadButton_B))
{
m_menuPanel->close();
}
else if (m_menuPanel->isClosed())
else if (m_menuPanel->is_closed())
{
AppState::deactivate();
m_menuPanel->reset();
}
m_userOptionMenu.update(AppState::hasFocus());
m_userOptionMenu.update(AppState::has_focus());
}
void UserOptionState::render(void)
@@ -145,20 +154,20 @@ void UserOptionState::render(void)
m_titleSelect->render();
// Render panel.
m_menuPanel->clearTarget();
m_userOptionMenu.render(m_menuPanel->get(), AppState::hasFocus());
m_menuPanel->render(NULL, AppState::hasFocus());
m_menuPanel->clear_target();
m_userOptionMenu.render(m_menuPanel->get(), AppState::has_focus());
m_menuPanel->render(NULL, AppState::has_focus());
}
static void backupAllForUser(sys::ProgressTask *task, std::shared_ptr<UserStruct> dataStruct)
static void backup_all_for_user(sys::ProgressTask *task, std::shared_ptr<UserStruct> dataStruct)
{
data::User *targetUser = dataStruct->m_targetUser;
for (size_t i = 0; i < targetUser->getTotalDataEntries(); i++)
for (size_t i = 0; i < targetUser->get_total_data_entries(); i++)
{
// This should be safe like this....
FsSaveDataInfo *currentSaveInfo = targetUser->getSaveInfoAt(i);
data::TitleInfo *currentTitle = data::getTitleInfoByID(currentSaveInfo->application_id);
FsSaveDataInfo *currentSaveInfo = targetUser->get_save_info_at(i);
data::TitleInfo *currentTitle = data::get_title_info_by_id(currentSaveInfo->application_id);
if (!currentSaveInfo || !currentTitle)
{
@@ -166,14 +175,15 @@ static void backupAllForUser(sys::ProgressTask *task, std::shared_ptr<UserStruct
}
// Try to create target game folder.
fslib::Path gameFolder = config::getWorkingDirectory() / currentTitle->getPathSafeTitle();
fslib::Path gameFolder = config::get_working_directory() / currentTitle->get_path_safe_title();
if (!fslib::directoryExists(gameFolder) && !fslib::createDirectory(gameFolder))
{
continue;
}
// Try to mount save data.
bool saveMounted = fslib::openSaveFileSystemWithSaveDataInfo(fs::DEFAULT_SAVE_MOUNT, *targetUser->getSaveInfoAt(i));
bool saveMounted =
fslib::openSaveFileSystemWithSaveDataInfo(fs::DEFAULT_SAVE_MOUNT, *targetUser->get_save_info_at(i));
// Check to make sure the save actually has data to avoid blanks.
{
@@ -181,17 +191,18 @@ static void backupAllForUser(sys::ProgressTask *task, std::shared_ptr<UserStruct
if (saveMounted && saveCheck.getCount() <= 0)
{
// Gonna borrow these messages. No point in repeating them.
ui::PopMessageManager::pushMessage(ui::PopMessageManager::DEFAULT_MESSAGE_TICKS,
strings::getByName(strings::names::POP_MESSAGES_BACKUP_MENU, 0));
ui::PopMessageManager::push_message(ui::PopMessageManager::DEFAULT_MESSAGE_TICKS,
strings::get_by_name(strings::names::POP_MESSAGES_BACKUP_MENU, 0));
fslib::closeFileSystem(fs::DEFAULT_SAVE_MOUNT);
continue;
}
}
if (currentTitle && saveMounted && config::getByKey(config::keys::EXPORT_TO_ZIP))
if (currentTitle && saveMounted && config::get_by_key(config::keys::EXPORT_TO_ZIP))
{
fslib::Path targetPath = config::getWorkingDirectory() / currentTitle->getPathSafeTitle() / targetUser->getPathSafeNickname() +
" - " + stringutil::getDateString() + ".zip";
fslib::Path targetPath = config::get_working_directory() / currentTitle->get_path_safe_title() /
targetUser->get_path_safe_nickname() +
" - " + stringutil::get_date_string() + ".zip";
zipFile targetZip = zipOpen64(targetPath.cString(), APPEND_STATUS_CREATE);
if (!targetZip)
@@ -199,20 +210,21 @@ static void backupAllForUser(sys::ProgressTask *task, std::shared_ptr<UserStruct
logger::log("Error creating zip: %s", fslib::getErrorString());
continue;
}
fs::copyDirectoryToZip(fs::DEFAULT_SAVE_PATH, targetZip, task);
fs::copy_directory_to_zip(fs::DEFAULT_SAVE_PATH, targetZip, task);
zipClose(targetZip, NULL);
}
else if (currentTitle && saveMounted)
{
fslib::Path targetPath = config::getWorkingDirectory() / currentTitle->getPathSafeTitle() / targetUser->getPathSafeNickname() +
" - " + stringutil::getDateString();
fslib::Path targetPath = config::get_working_directory() / currentTitle->get_path_safe_title() /
targetUser->get_path_safe_nickname() +
" - " + stringutil::get_date_string();
if (!fslib::createDirectory(targetPath))
{
logger::log("Error creating backup directory: %s", fslib::getErrorString());
continue;
}
fs::copyDirectory(fs::DEFAULT_SAVE_PATH, targetPath, 0, {}, task);
fs::copy_directory(fs::DEFAULT_SAVE_PATH, targetPath, 0, {}, task);
}
if (saveMounted)
@@ -223,50 +235,50 @@ static void backupAllForUser(sys::ProgressTask *task, std::shared_ptr<UserStruct
task->finished();
}
static void createAllSaveDataForUser(sys::Task *task, std::shared_ptr<UserStruct> dataStruct)
static void create_all_save_data_for_user(sys::Task *task, std::shared_ptr<UserStruct> dataStruct)
{
data::User *targetUser = dataStruct->m_targetUser;
// Get title info map.
auto &titleInfoMap = data::getTitleInfoMap();
auto &titleInfoMap = data::get_title_info_map();
// Iterate through it.
for (auto &[applicationID, titleInfo] : titleInfoMap)
{
if (!titleInfo.hasSaveDataType(targetUser->getAccountSaveType()))
if (!titleInfo.has_save_data_type(targetUser->get_account_save_type()))
{
continue;
}
// Set status.
task->setStatus(strings::getByName(strings::names::USER_OPTION_STATUS, 0), titleInfo.getTitle());
task->set_status(strings::get_by_name(strings::names::USER_OPTION_STATUS, 0), titleInfo.get_title());
if (!fs::createSaveDataFor(targetUser, &titleInfo))
if (!fs::create_save_data_for(targetUser, &titleInfo))
{
// Function should log error too.
ui::PopMessageManager::pushMessage(ui::PopMessageManager::DEFAULT_MESSAGE_TICKS,
strings::getByName(strings::names::POP_MESSAGES_SAVE_CREATE, 2));
ui::PopMessageManager::push_message(ui::PopMessageManager::DEFAULT_MESSAGE_TICKS,
strings::get_by_name(strings::names::POP_MESSAGES_SAVE_CREATE, 2));
}
}
task->finished();
}
static void deleteAllSaveDataForUser(sys::Task *task, std::shared_ptr<UserStruct> dataStruct)
static void delete_all_save_data_for_user(sys::Task *task, std::shared_ptr<UserStruct> dataStruct)
{
data::User *targetUser = dataStruct->m_targetUser;
for (size_t i = 0; i < targetUser->getTotalDataEntries(); i++)
for (size_t i = 0; i < targetUser->get_total_data_entries(); i++)
{
// Grab title for title.
const char *targetTitle = data::getTitleInfoByID(targetUser->getApplicationIDAt(i))->getTitle();
const char *target_title = data::get_title_info_by_id(targetUser->get_application_id_at(i))->get_title();
// Update thread task.
task->setStatus(strings::getByName(strings::names::USER_OPTION_STATUS, 1), targetTitle);
task->set_status(strings::get_by_name(strings::names::USER_OPTION_STATUS, 1), target_title);
if (!fs::deleteSaveData(*targetUser->getSaveInfoAt(i)))
if (!fs::delete_save_data(*targetUser->get_save_info_at(i)))
{
ui::PopMessageManager::pushMessage(ui::PopMessageManager::DEFAULT_MESSAGE_TICKS,
strings::getByName(strings::names::POP_MESSAGES_SAVE_CREATE, 2));
ui::PopMessageManager::push_message(ui::PopMessageManager::DEFAULT_MESSAGE_TICKS,
strings::get_by_name(strings::names::POP_MESSAGES_SAVE_CREATE, 2));
}
}
task->finished();