Add launcher path in Paths config; does not show in gamelist yet

Author: Motobug

…a/Launcher/Project+ Netplay Launcher.dol …r/Launcher/Project+ Netplay Launcher.dolData/Launcher/Project+ Netplay Launcher.dol renamed to Data/user/Launcher/Project+ Netplay Launcher.dol Data/Launcher/Project+ Netplay Launcher.dol renamed to Data/user/Launcher/Project+ Netplay Launcher.dol

@@ -94,6 +94,7 @@
 #define WIISDSYNC_DIR "WiiSDSync"
 #define ASSEMBLY_DIR "SavedAssembly"
 #define NETPLAY_SAVE_DIR "NetplaySave"
+#define LAUNCHER_DIR "Launcher"
 
 
 // This one is only used to remove it if it was present

…a/Launcher/Project+ Offline Launcher.dol …r/Launcher/Project+ Offline Launcher.dolData/Launcher/Project+ Offline Launcher.dol renamed to Data/user/Launcher/Project+ Offline Launcher.dol Data/Launcher/Project+ Offline Launcher.dol renamed to Data/user/Launcher/Project+ Offline Launcher.dol

@@ -882,6 +882,7 @@ static void RebuildUserDirectories(unsigned int dir_index)
     s_user_paths[D_DYNAMICINPUT_IDX] = s_user_paths[D_LOAD_IDX] + DYNAMICINPUT_DIR DIR_SEP;
     s_user_paths[D_GRAPHICSMOD_IDX] = s_user_paths[D_LOAD_IDX] + GRAPHICSMOD_DIR DIR_SEP;
     s_user_paths[D_WIISDCARDSYNCFOLDER_IDX] = s_user_paths[D_LOAD_IDX] + WIISDSYNC_DIR DIR_SEP;
+    s_user_paths[D_LAUNCHERS_IDX] = s_user_paths[D_USER_IDX] + LAUNCHER_DIR DIR_SEP;
     s_user_paths[F_DOLPHINCONFIG_IDX] = s_user_paths[D_CONFIG_IDX] + DOLPHIN_CONFIG;
     s_user_paths[F_GCPADCONFIG_IDX] = s_user_paths[D_CONFIG_IDX] + GCPAD_CONFIG;
     s_user_paths[F_WIIPADCONFIG_IDX] = s_user_paths[D_CONFIG_IDX] + WIIPAD_CONFIG;

Data/Launcher/icon.png Data/user/Launcher/icon.pngData/Launcher/icon.png renamed to Data/user/Launcher/icon.png

@@ -76,6 +76,7 @@ enum
   D_GPU_DRIVERS_HOOKS,
   D_GPU_DRIVERS_FILE_REDIRECT,
   D_ASM_ROOT_IDX,
+  D_LAUNCHERS_IDX,
   FIRST_FILE_USER_PATH_IDX,
   F_DOLPHINCONFIG_IDX = FIRST_FILE_USER_PATH_IDX,
   F_GCPADCONFIG_IDX,

Source/Core/Common/CommonPaths.h

@@ -311,6 +311,7 @@ bool ShouldUseDPL2Decoder()
 
 const Info<std::string> MAIN_DUMP_PATH{{System::Main, "General", "DumpPath"}, ""};
 const Info<std::string> MAIN_LOAD_PATH{{System::Main, "General", "LoadPath"}, ""};
+const Info<std::string> MAIN_LAUNCHER_PATH{{System::Main, "General", "LauncherPath"}, ""};
 const Info<std::string> MAIN_RESOURCEPACK_PATH{{System::Main, "General", "ResourcePackPath"}, ""};
 const Info<std::string> MAIN_FS_PATH{{System::Main, "General", "NANDRootPath"}, ""};
 const Info<std::string> MAIN_WII_SD_CARD_IMAGE_PATH{{System::Main, "General", "WiiSDCardPath"}, ""};
@@ -344,6 +345,7 @@ std::vector<std::string> GetIsoPaths()
     if (!iso_path.empty())
       paths.emplace_back(std::move(iso_path));
   }
