diff options
author | Zach Hilman <zachhilman@gmail.com> | 2018-08-12 04:48:27 +0200 |
---|---|---|
committer | Zach Hilman <zachhilman@gmail.com> | 2018-08-12 04:50:48 +0200 |
commit | fdf27bf39022d8a96c0386cc92b6670953471089 (patch) | |
tree | 9911088904c211c00e7e761140e0fe0528cd4dcd /src | |
parent | vfs_real: Add CreateFullPath to Create* operations (diff) | |
download | yuzu-fdf27bf39022d8a96c0386cc92b6670953471089.tar yuzu-fdf27bf39022d8a96c0386cc92b6670953471089.tar.gz yuzu-fdf27bf39022d8a96c0386cc92b6670953471089.tar.bz2 yuzu-fdf27bf39022d8a96c0386cc92b6670953471089.tar.lz yuzu-fdf27bf39022d8a96c0386cc92b6670953471089.tar.xz yuzu-fdf27bf39022d8a96c0386cc92b6670953471089.tar.zst yuzu-fdf27bf39022d8a96c0386cc92b6670953471089.zip |
Diffstat (limited to '')
-rw-r--r-- | src/yuzu/game_list.cpp | 22 | ||||
-rw-r--r-- | src/yuzu/game_list_p.h | 3 |
2 files changed, 16 insertions, 9 deletions
diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp index 73a0aa281..faaeda63d 100644 --- a/src/yuzu/game_list.cpp +++ b/src/yuzu/game_list.cpp @@ -405,6 +405,7 @@ void GameList::RefreshGameDirectory() { static void GetMetadataFromControlNCA(const std::shared_ptr<FileSys::NCA>& nca, std::vector<u8>& icon, std::string& name) { + const auto control_dir = FileSys::ExtractRomFS(nca->GetRomFS()); if (control_dir == nullptr) return; @@ -425,7 +426,7 @@ static void GetMetadataFromControlNCA(const std::shared_ptr<FileSys::NCA>& nca, } } -void GameListWorker::AddFstEntriesToGameList(const std::string& dir_path, unsigned int recursion) { +void GameListWorker::AddInstalledTitlesToGameList() { const auto usernand = Service::FileSystem::GetUserNANDContents(); const auto installed_games = usernand->ListEntriesFilter(FileSys::TitleType::Application, FileSys::ContentRecordType::Program); @@ -456,8 +457,6 @@ void GameListWorker::AddFstEntriesToGameList(const std::string& dir_path, unsign }); } - boost::container::flat_map<u64, std::shared_ptr<FileSys::NCA>> nca_control_map; - const auto control_data = usernand->ListEntriesFilter(FileSys::TitleType::Application, FileSys::ContentRecordType::Control); @@ -466,10 +465,11 @@ void GameListWorker::AddFstEntriesToGameList(const std::string& dir_path, unsign if (nca != nullptr) nca_control_map.insert_or_assign(entry.title_id, nca); } +} - const auto nca_control_callback = - [this, &nca_control_map](u64* num_entries_out, const std::string& directory, - const std::string& virtual_name) -> bool { +void GameListWorker::FillControlMap(const std::string& dir_path) { + const auto nca_control_callback = [this](u64* num_entries_out, const std::string& directory, + const std::string& virtual_name) -> bool { std::string physical_name = directory + DIR_SEP + virtual_name; if (stop_processing) @@ -487,10 +487,11 @@ void GameListWorker::AddFstEntriesToGameList(const std::string& dir_path, unsign }; FileUtil::ForeachDirectoryEntry(nullptr, dir_path, nca_control_callback); +} - const auto callback = [this, recursion, - &nca_control_map](u64* num_entries_out, const std::string& directory, - const std::string& virtual_name) -> bool { +void GameListWorker::AddFstEntriesToGameList(const std::string& dir_path, unsigned int recursion) { + const auto callback = [this, recursion](u64* num_entries_out, const std::string& directory, + const std::string& virtual_name) -> bool { std::string physical_name = directory + DIR_SEP + virtual_name; if (stop_processing) @@ -547,7 +548,10 @@ void GameListWorker::AddFstEntriesToGameList(const std::string& dir_path, unsign void GameListWorker::run() { stop_processing = false; watch_list.append(dir_path); + FillControlMap(dir_path.toStdString()); + AddInstalledTitlesToGameList(); AddFstEntriesToGameList(dir_path.toStdString(), deep_scan ? 256 : 0); + nca_control_map.clear(); emit Finished(watch_list); } diff --git a/src/yuzu/game_list_p.h b/src/yuzu/game_list_p.h index 8fe5e8b80..10c2ef075 100644 --- a/src/yuzu/game_list_p.h +++ b/src/yuzu/game_list_p.h @@ -163,10 +163,13 @@ signals: private: FileSys::VirtualFilesystem vfs; + std::map<u64, std::shared_ptr<FileSys::NCA>> nca_control_map; QStringList watch_list; QString dir_path; bool deep_scan; std::atomic_bool stop_processing; + void AddInstalledTitlesToGameList(); + void FillControlMap(const std::string& dir_path); void AddFstEntriesToGameList(const std::string& dir_path, unsigned int recursion = 0); }; |