matty/CSGO-Projects
1
0
Fork 0
mirror of https://github.com/MathiasLui/CSGO-Projects.git synced 2025-05-07 14:21:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix shouldBeFullyInstalled not working in GetGamePathFromExactName

Browse source 
* It was checking correctly, but it got its games from `UpdateInstalledGames`, which already pre-filtered games that weren't fully installed, so we made it pass it down to it
* Also added a parameter to `GetGamePathFromExactName`, which enables us to also choose whether the game should be ignored, if it doesn't have an existing install folder
This commit is contained in:
Mathias Lui 2023-06-13 22:37:23 +02:00
parent 1293376031
commit 9f86e4433e
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
SteamShared/SteamShared/SteamShared/SteamHelper.cs
View file

@ -147,13 +147,14 @@ namespace SteamShared
/// <summary> /// <summary>
/// Updates the <see cref="InstalledGames">list of installed steam games</see>. /// Updates the <see cref="InstalledGames">list of installed steam games</see>.
/// </summary> /// </summary>
/// <param name="shouldBeFullyInstalled">Whether to only return games, if they're marked as fully installed.</param>
/// <param name="force">Whether to fetch them again, even if they were fetched before.</param> /// <param name="force">Whether to fetch them again, even if they were fetched before.</param>
public void UpdateInstalledGames(bool force = false) public void UpdateInstalledGames(bool shouldBeFullyInstalled = false, bool force = false)
{ {
if (!force && this.InstalledGames != null) if (!force && this.InstalledGames != null)
return; return;
this.InstalledGames = this.GetInstalledGames(); this.InstalledGames = this.GetInstalledGames(shouldBeFullyInstalled);
} }
/// <summary> /// <summary>
@ -165,11 +166,12 @@ namespace SteamShared
/// This means, that if the files are deleted manually, it might still be seen as installed, /// This means, that if the files are deleted manually, it might still be seen as installed,
/// because the manifest file might not change. /// because the manifest file might not change.
/// </remarks> /// </remarks>
/// <param name="shouldBeFullyInstalled">Whether to only return games, if they're marked as fully installed.</param>
/// <returns> /// <returns>
/// a list of installed Steam games, with some manifest data, /// a list of installed Steam games, with some manifest data,
/// or <see langword="null"/>, if no games could be fetched or found. /// or <see langword="null"/>, if no games could be fetched or found.
/// </returns> /// </returns>
public List<SteamGame>? GetInstalledGames() public List<SteamGame>? GetInstalledGames(bool shouldBeFullyInstalled = false)
{ {
// Get all steam library paths // Get all steam library paths
var steamLibraries = this.GetSteamLibraries(); var steamLibraries = this.GetSteamLibraries();
@ -206,11 +208,17 @@ namespace SteamShared
this.populateGameInfo(currGame, root, library.Path); this.populateGameInfo(currGame, root, library.Path);
if((currGame.GameState & (int)GameState.StateFullyInstalled) != 0) if(shouldBeFullyInstalled
&& (currGame.GameState & (int)GameState.StateFullyInstalled) != 0)
{ {
// Game was fully installed according to steam // Game was fully installed according to steam
allGames.Add(currGame); allGames.Add(currGame);
} }
else if (!shouldBeFullyInstalled)
{
// Game doesn't need to be fully installed to be added
allGames.Add(currGame);
}
} }
} }
@ -222,14 +230,15 @@ namespace SteamShared
/// </summary> /// </summary>
/// <param name="gameName">The name of the game. The case, as well as leading and trailing whitespaces don't matter.</param> /// <param name="gameName">The name of the game. The case, as well as leading and trailing whitespaces don't matter.</param>
/// <param name="shouldBeFullyInstalled">Whether to only return it, if it's marked as fully installed.</param> /// <param name="shouldBeFullyInstalled">Whether to only return it, if it's marked as fully installed.</param>
/// <param name="folderShouldExist">Whether to only return it, if the folder it's installed in actually exists.</param>
/// <returns> /// <returns>
/// the absolute path of the game, or <see langword="null"/> if not found, /// the absolute path of the game, or <see langword="null"/> if not found,
/// the game's folder doesn't exist, or it wasn't marked as fully installed, when required to be. /// the game's folder doesn't exist, or it wasn't marked as fully installed, when required to be.
/// </returns> /// </returns>
public string? GetGamePathFromExactName(string gameName, bool shouldBeFullyInstalled = false) public string? GetGamePathFromExactName(string gameName, bool shouldBeFullyInstalled = false, bool folderShouldExist = true)
{ {
// Will not update, if already updated once before // Will not update, if already updated once before
this.UpdateInstalledGames(); this.UpdateInstalledGames(shouldBeFullyInstalled);
if (this.InstalledGames is null) if (this.InstalledGames is null)
// User is broke or something // User is broke or something
@ -243,7 +252,7 @@ namespace SteamShared
if (foundGame is null) if (foundGame is null)
return null; return null;
if (!foundGame.GameFolderExists) if (folderShouldExist && !foundGame.GameFolderExists)
return null; return null;
if (shouldBeFullyInstalled if (shouldBeFullyInstalled