t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove old server migration

Browse Source
This commit is contained in:
Loporrit
2025-08-02 09:48:59 +00:00
parent 5c9ca801f8
commit 6edb55b235
4 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
MareSynchronos/MareConfiguration/ConfigurationMigrator.cs
View File

@@ -4,28 +4,12 @@ using Microsoft.Extensions.Logging;
namespace MareSynchronos.MareConfiguration; namespace MareSynchronos.MareConfiguration;
public class ConfigurationMigrator(ILogger<ConfigurationMigrator> logger, public class ConfigurationMigrator(ILogger<ConfigurationMigrator> logger) : IHostedService
NotesConfigService notesConfig) : IHostedService
{ {
private readonly ILogger<ConfigurationMigrator> _logger = logger; private readonly ILogger<ConfigurationMigrator> _logger = logger;
public void Migrate() public void Migrate()
{ {
var oldUri = ApiController.LoporritServiceUriOld;
var newUri = ApiController.LoporritServiceUri;
if (notesConfig.Current.ServerNotes.TryGetValue(oldUri, out var old))
{
_logger.LogDebug("Migrating server notes {old} => {new}", oldUri, newUri);
notesConfig.Current.ServerNotes.TryAdd(newUri, new());
var merged = notesConfig.Current.ServerNotes.GetValueOrDefault(newUri, new());
foreach (var (k, v) in old.GidServerComments)
merged.GidServerComments.TryAdd(k, v);
foreach (var (k, v) in old.UidServerComments)
merged.UidServerComments.TryAdd(k, v);
notesConfig.Current.ServerNotes.Remove(oldUri);
notesConfig.Save();
}
} }
public Task StartAsync(CancellationToken cancellationToken) public Task StartAsync(CancellationToken cancellationToken)

4
MareSynchronos/MarePlugin.cs
View File

@@ -90,9 +90,9 @@ public class MarePlugin : MediatorSubscriberBase, IHostedService
public Task StartAsync(CancellationToken cancellationToken) public Task StartAsync(CancellationToken cancellationToken)
{ {
var version = Assembly.GetExecutingAssembly().GetName().Version!; var version = Assembly.GetExecutingAssembly().GetName().Version!;
Logger.LogInformation("Launching {name} {major}.{minor}.{build}-lop{rev}", "Loporrit Sync", version.Major, version.Minor, version.Build, version.Revision); Logger.LogInformation("Launching {name} {major}.{minor}.{build}.{rev}", "Loporrit Sync", version.Major, version.Minor, version.Build, version.Revision);
Mediator.Publish(new EventMessage(new Services.Events.Event(nameof(MarePlugin), Services.Events.EventSeverity.Informational, Mediator.Publish(new EventMessage(new Services.Events.Event(nameof(MarePlugin), Services.Events.EventSeverity.Informational,
$"Starting Loporrit Sync {version.Major}.{version.Minor}.{version.Build}-lop{version.Revision}"))); $"Starting Loporrit Sync {version.Major}.{version.Minor}.{version.Build}.{version.Revision}")));
Mediator.Subscribe<SwitchToMainUiMessage>(this, (msg) => { if (_launchTask == null || _launchTask.IsCompleted) _launchTask = Task.Run(WaitForPlayerAndLaunchCharacterManager); }); Mediator.Subscribe<SwitchToMainUiMessage>(this, (msg) => { if (_launchTask == null || _launchTask.IsCompleted) _launchTask = Task.Run(WaitForPlayerAndLaunchCharacterManager); });
Mediator.Subscribe<DalamudLoginMessage>(this, (_) => DalamudUtilOnLogIn()); Mediator.Subscribe<DalamudLoginMessage>(this, (_) => DalamudUtilOnLogIn());

5
MareSynchronos/Services/ServerConfiguration/ServerConfigurationManager.cs
View File

@@ -500,11 +500,6 @@ public class ServerConfigurationManager
for (int i = 0; i < _configService.Current.ServerStorage.Count; ++i) for (int i = 0; i < _configService.Current.ServerStorage.Count; ++i)
{ {
var x = _configService.Current.ServerStorage[i]; var x = _configService.Current.ServerStorage[i];
if (x.ServerUri.Equals(ApiController.LoporritServiceUriOld, StringComparison.OrdinalIgnoreCase))
{
_logger.LogDebug("Updating server URI {old} => {new}", x.ServerUri, ApiController.LoporritServiceUri);
x.ServerUri = _configService.Current.ServerStorage[i].ServerUri = ApiController.LoporritServiceUri;
}
if (x.ServerUri.Equals(ApiController.LoporritServiceUri, StringComparison.OrdinalIgnoreCase)) if (x.ServerUri.Equals(ApiController.LoporritServiceUri, StringComparison.OrdinalIgnoreCase))
lopExists = true; lopExists = true;
} }

1
MareSynchronos/WebAPI/SignalR/ApiController.cs
View File

@@ -25,7 +25,6 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IM
public const string LoporritServer = "Loporrit Main Server"; public const string LoporritServer = "Loporrit Main Server";
public const string LoporritServiceUri = "wss://lop-sync.com"; public const string LoporritServiceUri = "wss://lop-sync.com";
public const string LoporritServiceHubUri = "wss://hub.lop-sync.com/mare"; public const string LoporritServiceHubUri = "wss://hub.lop-sync.com/mare";
public const string LoporritServiceUriOld = "wss://loporrit.us.to";
private readonly DalamudUtilService _dalamudUtil; private readonly DalamudUtilService _dalamudUtil;
private readonly HubFactory _hubFactory; private readonly HubFactory _hubFactory;