franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove global system instance and address feedback

This commit is contained in:
Morph 2020-07-05 10:38:34 -04:00
parent a82fdea1ac
commit 8794e623d9
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/file_sys/registered_cache.cpp
View File

@ -547,7 +547,7 @@ InstallResult RegisteredCache::InstallEntry(const XCI& xci, bool overwrite_if_ex
return InstallEntry(*xci.GetSecurePartitionNSP(), overwrite_if_exists, copy); return InstallEntry(*xci.GetSecurePartitionNSP(), overwrite_if_exists, copy);
} }
bool RegisteredCache::RemoveExistingEntry(const u64 title_id) { bool RegisteredCache::RemoveExistingEntry(u64 title_id) {
const auto delete_nca = [this](const NcaID& id) { const auto delete_nca = [this](const NcaID& id) {
const auto path = GetRelativePathFromNcaID(id, false, true, false); const auto path = GetRelativePathFromNcaID(id, false, true, false);
@ -566,25 +566,23 @@ bool RegisteredCache::RemoveExistingEntry(const u64 title_id) {
return res; return res;
}; };
// Get the Content Provider
const auto& installed = Core::System::GetInstance().GetContentProvider();
// If an update exists, remove // If an update exists, remove
if (installed.HasEntry(title_id, ContentRecordType::Meta)) { if (HasEntry(title_id, ContentRecordType::Meta)) {
LOG_INFO(Loader, LOG_INFO(Loader,
"Previous Update (v{}) for title_id={:016X} detected! Attempting to remove...", "Previous Update (v{}) for title_id={:016X} detected! Attempting to remove...",
installed.GetEntryVersion(title_id).value_or(0), title_id); GetEntryVersion(title_id).value_or(0), title_id);
// Get all the ncas associated with the current update CNMT and delete them // Get all the ncas associated with the current update CNMT and delete them
const auto& meta_old_id = const auto meta_old_id =
GetNcaIDFromMetadata(title_id, ContentRecordType::Meta).value_or(NcaID{}); GetNcaIDFromMetadata(title_id, ContentRecordType::Meta).value_or(NcaID{});
const auto& program_id = const auto program_id =
GetNcaIDFromMetadata(title_id, ContentRecordType::Program).value_or(NcaID{}); GetNcaIDFromMetadata(title_id, ContentRecordType::Program).value_or(NcaID{});
const auto& data_id = const auto data_id =
GetNcaIDFromMetadata(title_id, ContentRecordType::Data).value_or(NcaID{}); GetNcaIDFromMetadata(title_id, ContentRecordType::Data).value_or(NcaID{});
const auto& control_id = const auto control_id =
GetNcaIDFromMetadata(title_id, ContentRecordType::Control).value_or(NcaID{}); GetNcaIDFromMetadata(title_id, ContentRecordType::Control).value_or(NcaID{});
const auto& html_id = const auto html_id =
GetNcaIDFromMetadata(title_id, ContentRecordType::HtmlDocument).value_or(NcaID{}); GetNcaIDFromMetadata(title_id, ContentRecordType::HtmlDocument).value_or(NcaID{});
const auto& legal_id = const auto legal_id =
GetNcaIDFromMetadata(title_id, ContentRecordType::LegalInformation).value_or(NcaID{}); GetNcaIDFromMetadata(title_id, ContentRecordType::LegalInformation).value_or(NcaID{});
delete_nca(meta_old_id); delete_nca(meta_old_id);
@ -618,9 +616,7 @@ InstallResult RegisteredCache::InstallEntry(const NSP& nsp, bool overwrite_if_ex
const auto cnmt_file = section0->GetFiles()[0]; const auto cnmt_file = section0->GetFiles()[0];
const CNMT cnmt(cnmt_file); const CNMT cnmt(cnmt_file);
// Get the title id stored within the CNMT
const auto title_id = cnmt.GetTitleID(); const auto title_id = cnmt.GetTitleID();
// Removes an entry if it exists
const auto result = RemoveExistingEntry(title_id); const auto result = RemoveExistingEntry(title_id);
// Install Metadata File // Install Metadata File

2
src/core/file_sys/registered_cache.h
View File

@ -156,7 +156,7 @@ public:
std::optional<u64> title_id = {}) const override; std::optional<u64> title_id = {}) const override;
// Removes an existing entry based on title id // Removes an existing entry based on title id
bool RemoveExistingEntry(const u64 title_id); bool RemoveExistingEntry(u64 title_id);
// Raw copies all the ncas from the xci/nsp to the csache. Does some quick checks to make sure // Raw copies all the ncas from the xci/nsp to the csache. Does some quick checks to make sure
// there is a meta NCA and all of them are accessible. // there is a meta NCA and all of them are accessible.