pacnpal/citron
1
0
Fork 0
mirror of https://git.eden-emu.dev/archive/citron synced 2026-03-22 17:46:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove Redundant yuzu_meta testing

Browse Source
This commit is contained in:
collecting
2026-02-04 03:29:10 -05:00
parent c5eef10697
commit d18df2919b
2 changed files with 0 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -373,12 +373,6 @@ std::optional<NcaID> RegisteredCache::GetNcaIDFromMetadata(u64 title_id,
const auto res1 = CheckMapForContentRecord(citron_meta, title_id, type);
if (res1)
return res1;
const auto res2 = CheckMapForContentRecord(legacy_meta, title_id, type);
if (res2) {
LOG_INFO(Loader, "Found content {:016X} type {:02X} in legacy_meta", title_id,
static_cast<u8>(type));
return res2;
}
return CheckMapForContentRecord(meta, title_id, type);
}
@@ -467,7 +461,6 @@ void RegisteredCache::Refresh() {
const auto ids = AccumulateFiles();
ProcessFiles(ids);
AccumulateCitronMeta();
AccumulateLegacyMeta();
}
RegisteredCache::RegisteredCache(VirtualDir dir_, ContentProviderParsingFunction parsing_function)
@@ -497,11 +490,6 @@ std::optional<u32> RegisteredCache::GetEntryVersion(u64 title_id) const {
return citron_meta_iter->second.GetTitleVersion();
}
const auto legacy_meta_iter = legacy_meta.find(title_id);
if (legacy_meta_iter != legacy_meta.cend()) {
return legacy_meta_iter->second.GetTitleVersion();
}
return std::nullopt;
}
@@ -539,14 +527,6 @@ void RegisteredCache::IterateAllMetadata(
}
}
}
for (const auto& kv : legacy_meta) {
const auto& cnmt = kv.second;
for (const auto& rec : cnmt.GetContentRecords()) {
if (GetFileAtID(rec.nca_id) != nullptr && filter(cnmt, rec)) {
out.push_back(proc(cnmt, rec));
}
}
}
}
std::vector<ContentProviderEntry> RegisteredCache::ListEntriesFilter(
@@ -778,15 +758,6 @@ bool RegisteredCache::RemoveExistingEntry(u64 title_id) const {
}
}
// If patch entries for any program exist in yuzu meta, remove them
for (u8 i = 0; i < 0x10; i++) {
const auto meta_dir = dir->CreateDirectoryRelative("yuzu_meta");
const auto filename = GetCNMTName(TitleType::Update, title_id + i);
if (meta_dir->GetFile(filename)) {
removed_data |= meta_dir->DeleteFile(filename);
}
}
return removed_data;
}
@@ -1065,35 +1036,4 @@ std::vector<ContentProviderEntry> ManualContentProvider::ListEntriesFilter(
return out;
}
void RegisteredCache::AccumulateLegacyMeta() {
LOG_INFO(Loader, "AccumulateLegacyMeta: Scanning directory '{}' for yuzu_meta",
dir->GetFullPath());
const auto meta_dir = dir->GetSubdirectory("yuzu_meta");
if (meta_dir == nullptr) {
LOG_INFO(Loader, "AccumulateLegacyMeta: yuzu_meta directory not found in '{}'",
dir->GetFullPath());
return;
}
LOG_INFO(Loader, "Accumulating legacy meta from yuzu_meta at '{}'", meta_dir->GetFullPath());
const auto files = meta_dir->GetFiles();
LOG_INFO(Loader, "yuzu_meta contains {} files", files.size());
for (const auto& file : files) {
LOG_INFO(Loader, "Scanning file: name={} extension={}", file->GetName(),
file->GetExtension());
if (file->GetExtension() != "cnmt") {
continue;
}
CNMT cnmt(file);
LOG_INFO(Loader, "Loaded legacy CNMT: {:016X}", cnmt.GetTitleID());
legacy_meta.insert_or_assign(cnmt.GetTitleID(), std::move(cnmt));
}
const auto subdirs = meta_dir->GetSubdirectories();
LOG_INFO(Loader, "yuzu_meta contains {} subdirectories", subdirs.size());
}
} // namespace FileSys

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

@@ -186,7 +186,6 @@ private:
std::vector<NcaID> AccumulateFiles() const;
void ProcessFiles(const std::vector<NcaID>& ids);
void AccumulateCitronMeta();
void AccumulateLegacyMeta();
std::optional<NcaID> GetNcaIDFromMetadata(u64 title_id, ContentRecordType type) const;
VirtualFile GetFileAtID(NcaID id) const;
VirtualFile OpenFileOrDirectoryConcat(const VirtualDir& open_dir, std::string_view path) const;
@@ -203,8 +202,6 @@ private:
std::map<u64, CNMT> meta;
// maps tid -> meta for CNMT in citron_meta
std::map<u64, CNMT> citron_meta;
// maps tid -> meta for CNMT in yuzu_meta (legacy)
std::map<u64, CNMT> legacy_meta;
};
enum class ContentProviderUnionSlot {