OmniNX/sphaira
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use app_id for save backups for when the app is corrupted.

Browse Source
This commit is contained in:
ITotalJustice
2025-06-21 23:25:21 +01:00
parent 9d4c431eef
commit a4f0a97088
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sphaira/source/ui/menus/save_menu.cpp
View File

@@ -274,10 +274,12 @@ auto BuildSaveName(const Entry& e) -> fs::FsPath {
return name_buf; return name_buf;
} }
auto BuildSaveBasePath(const Entry& e) -> fs::FsPath { auto BuildSaveBasePath(const Entry& e, bool force_id_path = false) -> fs::FsPath {
fs::FsPath name; fs::FsPath name;
if (e.save_data_type == FsSaveDataType_System || e.save_data_type == FsSaveDataType_SystemBcat) { if (e.save_data_type == FsSaveDataType_System || e.save_data_type == FsSaveDataType_SystemBcat) {
std::snprintf(name, sizeof(name), "%016lX", e.system_save_data_id); std::snprintf(name, sizeof(name), "%016lX", e.system_save_data_id);
} else if (force_id_path || !strcasecmp(e.GetName(), "corrupted")) {
std::snprintf(name, sizeof(name), "%016lX", e.application_id);
} else { } else {
name = BuildSaveName(e); name = BuildSaveName(e);
} }
@@ -708,15 +710,19 @@ void Menu::RestoreSave() {
fs = std::make_unique<fs::FsNativeSd>(); fs = std::make_unique<fs::FsNativeSd>();
} }
const auto save_path = fs::AppendPath(fs->Root(), BuildSaveBasePath(m_entries[m_index])); // get saves in /Saves/Name and /Saves/app_id
filebrowser::FsDirCollection collection; filebrowser::FsDirCollection collections[2]{};
filebrowser::FsView::get_collection(fs.get(), save_path, "", collection, true, false, false); for (auto i = 0; i < std::size(collections); i++) {
const auto save_path = fs::AppendPath(fs->Root(), BuildSaveBasePath(m_entries[m_index], i != 0));
filebrowser::FsView::get_collection(fs.get(), save_path, "", collections[i], true, false, false);
// reverse as they will be sorted in oldest -> newest. // reverse as they will be sorted in oldest -> newest.
std::ranges::reverse(collection.files); // todo: better impl when both id and normal app folders are used.
std::ranges::reverse(collections[i].files);
}
std::vector<fs::FsPath> paths; std::vector<fs::FsPath> paths;
PopupList::Items items; PopupList::Items items;
for (const auto& collection : collections) {
for (const auto&p : collection.files) { for (const auto&p : collection.files) {
const auto view = std::string_view{p.name}; const auto view = std::string_view{p.name};
if (view.starts_with("BCAT") || !view.ends_with(".zip")) { if (view.starts_with("BCAT") || !view.ends_with(".zip")) {
@@ -726,10 +732,11 @@ void Menu::RestoreSave() {
items.emplace_back(p.name); items.emplace_back(p.name);
paths.emplace_back(fs::AppendPath(collection.path, p.name)); paths.emplace_back(fs::AppendPath(collection.path, p.name));
} }
}
if (paths.empty()) { if (paths.empty()) {
App::Push(std::make_shared<ui::OptionBox>( App::Push(std::make_shared<ui::OptionBox>(
"No saves found in "_i18n + save_path.toString(), "No saves found in "_i18n + fs::AppendPath(fs->Root(), BuildSaveBasePath(m_entries[m_index])).toString(),
"OK"_i18n "OK"_i18n
)); ));
return; return;