Merge pull request #8399 from CookiePLMonster/gametracker-fixes

Qt: Game Tracker fixes

Source/Core/DolphinQt/GameList/GameTracker.cpp

@@ -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)

Source/Core/DolphinQt/GameList/GameTracker.h

@@ -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>)

Source/Core/DolphinQt/Settings.cpp

@@ -141,6 +141,11 @@ void Settings::RefreshGameList()
   emit GameListRefreshRequested();
 }
 
+void Settings::NotifyRefreshGameListComplete()
+{
+  emit GameListRefreshCompleted();
+}
+
 void Settings::RefreshMetadata()
 {
   emit MetadataRefreshRequested();

Source/Core/DolphinQt/Settings.h

@@ -75,6 +75,7 @@ public:
   QString GetDefaultGame() const;
   void SetDefaultGame(QString path);
   void RefreshGameList();
+  void NotifyRefreshGameListComplete();
   void RefreshMetadata();
   void NotifyMetadataRefreshComplete();
   void ReloadTitleDB();
@@ -150,6 +151,7 @@ signals:
   void PathRemoved(const QString&);
   void DefaultGameChanged(const QString&);
   void GameListRefreshRequested();
+  void GameListRefreshCompleted();
   void TitleDBReloadRequested();
   void MetadataRefreshRequested();
   void MetadataRefreshCompleted();

Source/Core/DolphinQt/ToolBar.cpp

@@ -32,10 +32,10 @@ ToolBar::ToolBar(QWidget* parent) : QToolBar(parent)
   connect(&Settings::Instance(), &Settings::ThemeChanged, this, &ToolBar::UpdateIcons);
   UpdateIcons();
 
-  connect(&Settings::Instance(), &Settings::EmulationStateChanged, this,
+  connect(&Settings::Instance(), &Settings::EmulationStateChanged,
           [this](Core::State state) { OnEmulationStateChanged(state); });
 
-  connect(Host::GetInstance(), &Host::UpdateDisasmDialog, this,
+  connect(Host::GetInstance(), &Host::UpdateDisasmDialog,
           [this] { OnEmulationStateChanged(Core::GetState()); });
 
   connect(&Settings::Instance(), &Settings::DebugModeToggled, this, &ToolBar::OnDebugModeToggled);
@@ -43,9 +43,12 @@ ToolBar::ToolBar(QWidget* parent) : QToolBar(parent)
   connect(&Settings::Instance(), &Settings::ToolBarVisibilityChanged, this, &ToolBar::setVisible);
   connect(this, &ToolBar::visibilityChanged, &Settings::Instance(), &Settings::SetToolBarVisible);
 
-  connect(&Settings::Instance(), &Settings::WidgetLockChanged, this,
+  connect(&Settings::Instance(), &Settings::WidgetLockChanged,
           [this](bool locked) { setMovable(!locked); });
 
+  connect(&Settings::Instance(), &Settings::GameListRefreshCompleted,
+          [this] { m_refresh_action->setEnabled(true); });
+
   OnEmulationStateChanged(Core::GetState());
   OnDebugModeToggled(Settings::Instance().IsDebugModeEnabled());
 }
@@ -109,7 +112,10 @@ void ToolBar::MakeActions()
   m_set_pc_action = addAction(tr("Set PC"), this, &ToolBar::SetPCPressed);
 
   m_open_action = addAction(tr("Open"), this, &ToolBar::OpenPressed);
-  m_refresh_action = addAction(tr("Refresh"), this, &ToolBar::RefreshPressed);
+  m_refresh_action = addAction(tr("Refresh"), [this] {
+    m_refresh_action->setEnabled(false);
+    emit RefreshPressed();
+  });
 
   addSeparator();