Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-10-23 07:35:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GameList: Use ProgressCallback interface when scanning

Browse source
This commit is contained in:
Connor McLaughlin 2020-03-12 15:32:19 +10:00
parent f71a03202b
commit 9e08ae6188
2 changed files with 35 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/core/game_list.cpp
View file

@ -6,6 +6,7 @@
#include "common/file_system.h"
#include "common/iso_reader.h"
#include "common/log.h"
#include "common/progress_callback.h"
#include "common/string_util.h"
#include "settings.h"
#include <algorithm>
@ -511,14 +512,20 @@ void GameList::DeleteCacheFile()
Log_WarningPrintf("Failed to delete game list cache '%s'", m_cache_filename.c_str());
}
void GameList::ScanDirectory(const char* path, bool recursive)
void GameList::ScanDirectory(const char* path, bool recursive, ProgressCallback* progress)
{
Log_DevPrintf("Scanning %s%s", path, recursive ? " (recursively)" : "");
progress->PushState();
progress->SetFormattedStatusText("Scanning directory '%s'%s...", path, recursive ? " (recursively)" : "");
FileSystem::FindResultsArray files;
FileSystem::FindFiles(path, "*", FILESYSTEM_FIND_FILES | (recursive ? FILESYSTEM_FIND_RECURSIVE : 0), &files);
GameListEntry entry;
progress->SetProgressRange(static_cast<u32>(files.size()));
progress->SetProgressValue(0);
for (const FILESYSTEM_FIND_DATA& ffd : files)
{
// if this is a .bin, check if we have a .cue. if there is one, skip it
@ -551,6 +558,12 @@ void GameList::ScanDirectory(const char* path, bool recursive)
if (!GetGameListEntryFromCache(entry_path, &entry) ||
entry.last_modified_time != ffd.ModificationTime.AsUnixTimestamp())
{
const char* file_part_slash =
std::max(std::strrchr(entry_path.c_str(), '/'), std::strrchr(entry_path.c_str(), '\\'));
progress->SetFormattedStatusText("Scanning '%s'...",
file_part_slash ? (file_part_slash + 1) : entry_path.c_str());
progress->IncrementProgressValue();
if (GetGameListEntry(entry_path, &entry))
{
if (m_cache_write_stream || OpenCacheForWriting())
@ -568,6 +581,9 @@ void GameList::ScanDirectory(const char* path, bool recursive)
m_entries.push_back(std::move(entry));
entry = {};
}
progress->SetProgressValue(static_cast<u32>(files.size()));
progress->PopState();
}
class GameList::RedumpDatVisitor final : public tinyxml2::XMLVisitor
@ -700,8 +716,11 @@ bool GameList::IsDatabasePresent() const
return FileSystem::FileExists(m_database_filename.c_str());
}
void GameList::Refresh(bool invalidate_cache, bool invalidate_database)
void GameList::Refresh(bool invalidate_cache, bool invalidate_database, ProgressCallback* progress /* = nullptr */)
{
if (!progress)
progress = ProgressCallback::NullProgressCallback;
if (invalidate_cache)
DeleteCacheFile();
else
@ -712,8 +731,17 @@ void GameList::Refresh(bool invalidate_cache, bool invalidate_database)
m_entries.clear();
for (const DirectoryEntry& de : m_search_directories)
ScanDirectory(de.path.c_str(), de.recursive);
if (!m_search_directories.empty())
{
progress->SetProgressRange(static_cast<u32>(m_search_directories.size()));
progress->SetProgressValue(0);
for (DirectoryEntry& de : m_search_directories)
{
ScanDirectory(de.path.c_str(), de.recursive, progress);
progress->IncrementProgressValue();
}
}
// don't need unused cache entries
CloseCacheFileStream();

5
src/core/game_list.h
View file

@ -9,6 +9,7 @@
class CDImage;
class ByteStream;
class ProgressCallback;
class SettingsInterface;
@ -73,7 +74,7 @@ public:
bool IsDatabasePresent() const;
void AddDirectory(std::string path, bool recursive);
void Refresh(bool invalidate_cache, bool invalidate_database);
void Refresh(bool invalidate_cache, bool invalidate_database, ProgressCallback* progress = nullptr);
private:
enum : u32
@ -97,7 +98,7 @@ private:
bool GetGameListEntry(const std::string& path, GameListEntry* entry);
bool GetGameListEntryFromCache(const std::string& path, GameListEntry* entry);
void ScanDirectory(const char* path, bool recursive);
void ScanDirectory(const char* path, bool recursive, ProgressCallback* progress);
void LoadCache();
bool LoadEntriesFromCache(ByteStream* stream);