mirror of
https://git.h3cjp.net/H3cJP/citra.git
synced 2024-12-02 00:42:51 +00:00
patch_manager: Apply layered exefs patches from 'atmosphere' SD directory
This commit is contained in:
parent
37199c5f90
commit
f05e87402a
|
@ -148,10 +148,15 @@ VirtualDir PatchManager::PatchExeFS(VirtualDir exefs) const {
|
||||||
|
|
||||||
// LayeredExeFS
|
// LayeredExeFS
|
||||||
const auto load_dir = fs_controller.GetModificationLoadRoot(title_id);
|
const auto load_dir = fs_controller.GetModificationLoadRoot(title_id);
|
||||||
|
const auto sdmc_load_dir = fs_controller.GetSDMCModificationLoadRoot(title_id);
|
||||||
|
|
||||||
|
std::vector<VirtualDir> patch_dirs = {sdmc_load_dir};
|
||||||
if (load_dir != nullptr && load_dir->GetSize() > 0) {
|
if (load_dir != nullptr && load_dir->GetSize() > 0) {
|
||||||
auto patch_dirs = load_dir->GetSubdirectories();
|
const auto load_patch_dirs = load_dir->GetSubdirectories();
|
||||||
std::sort(
|
patch_dirs.insert(patch_dirs.end(), load_patch_dirs.begin(), load_patch_dirs.end());
|
||||||
patch_dirs.begin(), patch_dirs.end(),
|
}
|
||||||
|
|
||||||
|
std::sort(patch_dirs.begin(), patch_dirs.end(),
|
||||||
[](const VirtualDir& l, const VirtualDir& r) { return l->GetName() < r->GetName(); });
|
[](const VirtualDir& l, const VirtualDir& r) { return l->GetName() < r->GetName(); });
|
||||||
|
|
||||||
std::vector<VirtualDir> layers;
|
std::vector<VirtualDir> layers;
|
||||||
|
@ -171,7 +176,6 @@ VirtualDir PatchManager::PatchExeFS(VirtualDir exefs) const {
|
||||||
LOG_INFO(Loader, " ExeFS: LayeredExeFS patches applied successfully");
|
LOG_INFO(Loader, " ExeFS: LayeredExeFS patches applied successfully");
|
||||||
exefs = std::move(layered);
|
exefs = std::move(layered);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (Settings::values.dump_exefs) {
|
if (Settings::values.dump_exefs) {
|
||||||
LOG_INFO(Loader, "Dumping ExeFS for title_id={:016X}", title_id);
|
LOG_INFO(Loader, "Dumping ExeFS for title_id={:016X}", title_id);
|
||||||
|
@ -536,11 +540,20 @@ PatchManager::PatchVersionNames PatchManager::GetPatchVersionNames(VirtualFile u
|
||||||
|
|
||||||
// SDMC mod directory (RomFS LayeredFS)
|
// SDMC mod directory (RomFS LayeredFS)
|
||||||
const auto sdmc_mod_dir = fs_controller.GetSDMCModificationLoadRoot(title_id);
|
const auto sdmc_mod_dir = fs_controller.GetSDMCModificationLoadRoot(title_id);
|
||||||
if (sdmc_mod_dir != nullptr && sdmc_mod_dir->GetSize() > 0 &&
|
if (sdmc_mod_dir != nullptr && sdmc_mod_dir->GetSize() > 0) {
|
||||||
IsDirValidAndNonEmpty(FindSubdirectoryCaseless(sdmc_mod_dir, "romfs"))) {
|
std::string types;
|
||||||
|
if (IsDirValidAndNonEmpty(FindSubdirectoryCaseless(sdmc_mod_dir, "exefs"))) {
|
||||||
|
AppendCommaIfNotEmpty(types, "LayeredExeFS");
|
||||||
|
}
|
||||||
|
if (IsDirValidAndNonEmpty(FindSubdirectoryCaseless(sdmc_mod_dir, "romfs"))) {
|
||||||
|
AppendCommaIfNotEmpty(types, "LayeredFS");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!types.empty()) {
|
||||||
const auto mod_disabled =
|
const auto mod_disabled =
|
||||||
std::find(disabled.begin(), disabled.end(), "SDMC") != disabled.end();
|
std::find(disabled.begin(), disabled.end(), "SDMC") != disabled.end();
|
||||||
out.insert_or_assign(mod_disabled ? "[D] SDMC" : "SDMC", "LayeredFS");
|
out.insert_or_assign(mod_disabled ? "[D] SDMC" : "SDMC", types);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// DLC
|
// DLC
|
||||||
|
|
Loading…
Reference in a new issue