ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-29 20:03:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

refactor: clean up async logic for PluginMaster loads

Browse source
This commit is contained in:
goat 2021-09-09 01:09:04 +02:00
parent bd48297745
commit 86d9f01877
No known key found for this signature in database
GPG key ID: 7773BB5B43BA52E5
5 changed files with 42 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Dalamud/Plugin/Internal/PluginManager.cs
View file

@ -72,9 +72,7 @@ namespace Dalamud.Plugin.Internal
this.PluginConfigs = new PluginConfigurations(Path.Combine(Path.GetDirectoryName(startInfo.ConfigurationPath) ?? string.Empty, "pluginConfigs"));
var bannedPluginsJson = File.ReadAllText(Path.Combine(startInfo.AssetDirectory, "UIRes", "bannedplugin.json"));
this.bannedPlugins = JsonConvert.DeserializeObject<BannedPlugin[]>(bannedPluginsJson);
this.SetPluginReposFromConfig(false);
this.bannedPlugins = JsonConvert.DeserializeObject<BannedPlugin[]>(bannedPluginsJson) ?? Array.Empty<BannedPlugin>();
this.ApplyPatches();
}
@ -146,10 +144,12 @@ namespace Dalamud.Plugin.Internal
}
/// <summary>
/// Set the list of repositories to use. Should be called when the Settings window has been updated or at instantiation.
/// Set the list of repositories to use and downloads their contents.
/// Should be called when the Settings window has been updated or at instantiation.
/// </summary>
/// <param name="notify">Whether the available plugins changed should be evented after.</param>
public void SetPluginReposFromConfig(bool notify)
/// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
public async Task SetPluginReposFromConfigAsync(bool notify)
{
var configuration = Service<DalamudConfiguration>.Get();
@ -162,6 +162,11 @@ namespace Dalamud.Plugin.Internal
if (notify)
this.NotifyAvailablePluginsChanged();
foreach (var repo in repos)
{
await repo.ReloadPluginMasterAsync();
}
}
/// <summary>
@ -301,11 +306,15 @@ namespace Dalamud.Plugin.Internal
/// <summary>
/// Reload the PluginMaster for each repo, filter, and event that the list has updated.
/// </summary>
public void ReloadPluginMasters()
/// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
public async Task ReloadPluginMastersAsync()
{
Task.WhenAll(this.Repos.Select(repo => repo.ReloadPluginMasterAsync()))
.ContinueWith(task => this.RefilterPluginMasters())
.Wait();
foreach (var repo in this.Repos)
{
await repo.ReloadPluginMasterAsync();
}
this.RefilterPluginMasters();
}
/// <summary>