ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-15 13:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

pluginRepository task exhaustion fix

Browse source
This commit is contained in:
Raymond 2021-09-06 20:20:59 -04:00
parent 58324429e7
commit 013805c19c
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Dalamud/Plugin/Internal/PluginRepository.cs
View file

@ -30,8 +30,7 @@ namespace Dalamud.Plugin.Internal
this.IsThirdParty = pluginMasterUrl != DalamudPluginsMasterUrl; this.IsThirdParty = pluginMasterUrl != DalamudPluginsMasterUrl;
this.IsEnabled = isEnabled; this.IsEnabled = isEnabled;
// No need to wait for this this.ReloadPluginMasterAsync();
Task.Run(this.ReloadPluginMasterAsync);
} }
/// <summary> /// <summary>
@ -73,12 +72,12 @@ namespace Dalamud.Plugin.Internal
this.State = PluginRepositoryState.InProgress; this.State = PluginRepositoryState.InProgress;
this.PluginMaster = new List<RemotePluginManifest>().AsReadOnly(); this.PluginMaster = new List<RemotePluginManifest>().AsReadOnly();
return Task.Run(() => return Task.Run(async () =>
{ {
Log.Information($"Fetching repo: {this.PluginMasterUrl}"); Log.Information($"Fetching repo: {this.PluginMasterUrl}");
using var client = new HttpClient(); using var client = new HttpClient();
using var response = client.GetAsync(this.PluginMasterUrl).Result; using var response = await client.GetAsync(this.PluginMasterUrl);
var data = response.Content.ReadAsStringAsync().Result; var data = await response.Content.ReadAsStringAsync();
var pluginMaster = JsonConvert.DeserializeObject<List<RemotePluginManifest>>(data); var pluginMaster = JsonConvert.DeserializeObject<List<RemotePluginManifest>>(data);
pluginMaster.Sort((pm1, pm2) => pm1.Name.CompareTo(pm2.Name)); pluginMaster.Sort((pm1, pm2) => pm1.Name.CompareTo(pm2.Name));