+
   return paths;
 }
 

Source/Core/Common/FileUtil.cpp

@@ -197,6 +197,7 @@ extern const Info<bool> MAIN_TIME_TRACKING;
 
 extern const Info<std::string> MAIN_DUMP_PATH;
 extern const Info<std::string> MAIN_LOAD_PATH;
+extern const Info<std::string> MAIN_LAUNCHER_PATH;
 extern const Info<std::string> MAIN_RESOURCEPACK_PATH;
 extern const Info<std::string> MAIN_FS_PATH;
 extern const Info<std::string> MAIN_WII_SD_CARD_IMAGE_PATH;

Source/Core/Common/FileUtil.h

@@ -43,6 +43,7 @@ GameTracker::GameTracker(QObject* parent) : QFileSystemWatcher(parent)
   connect(this, &QFileSystemWatcher::fileChanged, this, &GameTracker::UpdateFile);
   connect(&Settings::Instance(), &Settings::AutoRefreshToggled, this, [] {
     const auto paths = Settings::Instance().GetPaths();
+    const auto launcher = File::GetUserPath(D_LAUNCHERS_IDX);
 
     for (const auto& path : paths)
     {
@@ -232,6 +233,18 @@ void GameTracker::UpdateFile(const QString& dir)
   m_load_thread.EmplaceItem(Command{CommandType::UpdateFile, dir});
 }
 
+void GameTracker::AddLauncherDirectory(const QString& dir)
+{
+  if (!QFileInfo(dir).exists())
+    return;
+  for (const QString& dir : Settings::Instance().GetLauncherPath())
+  {
+    m_load_thread.EmplaceItem(Command{CommandType::RemoveDirectory, dir});
+    m_load_thread.EmplaceItem(Command{CommandType::AddDirectory, dir});
+  }
+  UpdateLauncherDirectory(dir);
+}
+
 void GameTracker::AddDirectoryInternal(const QString& dir)
 {
   if (!QFileInfo(dir).exists())
@@ -307,6 +320,44 @@ void GameTracker::UpdateDirectoryInternal(const QString& dir)
   }
 }
 
+void GameTracker::UpdateLauncherDirectory(const QString& dir)
+{
+  auto it = GetIterator(dir);
+  while (it->hasNext() && !m_processing_halted)
+  {
+    QString path = QFileInfo(it->next()).canonicalFilePath();
+
+    if (m_tracked_files.contains(path))
+    {
+      auto& tracked_file = m_tracked_files[path];
+      if (!tracked_file.contains(dir))
+        tracked_file.insert(dir);
+    }
+    else
+    {
+      AddPath(path);
+      m_tracked_files[path] = QSet<QString>{dir};
+      LoadGame(path);
+    }
+  }
+
+  for (const auto& missing : FindMissingFiles(dir))
+  {
+    if (m_processing_halted)
+      break;
+
+    auto& tracked_file = m_tracked_files[missing];
+
+    tracked_file.remove(dir);
+    if (tracked_file.empty())
+    {
+      m_tracked_files.remove(missing);
+      if (m_started)
+        GameRemoved(missing.toStdString());
+    }
+  }
+}
+
 void GameTracker::UpdateFileInternal(const QString& file)
 {
   if (QFileInfo(file).exists())

Source/Core/Core/Config/MainSettings.cpp

@@ -54,8 +54,10 @@ class GameTracker final : public QFileSystemWatcher
   void UpdateDirectory(const QString& dir);
   void UpdateFile(const QString& path);
   void AddDirectoryInternal(const QString& dir);
+  void AddLauncherDirectory(const QString& dir);
   void RemoveDirectoryInternal(const QString& dir);
   void UpdateDirectoryInternal(const QString& dir);
+  void UpdateLauncherDirectory(const QString& dir);
   void UpdateFileInternal(const QString& path);
   QSet<QString> FindMissingFiles(const QString& dir);
   void LoadGame(const QString& path);