piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 07:09:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8399 from CookiePLMonster/gametracker-fixes

Browse Source 
Qt: Game Tracker fixes
This commit is contained in:
Connor McLaughlin
2019-11-08 11:22:09 +10:00
committed by GitHub
parent 9700b1e320 68694e0039
commit 71b098a69d
5 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Source/Core/DolphinQt/GameList/GameTracker.cpp
View File

@ -34,7 +34,7 @@ GameTracker::GameTracker(QObject* parent) : QFileSystemWatcher(parent)
connect(this, &QFileSystemWatcher::directoryChanged, this, &GameTracker::UpdateDirectory);
connect(this, &QFileSystemWatcher::fileChanged, this, &GameTracker::UpdateFile);
connect(&Settings::Instance(), &Settings::AutoRefreshToggled, this, [] {
connect(&Settings::Instance(), &Settings::AutoRefreshToggled, [] {
const auto paths = Settings::Instance().GetPaths();
for (const auto& path : paths)
@ -44,7 +44,7 @@ GameTracker::GameTracker(QObject* parent) : QFileSystemWatcher(parent)
}
});
connect(&Settings::Instance(), &Settings::MetadataRefreshRequested, this, [this] {
connect(&Settings::Instance(), &Settings::MetadataRefreshRequested, [this] {
m_load_thread.EmplaceItem(Command{CommandType::UpdateMetadata, {}});
});
@ -56,6 +56,7 @@ GameTracker::GameTracker(QObject* parent) : QFileSystemWatcher(parent)
break;
case CommandType::Start:
StartInternal();
break;
case CommandType::AddDirectory:
AddDirectoryInternal(command.path);
break;
@ -78,6 +79,20 @@ GameTracker::GameTracker(QObject* parent) : QFileSystemWatcher(parent)
case CommandType::PurgeCache:
m_cache.Clear(UICommon::GameFileCache::DeleteOnDisk::Yes);
break;
case CommandType::BeginRefresh:
if (m_busy_count++ == 0)
{
for (auto& file : m_tracked_files.keys())
emit GameRemoved(file.toStdString());
m_tracked_files.clear();
}
break;
case CommandType::EndRefresh:
if (--m_busy_count == 0)
{
QueueOnObject(this, [] { Settings::Instance().NotifyRefreshGameListComplete(); });
}
break;
}
});
@ -176,16 +191,15 @@ void GameTracker::RemoveDirectory(const QString& dir)
void GameTracker::RefreshAll()
{
for (auto& file : m_tracked_files.keys())
emit GameRemoved(file.toStdString());
m_tracked_files.clear();
m_load_thread.EmplaceItem(Command{CommandType::BeginRefresh});
for (const QString& dir : Settings::Instance().GetPaths())
{
m_load_thread.EmplaceItem(Command{CommandType::RemoveDirectory, dir});
m_load_thread.EmplaceItem(Command{CommandType::AddDirectory, dir});
}
m_load_thread.EmplaceItem(Command{CommandType::EndRefresh});
}
void GameTracker::UpdateDirectory(const QString& dir)

6
Source/Core/DolphinQt/GameList/GameTracker.h
View File

@ -72,7 +72,9 @@ private:
UpdateDirectory,
UpdateFile,
UpdateMetadata,
PurgeCache
PurgeCache,
BeginRefresh,
EndRefresh,
};
struct Command
@ -90,6 +92,8 @@ private:
Common::Event m_initial_games_emitted_event;
bool m_initial_games_emitted = false;
bool m_started = false;
// Count of currently running refresh jobs
u32 m_busy_count = 0;
};
Q_DECLARE_METATYPE(std::shared_ptr<const UICommon::GameFile>)