summaryrefslogtreecommitdiff
path: root/src/citra_qt/game_list.cpp
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2015-09-06 07:59:04 +0100
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2016-05-21 16:41:02 +0100
commit8ab6f26c09e5b77a051fa545570ca2986c45bf4a (patch)
treea0664d2b9bb548cbd7f78ed60b846a88c09f90f4 /src/citra_qt/game_list.cpp
parent51ee2d2eb1ff41a39fb3779f3ffa11979ee15e26 (diff)
Common: Make recursive FileUtil functions take a maximum recursion
Fixes #1115. Also improves the performances of DiskArchive’s directory implementation a lot, simply by not going through the entire tree instead of just listing the first level files. Thanks to JayRoxFox for rebasing this on current master!
Diffstat (limited to 'src/citra_qt/game_list.cpp')
-rw-r--r--src/citra_qt/game_list.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/citra_qt/game_list.cpp b/src/citra_qt/game_list.cpp
index d4ac9c96e..adbcf24e8 100644
--- a/src/citra_qt/game_list.cpp
+++ b/src/citra_qt/game_list.cpp
@@ -118,19 +118,20 @@ void GameList::LoadInterfaceLayout()
item_model->sort(header->sortIndicatorSection(), header->sortIndicatorOrder());
}
-void GameListWorker::AddFstEntriesToGameList(const std::string& dir_path, bool deep_scan)
+void GameListWorker::AddFstEntriesToGameList(const std::string& dir_path, unsigned int recursion)
{
const auto callback = [&](unsigned* num_entries_out,
const std::string& directory,
- const std::string& virtual_name) -> bool {
+ const std::string& virtual_name,
+ unsigned int recursion) -> bool {
std::string physical_name = directory + DIR_SEP + virtual_name;
if (stop_processing)
return false; // Breaks the callback loop.
- if (deep_scan && FileUtil::IsDirectory(physical_name)) {
- AddFstEntriesToGameList(physical_name, true);
+ if (recursion > 0 && FileUtil::IsDirectory(physical_name)) {
+ AddFstEntriesToGameList(physical_name, recursion - 1);
} else {
std::string filename_filename, filename_extension;
Common::SplitPath(physical_name, nullptr, &filename_filename, &filename_extension);
@@ -169,7 +170,7 @@ void GameListWorker::AddFstEntriesToGameList(const std::string& dir_path, bool d
void GameListWorker::run()
{
stop_processing = false;
- AddFstEntriesToGameList(dir_path.toStdString(), deep_scan);
+ AddFstEntriesToGameList(dir_path.toStdString(), deep_scan ? 256 : 0);
emit Finished();
}