diff --git a/src/core/file_sys/registered_cache.cpp b/src/core/file_sys/registered_cache.cpp index 5a858d433..b6c61d715 100644 --- a/src/core/file_sys/registered_cache.cpp +++ b/src/core/file_sys/registered_cache.cpp @@ -373,12 +373,6 @@ std::optional 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(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 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 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 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 diff --git a/src/core/file_sys/registered_cache.h b/src/core/file_sys/registered_cache.h index 1d188178e..5b56c67c5 100644 --- a/src/core/file_sys/registered_cache.h +++ b/src/core/file_sys/registered_cache.h @@ -186,7 +186,6 @@ private: std::vector AccumulateFiles() const; void ProcessFiles(const std::vector& ids); void AccumulateCitronMeta(); - void AccumulateLegacyMeta(); std::optional 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 meta; // maps tid -> meta for CNMT in citron_meta std::map citron_meta; - // maps tid -> meta for CNMT in yuzu_meta (legacy) - std::map legacy_meta; }; enum class ContentProviderUnionSlot {