Merge pull request #1508 from lioncash/unique-reg
file_sys/registered_cache: Use unique_ptr and regular pointers instead of shared_ptrs where applicable
This commit is contained in:
commit
59c1ca8b0c
|
@ -10,19 +10,19 @@ namespace FileSys {
|
||||||
|
|
||||||
BISFactory::BISFactory(VirtualDir nand_root_, VirtualDir load_root_)
|
BISFactory::BISFactory(VirtualDir nand_root_, VirtualDir load_root_)
|
||||||
: nand_root(std::move(nand_root_)), load_root(std::move(load_root_)),
|
: nand_root(std::move(nand_root_)), load_root(std::move(load_root_)),
|
||||||
sysnand_cache(std::make_shared<RegisteredCache>(
|
sysnand_cache(std::make_unique<RegisteredCache>(
|
||||||
GetOrCreateDirectoryRelative(nand_root, "/system/Contents/registered"))),
|
GetOrCreateDirectoryRelative(nand_root, "/system/Contents/registered"))),
|
||||||
usrnand_cache(std::make_shared<RegisteredCache>(
|
usrnand_cache(std::make_unique<RegisteredCache>(
|
||||||
GetOrCreateDirectoryRelative(nand_root, "/user/Contents/registered"))) {}
|
GetOrCreateDirectoryRelative(nand_root, "/user/Contents/registered"))) {}
|
||||||
|
|
||||||
BISFactory::~BISFactory() = default;
|
BISFactory::~BISFactory() = default;
|
||||||
|
|
||||||
std::shared_ptr<RegisteredCache> BISFactory::GetSystemNANDContents() const {
|
RegisteredCache* BISFactory::GetSystemNANDContents() const {
|
||||||
return sysnand_cache;
|
return sysnand_cache.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
std::shared_ptr<RegisteredCache> BISFactory::GetUserNANDContents() const {
|
RegisteredCache* BISFactory::GetUserNANDContents() const {
|
||||||
return usrnand_cache;
|
return usrnand_cache.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
VirtualDir BISFactory::GetModificationLoadRoot(u64 title_id) const {
|
VirtualDir BISFactory::GetModificationLoadRoot(u64 title_id) const {
|
||||||
|
|
|
@ -20,8 +20,8 @@ public:
|
||||||
explicit BISFactory(VirtualDir nand_root, VirtualDir load_root);
|
explicit BISFactory(VirtualDir nand_root, VirtualDir load_root);
|
||||||
~BISFactory();
|
~BISFactory();
|
||||||
|
|
||||||
std::shared_ptr<RegisteredCache> GetSystemNANDContents() const;
|
RegisteredCache* GetSystemNANDContents() const;
|
||||||
std::shared_ptr<RegisteredCache> GetUserNANDContents() const;
|
RegisteredCache* GetUserNANDContents() const;
|
||||||
|
|
||||||
VirtualDir GetModificationLoadRoot(u64 title_id) const;
|
VirtualDir GetModificationLoadRoot(u64 title_id) const;
|
||||||
|
|
||||||
|
@ -29,8 +29,8 @@ private:
|
||||||
VirtualDir nand_root;
|
VirtualDir nand_root;
|
||||||
VirtualDir load_root;
|
VirtualDir load_root;
|
||||||
|
|
||||||
std::shared_ptr<RegisteredCache> sysnand_cache;
|
std::unique_ptr<RegisteredCache> sysnand_cache;
|
||||||
std::shared_ptr<RegisteredCache> usrnand_cache;
|
std::unique_ptr<RegisteredCache> usrnand_cache;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace FileSys
|
} // namespace FileSys
|
||||||
|
|
|
@ -346,7 +346,7 @@ std::map<std::string, std::string, std::less<>> PatchManager::GetPatchVersionNam
|
||||||
}
|
}
|
||||||
|
|
||||||
std::pair<std::unique_ptr<NACP>, VirtualFile> PatchManager::GetControlMetadata() const {
|
std::pair<std::unique_ptr<NACP>, VirtualFile> PatchManager::GetControlMetadata() const {
|
||||||
const auto& installed{Service::FileSystem::GetUnionContents()};
|
const auto installed{Service::FileSystem::GetUnionContents()};
|
||||||
|
|
||||||
const auto base_control_nca = installed->GetEntry(title_id, ContentRecordType::Control);
|
const auto base_control_nca = installed->GetEntry(title_id, ContentRecordType::Control);
|
||||||
if (base_control_nca == nullptr)
|
if (base_control_nca == nullptr)
|
||||||
|
|
|
@ -308,14 +308,14 @@ VirtualFile RegisteredCache::GetEntryRaw(RegisteredCacheEntry entry) const {
|
||||||
return GetEntryRaw(entry.title_id, entry.type);
|
return GetEntryRaw(entry.title_id, entry.type);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::shared_ptr<NCA> RegisteredCache::GetEntry(u64 title_id, ContentRecordType type) const {
|
std::unique_ptr<NCA> RegisteredCache::GetEntry(u64 title_id, ContentRecordType type) const {
|
||||||
const auto raw = GetEntryRaw(title_id, type);
|
const auto raw = GetEntryRaw(title_id, type);
|
||||||
if (raw == nullptr)
|
if (raw == nullptr)
|
||||||
return nullptr;
|
return nullptr;
|
||||||
return std::make_shared<NCA>(raw);
|
return std::make_unique<NCA>(raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::shared_ptr<NCA> RegisteredCache::GetEntry(RegisteredCacheEntry entry) const {
|
std::unique_ptr<NCA> RegisteredCache::GetEntry(RegisteredCacheEntry entry) const {
|
||||||
return GetEntry(entry.title_id, entry.type);
|
return GetEntry(entry.title_id, entry.type);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -516,7 +516,7 @@ bool RegisteredCache::RawInstallYuzuMeta(const CNMT& cnmt) {
|
||||||
}) != yuzu_meta.end();
|
}) != yuzu_meta.end();
|
||||||
}
|
}
|
||||||
|
|
||||||
RegisteredCacheUnion::RegisteredCacheUnion(std::vector<std::shared_ptr<RegisteredCache>> caches)
|
RegisteredCacheUnion::RegisteredCacheUnion(std::vector<RegisteredCache*> caches)
|
||||||
: caches(std::move(caches)) {}
|
: caches(std::move(caches)) {}
|
||||||
|
|
||||||
void RegisteredCacheUnion::Refresh() {
|
void RegisteredCacheUnion::Refresh() {
|
||||||
|
@ -572,14 +572,14 @@ VirtualFile RegisteredCacheUnion::GetEntryRaw(RegisteredCacheEntry entry) const
|
||||||
return GetEntryRaw(entry.title_id, entry.type);
|
return GetEntryRaw(entry.title_id, entry.type);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::shared_ptr<NCA> RegisteredCacheUnion::GetEntry(u64 title_id, ContentRecordType type) const {
|
std::unique_ptr<NCA> RegisteredCacheUnion::GetEntry(u64 title_id, ContentRecordType type) const {
|
||||||
const auto raw = GetEntryRaw(title_id, type);
|
const auto raw = GetEntryRaw(title_id, type);
|
||||||
if (raw == nullptr)
|
if (raw == nullptr)
|
||||||
return nullptr;
|
return nullptr;
|
||||||
return std::make_shared<NCA>(raw);
|
return std::make_unique<NCA>(raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::shared_ptr<NCA> RegisteredCacheUnion::GetEntry(RegisteredCacheEntry entry) const {
|
std::unique_ptr<NCA> RegisteredCacheUnion::GetEntry(RegisteredCacheEntry entry) const {
|
||||||
return GetEntry(entry.title_id, entry.type);
|
return GetEntry(entry.title_id, entry.type);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -88,8 +88,8 @@ public:
|
||||||
VirtualFile GetEntryRaw(u64 title_id, ContentRecordType type) const;
|
VirtualFile GetEntryRaw(u64 title_id, ContentRecordType type) const;
|
||||||
VirtualFile GetEntryRaw(RegisteredCacheEntry entry) const;
|
VirtualFile GetEntryRaw(RegisteredCacheEntry entry) const;
|
||||||
|
|
||||||
std::shared_ptr<NCA> GetEntry(u64 title_id, ContentRecordType type) const;
|
std::unique_ptr<NCA> GetEntry(u64 title_id, ContentRecordType type) const;
|
||||||
std::shared_ptr<NCA> GetEntry(RegisteredCacheEntry entry) const;
|
std::unique_ptr<NCA> GetEntry(RegisteredCacheEntry entry) const;
|
||||||
|
|
||||||
std::vector<RegisteredCacheEntry> ListEntries() const;
|
std::vector<RegisteredCacheEntry> ListEntries() const;
|
||||||
// If a parameter is not boost::none, it will be filtered for from all entries.
|
// If a parameter is not boost::none, it will be filtered for from all entries.
|
||||||
|
@ -142,7 +142,7 @@ private:
|
||||||
// Combines multiple RegisteredCaches (i.e. SysNAND, UserNAND, SDMC) into one interface.
|
// Combines multiple RegisteredCaches (i.e. SysNAND, UserNAND, SDMC) into one interface.
|
||||||
class RegisteredCacheUnion {
|
class RegisteredCacheUnion {
|
||||||
public:
|
public:
|
||||||
explicit RegisteredCacheUnion(std::vector<std::shared_ptr<RegisteredCache>> caches);
|
explicit RegisteredCacheUnion(std::vector<RegisteredCache*> caches);
|
||||||
|
|
||||||
void Refresh();
|
void Refresh();
|
||||||
|
|
||||||
|
@ -157,8 +157,8 @@ public:
|
||||||
VirtualFile GetEntryRaw(u64 title_id, ContentRecordType type) const;
|
VirtualFile GetEntryRaw(u64 title_id, ContentRecordType type) const;
|
||||||
VirtualFile GetEntryRaw(RegisteredCacheEntry entry) const;
|
VirtualFile GetEntryRaw(RegisteredCacheEntry entry) const;
|
||||||
|
|
||||||
std::shared_ptr<NCA> GetEntry(u64 title_id, ContentRecordType type) const;
|
std::unique_ptr<NCA> GetEntry(u64 title_id, ContentRecordType type) const;
|
||||||
std::shared_ptr<NCA> GetEntry(RegisteredCacheEntry entry) const;
|
std::unique_ptr<NCA> GetEntry(RegisteredCacheEntry entry) const;
|
||||||
|
|
||||||
std::vector<RegisteredCacheEntry> ListEntries() const;
|
std::vector<RegisteredCacheEntry> ListEntries() const;
|
||||||
// If a parameter is not boost::none, it will be filtered for from all entries.
|
// If a parameter is not boost::none, it will be filtered for from all entries.
|
||||||
|
@ -168,7 +168,7 @@ public:
|
||||||
boost::optional<u64> title_id = boost::none) const;
|
boost::optional<u64> title_id = boost::none) const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::vector<std::shared_ptr<RegisteredCache>> caches;
|
std::vector<RegisteredCache*> caches;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace FileSys
|
} // namespace FileSys
|
||||||
|
|
|
@ -10,10 +10,10 @@
|
||||||
namespace FileSys {
|
namespace FileSys {
|
||||||
|
|
||||||
SDMCFactory::SDMCFactory(VirtualDir dir_)
|
SDMCFactory::SDMCFactory(VirtualDir dir_)
|
||||||
: dir(std::move(dir_)), contents(std::make_shared<RegisteredCache>(
|
: dir(std::move(dir_)), contents(std::make_unique<RegisteredCache>(
|
||||||
GetOrCreateDirectoryRelative(dir, "/Nintendo/Contents/registered"),
|
GetOrCreateDirectoryRelative(dir, "/Nintendo/Contents/registered"),
|
||||||
[](const VirtualFile& file, const NcaID& id) {
|
[](const VirtualFile& file, const NcaID& id) {
|
||||||
return std::make_shared<NAX>(file, id)->GetDecrypted();
|
return NAX{file, id}.GetDecrypted();
|
||||||
})) {}
|
})) {}
|
||||||
|
|
||||||
SDMCFactory::~SDMCFactory() = default;
|
SDMCFactory::~SDMCFactory() = default;
|
||||||
|
@ -22,8 +22,8 @@ ResultVal<VirtualDir> SDMCFactory::Open() {
|
||||||
return MakeResult<VirtualDir>(dir);
|
return MakeResult<VirtualDir>(dir);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::shared_ptr<RegisteredCache> SDMCFactory::GetSDMCContents() const {
|
RegisteredCache* SDMCFactory::GetSDMCContents() const {
|
||||||
return contents;
|
return contents.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace FileSys
|
} // namespace FileSys
|
||||||
|
|
|
@ -19,12 +19,12 @@ public:
|
||||||
~SDMCFactory();
|
~SDMCFactory();
|
||||||
|
|
||||||
ResultVal<VirtualDir> Open();
|
ResultVal<VirtualDir> Open();
|
||||||
std::shared_ptr<RegisteredCache> GetSDMCContents() const;
|
RegisteredCache* GetSDMCContents() const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
VirtualDir dir;
|
VirtualDir dir;
|
||||||
|
|
||||||
std::shared_ptr<RegisteredCache> contents;
|
std::unique_ptr<RegisteredCache> contents;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace FileSys
|
} // namespace FileSys
|
||||||
|
|
|
@ -319,13 +319,12 @@ ResultVal<FileSys::VirtualDir> OpenSDMC() {
|
||||||
return sdmc_factory->Open();
|
return sdmc_factory->Open();
|
||||||
}
|
}
|
||||||
|
|
||||||
std::shared_ptr<FileSys::RegisteredCacheUnion> GetUnionContents() {
|
std::unique_ptr<FileSys::RegisteredCacheUnion> GetUnionContents() {
|
||||||
return std::make_shared<FileSys::RegisteredCacheUnion>(
|
return std::make_unique<FileSys::RegisteredCacheUnion>(std::vector<FileSys::RegisteredCache*>{
|
||||||
std::vector<std::shared_ptr<FileSys::RegisteredCache>>{
|
GetSystemNANDContents(), GetUserNANDContents(), GetSDMCContents()});
|
||||||
GetSystemNANDContents(), GetUserNANDContents(), GetSDMCContents()});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
std::shared_ptr<FileSys::RegisteredCache> GetSystemNANDContents() {
|
FileSys::RegisteredCache* GetSystemNANDContents() {
|
||||||
LOG_TRACE(Service_FS, "Opening System NAND Contents");
|
LOG_TRACE(Service_FS, "Opening System NAND Contents");
|
||||||
|
|
||||||
if (bis_factory == nullptr)
|
if (bis_factory == nullptr)
|
||||||
|
@ -334,7 +333,7 @@ std::shared_ptr<FileSys::RegisteredCache> GetSystemNANDContents() {
|
||||||
return bis_factory->GetSystemNANDContents();
|
return bis_factory->GetSystemNANDContents();
|
||||||
}
|
}
|
||||||
|
|
||||||
std::shared_ptr<FileSys::RegisteredCache> GetUserNANDContents() {
|
FileSys::RegisteredCache* GetUserNANDContents() {
|
||||||
LOG_TRACE(Service_FS, "Opening User NAND Contents");
|
LOG_TRACE(Service_FS, "Opening User NAND Contents");
|
||||||
|
|
||||||
if (bis_factory == nullptr)
|
if (bis_factory == nullptr)
|
||||||
|
@ -343,7 +342,7 @@ std::shared_ptr<FileSys::RegisteredCache> GetUserNANDContents() {
|
||||||
return bis_factory->GetUserNANDContents();
|
return bis_factory->GetUserNANDContents();
|
||||||
}
|
}
|
||||||
|
|
||||||
std::shared_ptr<FileSys::RegisteredCache> GetSDMCContents() {
|
FileSys::RegisteredCache* GetSDMCContents() {
|
||||||
LOG_TRACE(Service_FS, "Opening SDMC Contents");
|
LOG_TRACE(Service_FS, "Opening SDMC Contents");
|
||||||
|
|
||||||
if (sdmc_factory == nullptr)
|
if (sdmc_factory == nullptr)
|
||||||
|
|
|
@ -47,11 +47,11 @@ ResultVal<FileSys::VirtualDir> OpenSaveData(FileSys::SaveDataSpaceId space,
|
||||||
FileSys::SaveDataDescriptor save_struct);
|
FileSys::SaveDataDescriptor save_struct);
|
||||||
ResultVal<FileSys::VirtualDir> OpenSDMC();
|
ResultVal<FileSys::VirtualDir> OpenSDMC();
|
||||||
|
|
||||||
std::shared_ptr<FileSys::RegisteredCacheUnion> GetUnionContents();
|
std::unique_ptr<FileSys::RegisteredCacheUnion> GetUnionContents();
|
||||||
|
|
||||||
std::shared_ptr<FileSys::RegisteredCache> GetSystemNANDContents();
|
FileSys::RegisteredCache* GetSystemNANDContents();
|
||||||
std::shared_ptr<FileSys::RegisteredCache> GetUserNANDContents();
|
FileSys::RegisteredCache* GetUserNANDContents();
|
||||||
std::shared_ptr<FileSys::RegisteredCache> GetSDMCContents();
|
FileSys::RegisteredCache* GetSDMCContents();
|
||||||
|
|
||||||
FileSys::VirtualDir GetModificationLoadRoot(u64 title_id);
|
FileSys::VirtualDir GetModificationLoadRoot(u64 title_id);
|
||||||
|
|
||||||
|
|
|
@ -161,7 +161,7 @@ PL_U::PL_U() : ServiceFramework("pl:u"), impl{std::make_unique<Impl>()} {
|
||||||
};
|
};
|
||||||
RegisterHandlers(functions);
|
RegisterHandlers(functions);
|
||||||
// Attempt to load shared font data from disk
|
// Attempt to load shared font data from disk
|
||||||
const auto nand = FileSystem::GetSystemNANDContents();
|
const auto* nand = FileSystem::GetSystemNANDContents();
|
||||||
std::size_t offset = 0;
|
std::size_t offset = 0;
|
||||||
// Rebuild shared fonts from data ncas
|
// Rebuild shared fonts from data ncas
|
||||||
if (nand->HasEntry(static_cast<u64>(FontArchives::Standard),
|
if (nand->HasEntry(static_cast<u64>(FontArchives::Standard),
|
||||||
|
|
|
@ -96,7 +96,7 @@ void GameListWorker::AddInstalledTitlesToGameList() {
|
||||||
FileSys::ContentRecordType::Program);
|
FileSys::ContentRecordType::Program);
|
||||||
|
|
||||||
for (const auto& game : installed_games) {
|
for (const auto& game : installed_games) {
|
||||||
const auto& file = cache->GetEntryUnparsed(game);
|
const auto file = cache->GetEntryUnparsed(game);
|
||||||
std::unique_ptr<Loader::AppLoader> loader = Loader::GetLoader(file);
|
std::unique_ptr<Loader::AppLoader> loader = Loader::GetLoader(file);
|
||||||
if (!loader)
|
if (!loader)
|
||||||
continue;
|
continue;
|
||||||
|
@ -107,7 +107,7 @@ void GameListWorker::AddInstalledTitlesToGameList() {
|
||||||
loader->ReadProgramId(program_id);
|
loader->ReadProgramId(program_id);
|
||||||
|
|
||||||
const FileSys::PatchManager patch{program_id};
|
const FileSys::PatchManager patch{program_id};
|
||||||
const auto& control = cache->GetEntry(game.title_id, FileSys::ContentRecordType::Control);
|
const auto control = cache->GetEntry(game.title_id, FileSys::ContentRecordType::Control);
|
||||||
if (control != nullptr)
|
if (control != nullptr)
|
||||||
GetMetadataFromControlNCA(patch, *control, icon, name);
|
GetMetadataFromControlNCA(patch, *control, icon, name);
|
||||||
|
|
||||||
|
@ -135,9 +135,10 @@ void GameListWorker::AddInstalledTitlesToGameList() {
|
||||||
FileSys::ContentRecordType::Control);
|
FileSys::ContentRecordType::Control);
|
||||||
|
|
||||||
for (const auto& entry : control_data) {
|
for (const auto& entry : control_data) {
|
||||||
const auto nca = cache->GetEntry(entry);
|
auto nca = cache->GetEntry(entry);
|
||||||
if (nca != nullptr)
|
if (nca != nullptr) {
|
||||||
nca_control_map.insert_or_assign(entry.title_id, nca);
|
nca_control_map.insert_or_assign(entry.title_id, std::move(nca));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -153,9 +154,11 @@ void GameListWorker::FillControlMap(const std::string& dir_path) {
|
||||||
QFileInfo file_info(physical_name.c_str());
|
QFileInfo file_info(physical_name.c_str());
|
||||||
if (!is_dir && file_info.suffix().toStdString() == "nca") {
|
if (!is_dir && file_info.suffix().toStdString() == "nca") {
|
||||||
auto nca =
|
auto nca =
|
||||||
std::make_shared<FileSys::NCA>(vfs->OpenFile(physical_name, FileSys::Mode::Read));
|
std::make_unique<FileSys::NCA>(vfs->OpenFile(physical_name, FileSys::Mode::Read));
|
||||||
if (nca->GetType() == FileSys::NCAContentType::Control)
|
if (nca->GetType() == FileSys::NCAContentType::Control) {
|
||||||
nca_control_map.insert_or_assign(nca->GetTitleId(), nca);
|
const u64 title_id = nca->GetTitleId();
|
||||||
|
nca_control_map.insert_or_assign(title_id, std::move(nca));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
};
|
};
|
||||||
|
|
|
@ -63,7 +63,7 @@ private:
|
||||||
void AddFstEntriesToGameList(const std::string& dir_path, unsigned int recursion = 0);
|
void AddFstEntriesToGameList(const std::string& dir_path, unsigned int recursion = 0);
|
||||||
|
|
||||||
std::shared_ptr<FileSys::VfsFilesystem> vfs;
|
std::shared_ptr<FileSys::VfsFilesystem> vfs;
|
||||||
std::map<u64, std::shared_ptr<FileSys::NCA>> nca_control_map;
|
std::map<u64, std::unique_ptr<FileSys::NCA>> nca_control_map;
|
||||||
QStringList watch_list;
|
QStringList watch_list;
|
||||||
QString dir_path;
|
QString dir_path;
|
||||||
bool deep_scan;
|
bool deep_scan;
|
||||||
|
|
Loading…
Reference in a new issue