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

fix: NAND & SDMC scanning

Browse Source 
Signed-off-by: Collecting <collecting@noreply.localhost>
This commit is contained in:
Collecting
2025-12-21 02:50:43 +00:00
parent e1a879489b
commit 2f16de1560
1 changed files with 53 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
src/citron/game_list_worker.cpp
View File

@@ -570,6 +570,13 @@ void GameListWorker::ScanFileSystem(ScanTarget target, const std::string& dir_pa
const auto physical_name = Common::FS::PathToUTF8String(path); const auto physical_name = Common::FS::PathToUTF8String(path);
if (physical_name.find("/nand/") != std::string::npos ||
physical_name.find("\\nand\\") != std::string::npos ||
physical_name.find("/registered/") != std::string::npos ||
physical_name.find("\\registered\\") != std::string::npos) {
return true;
}
if (!HasSupportedFileExtension(physical_name) && !IsExtractedNCAMain(physical_name)) { if (!HasSupportedFileExtension(physical_name) && !IsExtractedNCAMain(physical_name)) {
return true; return true;
} }
@@ -577,20 +584,21 @@ void GameListWorker::ScanFileSystem(ScanTarget target, const std::string& dir_pa
// Cache Check // Cache Check
const auto* cached = GetCachedGameMetadata(physical_name); const auto* cached = GetCachedGameMetadata(physical_name);
if (cached && cached->IsValid() && (target == ScanTarget::PopulateGameList || target == ScanTarget::Both)) { if (cached && cached->IsValid() && (target == ScanTarget::PopulateGameList || target == ScanTarget::Both)) {
const FileSys::PatchManager patch{cached->program_id, system.GetFileSystemController(), system.GetContentProvider()}; if ((cached->program_id & 0xFFF) == 0) {
auto file = vfs->OpenFile(physical_name, FileSys::OpenMode::Read); const FileSys::PatchManager patch{cached->program_id, system.GetFileSystemController(), system.GetContentProvider()};
if (file) { auto file = vfs->OpenFile(physical_name, FileSys::OpenMode::Read);
auto loader = Loader::GetLoader(system, file); if (file) {
if (loader) { auto loader = Loader::GetLoader(system, file);
auto entry = MakeGameListEntry(physical_name, cached->title, cached->file_size, cached->icon, *loader, if (loader) {
cached->program_id, compatibility_list, play_time_manager, patch, online_stats); auto entry = MakeGameListEntry(physical_name, cached->title, cached->file_size, cached->icon, *loader,
RecordEvent([=](GameList* game_list) { game_list->AddEntry(entry, parent_dir); }); cached->program_id, compatibility_list, play_time_manager, patch, online_stats);
RecordEvent([=](GameList* game_list) { game_list->AddEntry(entry, parent_dir); });
processed_files++; }
emit ProgressUpdated(std::min(100, (processed_files * 100) / total_files));
return true;
} }
} }
processed_files++;
emit ProgressUpdated(std::min(100, (processed_files * 100) / total_files));
return true;
} }
// Full Scan // Full Scan
@@ -610,33 +618,37 @@ void GameListWorker::ScanFileSystem(ScanTarget target, const std::string& dir_pa
const auto res2 = loader->ReadProgramId(program_id); const auto res2 = loader->ReadProgramId(program_id);
const auto file_type = loader->GetFileType(); const auto file_type = loader->GetFileType();
if (target == ScanTarget::FillManualContentProvider || target == ScanTarget::Both) { if (res2 == Loader::ResultStatus::Success && program_id != 0) {
if (res2 == Loader::ResultStatus::Success && file_type == Loader::FileType::NCA) {
provider->AddEntry(FileSys::TitleType::Application, FileSys::GetCRTypeFromNCAType(FileSys::NCA{file}.GetType()), program_id, file); if (target == ScanTarget::FillManualContentProvider || target == ScanTarget::Both) {
} else if (res2 == Loader::ResultStatus::Success && (file_type == Loader::FileType::XCI || file_type == Loader::FileType::NSP)) { if (file_type == Loader::FileType::NCA) {
const auto nsp = file_type == Loader::FileType::NSP ? std::make_shared<FileSys::NSP>(file) : FileSys::XCI{file}.GetSecurePartitionNSP(); provider->AddEntry(FileSys::TitleType::Application, FileSys::GetCRTypeFromNCAType(FileSys::NCA{file}.GetType()), program_id, file);
for (const auto& title : nsp->GetNCAs()) { } else if (file_type == Loader::FileType::XCI || file_type == Loader::FileType::NSP) {
for (const auto& entry : title.second) { const auto nsp = file_type == Loader::FileType::NSP ? std::make_shared<FileSys::NSP>(file) : FileSys::XCI{file}.GetSecurePartitionNSP();
provider->AddEntry(entry.first.first, entry.first.second, title.first, entry.second->GetBaseFile()); for (const auto& title : nsp->GetNCAs()) {
for (const auto& entry : title.second) {
provider->AddEntry(entry.first.first, entry.first.second, title.first, entry.second->GetBaseFile());
}
} }
} }
} }
}
if (target == ScanTarget::PopulateGameList || target == ScanTarget::Both) { if (target == ScanTarget::PopulateGameList || target == ScanTarget::Both) {
std::vector<u8> icon; // 3. FILTER UPDATES: Only add to UI if it's a Base Game (ID ends in 000)
std::string name = " "; if ((program_id & 0xFFF) == 0) {
loader->ReadIcon(icon); std::vector<u8> icon;
loader->ReadTitle(name); std::string name = " ";
std::size_t file_size = Common::FS::GetSize(physical_name); loader->ReadIcon(icon);
loader->ReadTitle(name);
std::size_t file_size = Common::FS::GetSize(physical_name);
if (res2 == Loader::ResultStatus::Success) { CacheGameMetadata(physical_name, program_id, file_type, file_size, name, icon);
CacheGameMetadata(physical_name, program_id, file_type, file_size, name, icon);
const FileSys::PatchManager patch{program_id, system.GetFileSystemController(), system.GetContentProvider()};
auto entry = MakeGameListEntry(physical_name, name, file_size, icon, *loader, program_id, compatibility_list, play_time_manager, patch, online_stats);
RecordEvent([=](GameList* game_list) { game_list->AddEntry(entry, parent_dir); });
}
} }
const FileSys::PatchManager patch{program_id, system.GetFileSystemController(), system.GetContentProvider()};
auto entry = MakeGameListEntry(physical_name, name, file_size, icon, *loader, program_id, compatibility_list, play_time_manager, patch, online_stats);
RecordEvent([=](GameList* game_list) { game_list->AddEntry(entry, parent_dir); });
} }
processed_files++; processed_files++;
@@ -673,14 +685,11 @@ void GameListWorker::run() {
int processed_files = 0; int processed_files = 0;
for (const auto& game_dir : game_dirs) { for (const auto& game_dir : game_dirs) {
if (game_dir.path == "SDMC" || game_dir.path == "UserNAND" || game_dir.path == "SysNAND") { if (game_dir.path == "SDMC" || game_dir.path == "UserNAND" || game_dir.path == "SysNAND") continue;
total_files += 5;
continue;
}
auto count_callback = [&](const std::filesystem::path& path) -> bool { auto count_callback = [&](const std::filesystem::path& path) -> bool {
const std::string physical_name = Common::FS::PathToUTF8String(path); const std::string physical_name = Common::FS::PathToUTF8String(path);
if (HasSupportedFileExtension(physical_name) || IsExtractedNCAMain(physical_name)) { if (HasSupportedFileExtension(physical_name)) {
total_files++; total_files++;
} }
return true; return true;
@@ -702,19 +711,13 @@ 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 == "SDMC" || game_dir.path == "UserNAND" || game_dir.path == "SysNAND") { if (game_dir.path == "SDMC" || game_dir.path == "UserNAND" || game_dir.path == "SysNAND") continue;
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);
DirEntryReady(game_list_dir);
AddTitlesToGameList(game_list_dir, online_stats);
processed_files += 5; // Match our placeholder count
} else {
watch_list.append(QString::fromStdString(game_dir.path));
auto* const game_list_dir = new GameListDir(game_dir);
DirEntryReady(game_list_dir);
ScanFileSystem(ScanTarget::Both, game_dir.path, game_dir.deep_scan, game_list_dir, online_stats, processed_files, total_files); watch_list.append(QString::fromStdString(game_dir.path));
} auto* const game_list_dir = new GameListDir(game_dir);
DirEntryReady(game_list_dir);
ScanFileSystem(ScanTarget::Both, game_dir.path, game_dir.deep_scan, game_list_dir, online_stats, processed_files, total_files);
} }
RecordEvent([this](GameList* game_list) { game_list->DonePopulating(watch_list); }); RecordEvent([this](GameList* game_list) { game_list->DonePopulating(watch_list); });