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

Merge branch 'main' into development

Browse source
This commit is contained in:
Pat Hartl 2025-12-10 21:49:20 -06:00
commit ccb7bebd48
2 changed files with 10 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

23
LANCommander.Launcher.Services/ImportService.cs
View file

@ -4,13 +4,6 @@ using LANCommander.Launcher.Services.Import;
using LANCommander.Launcher.Services.Import.Factories;
using LANCommander.SDK;
using LANCommander.SDK.Services;
using Collection = LANCommander.Launcher.Data.Models.Collection;
using Company = LANCommander.Launcher.Data.Models.Company;
using Engine = LANCommander.Launcher.Data.Models.Engine;
using Genre = LANCommander.Launcher.Data.Models.Genre;
using MultiplayerMode = LANCommander.Launcher.Data.Models.MultiplayerMode;
using Platform = LANCommander.Launcher.Data.Models.Platform;
using Tag = LANCommander.Launcher.Data.Models.Tag;
namespace LANCommander.Launcher.Services
{
@ -23,18 +16,10 @@ namespace LANCommander.Launcher.Services
private ImportProgress _importProgress = new();
public ImportProgress Progress => _importProgress;
public AsyncEventHandler<ImportStatusUpdate> OnImportStarted;
public AsyncEventHandler<ImportStatusUpdate> OnImportStatusUpdate;
public AsyncEventHandler<ImportStatusUpdate> OnImportComplete;
public AsyncEventHandler<ImportStatusUpdate> OnImportError;
private IEnumerable<Collection> Collections;
private IEnumerable<Company> Companies;
private IEnumerable<Engine> Engines;
private IEnumerable<Genre> Genres;
private IEnumerable<Platform> Platforms;
private IEnumerable<Tag> Tags;
private IEnumerable<MultiplayerMode> MultiplayerModes;
public AsyncEventHandler<ImportStatusUpdate> OnImportStarted { get; } = new();
public AsyncEventHandler<ImportStatusUpdate> OnImportStatusUpdate { get; } = new();
public AsyncEventHandler<ImportStatusUpdate> OnImportComplete { get; } = new();
public AsyncEventHandler<ImportStatusUpdate> OnImportError { get; } = new();
public async Task ImportAsync()
{

9
LANCommander.SDK/Rpc/Clients/RpcClient.Base.cs
View file

@ -6,10 +6,11 @@ using LANCommander.SDK.Rpc.Client;
using LANCommander.SDK.Rpc.Server;
using LANCommander.SDK.Services;
using Microsoft.AspNetCore.SignalR.Client;
using Microsoft.Extensions.Logging;
namespace LANCommander.SDK.Rpc.Clients;
internal partial class RpcSubscriber(ITokenProvider tokenProvider) : IRpcSubscriber
internal partial class RpcSubscriber(ITokenProvider tokenProvider, ILogger<RpcSubscriber> logger) : IRpcSubscriber
{
private HubConnection _connection = default!;
@ -32,8 +33,9 @@ internal partial class RpcSubscriber(ITokenProvider tokenProvider) : IRpcSubscri
return true;
}
catch
catch(Exception ex)
{
logger.LogError(ex, "Failed to connect to RPC server at {ServerAddress}", serverAddress);
return false;
}
}
@ -46,8 +48,9 @@ internal partial class RpcSubscriber(ITokenProvider tokenProvider) : IRpcSubscri
return true;
}
catch
catch (Exception ex)
{
logger.LogError(ex, "Failed to disconnect from RPC server");
return false;
}
}