pacnpal/citron
1
0
Fork 0
mirror of https://git.eden-emu.dev/archive/citron synced 2026-04-18 10:40:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

fs(ui): Include Progress Bar

Browse Source 
Signed-off-by: Collecting <collecting@noreply.localhost>
This commit is contained in:
Collecting
2025-12-19 20:51:55 +00:00
parent c93a43f872
commit 9650077ade
1 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/citron/game_list_worker.cpp
View File

@@ -563,8 +563,9 @@ void GameListWorker::AddTitlesToGameList(GameListDir* parent_dir, const std::map
} }
void GameListWorker::ScanFileSystem(ScanTarget target, const std::string& dir_path, bool deep_scan, void GameListWorker::ScanFileSystem(ScanTarget target, const std::string& dir_path, bool deep_scan,
GameListDir* parent_dir, const std::map<u64, std::pair<int, int>>& online_stats) { GameListDir* parent_dir, const std::map<u64, std::pair<int, int>>& online_stats,
const auto callback = [this, target, parent_dir, &online_stats](const std::filesystem::path& path) -> bool { int& processed_files, int total_files) {
const auto callback = [this, target, parent_dir, &online_stats, &processed_files, total_files](const std::filesystem::path& path) -> bool {
if (stop_requested) return false; if (stop_requested) return false;
const auto physical_name = Common::FS::PathToUTF8String(path); const auto physical_name = Common::FS::PathToUTF8String(path);
@@ -574,6 +575,12 @@ void GameListWorker::ScanFileSystem(ScanTarget target, const std::string& dir_pa
return true; return true;
} }
// Update progress before heavy I/O
processed_files++;
if (total_files > 0) {
emit ProgressUpdated((processed_files * 100) / total_files);
}
// Only now do we do "Heavy" disk I/O // Only now do we do "Heavy" disk I/O
const auto file = vfs->OpenFile(physical_name, FileSys::OpenMode::Read); const auto file = vfs->OpenFile(physical_name, FileSys::OpenMode::Read);
if (!file) return true; if (!file) return true;
@@ -672,7 +679,7 @@ void GameListWorker::run() {
for (const auto& room : room_list) { for (const auto& room : room_list) {
u64 game_id = room.information.preferred_game.id; u64 game_id = room.information.preferred_game.id;
if (game_id != 0) { if (game_id != 0) {
online_stats[game_id].first += room.members.size(); online_stats[game_id].first += (int)room.members.size();
online_stats[game_id].second++; online_stats[game_id].second++;
} }
} }
@@ -681,6 +688,27 @@ void GameListWorker::run() {
watch_list.clear(); watch_list.clear();
provider->ClearAllEntries(); provider->ClearAllEntries();
// 1. Pre-scan to count total games for accurate progress
int total_files = 0;
int processed_files = 0;
for (const auto& game_dir : game_dirs) {
if (game_dir.path == "SDMC" || game_dir.path == "UserNAND" || game_dir.path == "SysNAND") continue;
auto count_callback = [&](const std::filesystem::path& path) -> bool {
if (HasSupportedFileExtension(Common::FS::PathToUTF8String(path)) || IsExtractedNCAMain(Common::FS::PathToUTF8String(path))) {
total_files++;
}
return true;
};
if (game_dir.deep_scan) {
Common::FS::IterateDirEntriesRecursively(game_dir.path, count_callback, Common::FS::DirEntryFilter::File);
} else {
Common::FS::IterateDirEntries(game_dir.path, count_callback, Common::FS::DirEntryFilter::File);
}
}
const auto DirEntryReady = [&](GameListDir* game_list_dir) { const auto DirEntryReady = [&](GameListDir* game_list_dir) {
RecordEvent([=](GameList* game_list) { game_list->AddDirEntry(game_list_dir); }); RecordEvent([=](GameList* game_list) { game_list->AddDirEntry(game_list_dir); });
}; };
@@ -688,7 +716,7 @@ void GameListWorker::run() {
for (UISettings::GameDir& game_dir : game_dirs) { for (UISettings::GameDir& game_dir : game_dirs) {
if (stop_requested) break; if (stop_requested) break;
if (game_dir.path == std::string("SDMC") || game_dir.path == std::string("UserNAND") || game_dir.path == std::string("SysNAND")) { if (game_dir.path == "SDMC" || game_dir.path == "UserNAND" || game_dir.path == "SysNAND") {
auto type = (game_dir.path == "SDMC") ? GameListItemType::SdmcDir : (game_dir.path == "UserNAND" ? GameListItemType::UserNandDir : GameListItemType::SysNandDir); auto type = (game_dir.path == "SDMC") ? GameListItemType::SdmcDir : (game_dir.path == "UserNAND" ? GameListItemType::UserNandDir : GameListItemType::SysNandDir);
auto* const game_list_dir = new GameListDir(game_dir, type); auto* const game_list_dir = new GameListDir(game_dir, type);
DirEntryReady(game_list_dir); DirEntryReady(game_list_dir);
@@ -699,7 +727,7 @@ void GameListWorker::run() {
DirEntryReady(game_list_dir); DirEntryReady(game_list_dir);
// ONE PASS SCAN: Replaces the two separate ScanFileSystem calls // ONE PASS SCAN: Replaces the two separate ScanFileSystem calls
ScanFileSystem(ScanTarget::Both, game_dir.path, game_dir.deep_scan, game_list_dir, online_stats); ScanFileSystem(ScanTarget::Both, game_dir.path, game_dir.deep_scan, game_list_dir, online_stats, processed_files, total_files);
} }
} }