lancommander-ref/LANCommander
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Store installed flag in local library, pre-select addons on Modify/Install dialog

Browse source
This commit is contained in:
RattleSN4K3 2025-05-15 03:04:48 +02:00
parent fa2919b81b
commit 87ecb8ef01
6 changed files with 56 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
LANCommander.Launcher.Models/DownloadQueueRedistributable.cs
View file

@ -11,6 +11,7 @@ namespace LANCommander.Launcher.Models
{
public Guid Id { get; set; }
public Guid[] AddonIds { get; set; }
public Dictionary<Guid, string?> AddonVersions { get; set; }
public string Title { get; set; }
public string Version { get; set; }
public string InstallDirectory { get; set; }

1
LANCommander.Launcher.Models/IInstallQueueItem.cs
View file

@ -11,6 +11,7 @@ namespace LANCommander.Launcher.Models
{
Guid Id { get; set; }
Guid[] AddonIds { get; set; }
Dictionary<Guid, string?> AddonVersions { get; set; }
string Title { get; set; }
string Version { get; set; }
string InstallDirectory { get; set; }

1
LANCommander.Launcher.Models/InstallQueueGame.cs
View file

@ -11,6 +11,7 @@ namespace LANCommander.Launcher.Models
{
public Guid Id { get; set; }
public Guid[] AddonIds { get; set; }
public Dictionary<Guid, string?> AddonVersions { get; set; }
public string Title { get; set; }
public string Version { get; set; }
public string InstallDirectory { get; set; }

54
LANCommander.Launcher.Services/InstallService.cs
View file

@ -53,7 +53,7 @@ namespace LANCommander.Launcher.Services
Queue.CollectionChanged += (sender, e) =>
{
OnQueueChanged?.Invoke();
};
};
Client.Games.OnInstallProgressUpdate += (e) =>
{
@ -79,7 +79,15 @@ namespace LANCommander.Launcher.Services
OnQueueChanged?.Invoke();
}
public async Task Add(Game game, string installDirectory = "", Guid[] addonIds = null)
[Obsolete("Use Add(Game, string, Game[]) instead.")]
public async Task AddObsolete(Game game, string installDirectory = "", Guid[]? addonIds = null)
{
var addons = addonIds != null ? await Client.Games.GetAddonsAsync(game.Id) : [];
var selectedAddons = addons?.Where(x => addons.Contains(x)).ToArray();
await Add(game, installDirectory, selectedAddons);
}
public async Task Add(Game game, string installDirectory = "", SDK.Models.Game[]? addons = null)
{
var gameInfo = await Client.Games.GetAsync(game.Id);
@ -118,8 +126,14 @@ namespace LANCommander.Launcher.Services
queueItem.InstallDirectory = installDirectory;
if (addonIds != null && addonIds.Length > 0)
if (addons != null && addons.Length > 0)
{
var versions = addons.ToLookup(addon => addon.Id, x => x.Archives.OrderByDescending(a => a.CreatedOn).FirstOrDefault()?.Version);
var addonIds = addons.Select(x => x.Id).ToArray() ?? [];
queueItem.AddonIds = addonIds;
queueItem.AddonVersions = addonIds.ToDictionary(x => x, y => versions[y]?.FirstOrDefault());
}
if (Queue.Any(i => i.State))
Queue.Add(queueItem);
@ -201,7 +215,16 @@ namespace LANCommander.Launcher.Services
{
// Probably doing a modification of some sort
if (localGame.InstallDirectory.StartsWith(currentItem.InstallDirectory))
{
await Client.Games.InstallAddonsAsync(localGame.InstallDirectory, localGame.Id, currentItem.AddonIds);
UpdateGameState(currentItem, localGame, localGame.InstallDirectory);
await GameService.UpdateAsync(localGame);
currentItem.Status = InstallStatus.Complete;
OnQueueChanged?.Invoke();
OnInstallComplete?.Invoke(localGame);
}
else
{
await Move(currentItem, localGame, remoteGame);
@ -230,11 +253,7 @@ namespace LANCommander.Launcher.Services
try
{
installDirectory = await Client.Games.InstallAsync(remoteGame.Id, currentItem.InstallDirectory, currentItem.AddonIds);
localGame.InstallDirectory = installDirectory;
localGame.Installed = true;
localGame.InstalledVersion = currentItem.Version;
localGame.InstalledOn = DateTime.Now;
UpdateGameState(currentItem, localGame, installDirectory);
}
catch (InstallCanceledException ex)
{
@ -314,6 +333,25 @@ namespace LANCommander.Launcher.Services
await Next();
}
private static void UpdateGameState(IInstallQueueItem currentItem, Game localGame, string installDirectory)
{
localGame.InstallDirectory = installDirectory;
localGame.Installed = true;
localGame.InstalledVersion = currentItem.Version;
localGame.InstalledOn ??= DateTime.Now;
foreach (var addonId in (currentItem.AddonIds ?? []))
{
var localAddon = localGame.DependentGames.FirstOrDefault(d => d.Id == addonId);
if (localAddon == null) continue;
localAddon.InstallDirectory = installDirectory;
localAddon.Installed = true;
localAddon.InstalledVersion = currentItem.AddonVersions.TryGetValue(localAddon.Id, out var addonVersion) ? addonVersion : null;
localAddon.InstalledOn ??= DateTime.Now;
}
}
public async Task Move(IInstallQueueItem currentItem, Game localGame, SDK.Models.Game remoteGame)
{
using (var operation = Logger.BeginOperation("Moving game {GameTitle} ({GameId}) to {Destination}", localGame.Title, localGame.Id, currentItem.InstallDirectory))

1
LANCommander.Launcher.Services/LibraryService.cs
View file

@ -217,6 +217,7 @@ namespace LANCommander.Launcher.Services
.Include(g => g.Platforms)
.Include(g => g.Media)
.Include(g => g.MultiplayerModes)
.Include(g => g.DependentGames)
.FirstOrDefaultAsync(g => g.Id == key);
return new ListItem(game);

10
LANCommander.Launcher/UI/Components/InstallDialog.razor
View file

@ -59,11 +59,10 @@
string SelectedDirectory = "";
List<SDK.Models.Game> Addons = new();
SDK.Models.Game RemoteGame;
Data.Models.Game Game;
List<SDK.Models.Game> Addons = new();
IEnumerable<SDK.Models.Game> SelectedAddons = new List<SDK.Models.Game>();
enum InstallOperation
@ -77,7 +76,7 @@
protected override async Task OnInitializedAsync()
{
Game = Options.DataItem as Game;
if (Game.Installed)
SelectedDirectory = Settings.Games.InstallDirectories.FirstOrDefault(d => Game.InstallDirectory.StartsWith(d));
@ -86,6 +85,9 @@
RemoteGame = await Client.Games.GetAsync(Options.Key);
Addons = (await Client.Games.GetAddonsAsync(Options.Key)).OrderByTitle(g => g.SortTitle ?? g.Title).ToList();
var localAddons = Game?.DependentGames.Where(g => g.Installed).Select(addon => addon.Id).ToArray() ?? [];
SelectedAddons = Addons?.Where(addon => localAddons.Contains(addon.Id)).ToList() ?? [];
}
async Task Close()
@ -97,7 +99,7 @@
{
var game = Options.DataItem as Game;
InstallService.Add(game, SelectedDirectory, SelectedAddons.Select(a => a.Id).ToArray());
InstallService.Add(game, SelectedDirectory, SelectedAddons.ToArray());
await CloseFeedbackAsync();
}