ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: only use a single task to download icons

Browse source
This commit is contained in:
goat 2021-10-11 03:44:28 +02:00
parent ace830db85
commit 6f155ffa6a
No known key found for this signature in database
GPG key ID: 7773BB5B43BA52E5
1 changed files with 14 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

46
Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs
View file

@ -1060,20 +1060,11 @@ namespace Dalamud.Interface.Internal.Windows
ImGui.SetCursorPos(startCursor); ImGui.SetCursorPos(startCursor);
var iconTex = this.defaultIcon; var iconTex = this.defaultIcon;
var hasIcon = this.pluginIconMap.TryGetValue(manifest.InternalName, out var cachedIconTex);
if (!hasIcon) if (this.pluginIconMap.TryGetValue(manifest.InternalName, out var cachedIconTex) && cachedIconTex != null)
{
this.pluginIconMap.Add(manifest.InternalName, null);
Task.Run(async () => await this.DownloadPluginIconAsync(plugin, manifest, isThirdParty));
}
else if (cachedIconTex != null)
{ {
iconTex = cachedIconTex; iconTex = cachedIconTex;
} }
else
{
// nothing
}
var iconSize = ImGuiHelpers.ScaledVector2(64, 64); var iconSize = ImGuiHelpers.ScaledVector2(64, 64);
@ -1943,6 +1934,7 @@ namespace Dalamud.Interface.Internal.Windows
this.ResortPlugins(); this.ResortPlugins();
this.UpdateCategoriesOnPluginsChange(); this.UpdateCategoriesOnPluginsChange();
Task.Run(() => this.DownloadPluginIconsAsync(this.pluginListAvailable.ToArray()));
} }
private void OnInstalledPluginsChanged() private void OnInstalledPluginsChanged()
@ -2034,7 +2026,17 @@ namespace Dalamud.Interface.Internal.Windows
this.errorModalOnNextFrame = true; this.errorModalOnNextFrame = true;
} }
private async Task DownloadPluginIconAsync(LocalPlugin? plugin, PluginManifest manifest, bool isThirdParty) private async Task DownloadPluginIconsAsync(RemotePluginManifest[] plugins)
{
Log.Verbose("Starting icon download...");
foreach (var plugin in plugins.Where(x => !this.pluginIconMap.ContainsKey(x.InternalName)))
{
this.pluginIconMap[plugin.InternalName] = null;
await this.DownloadPluginIconAsync(plugin, plugin.SourceRepo.IsThirdParty);
}
}
private async Task DownloadPluginIconAsync(PluginManifest manifest, bool isThirdParty)
{ {
var interfaceManager = Service<InterfaceManager>.Get(); var interfaceManager = Service<InterfaceManager>.Get();
var pluginManager = Service<PluginManager>.Get(); var pluginManager = Service<PluginManager>.Get();
@ -2064,26 +2066,6 @@ namespace Dalamud.Interface.Internal.Windows
return true; return true;
} }
if (plugin != null && plugin.IsDev)
{
var file = this.GetPluginIconFileInfo(plugin);
if (file != null)
{
Log.Verbose($"Fetching icon for {manifest.InternalName} from {file.FullName}");
var bytes = await File.ReadAllBytesAsync(file.FullName);
if (!TryLoadIcon(bytes, file.FullName, manifest, interfaceManager, out var icon))
return;
this.pluginIconMap[manifest.InternalName] = icon;
Log.Verbose($"Plugin icon for {manifest.InternalName} loaded from disk");
}
// Dev plugins are likely going to look like a main repo plugin, the InstalledFrom field is going to be null.
// So instead, set the value manually so we download from the urls specified.
isThirdParty = true;
}
var useTesting = pluginManager.UseTesting(manifest); var useTesting = pluginManager.UseTesting(manifest);
var url = this.GetPluginIconUrl(manifest, isThirdParty, useTesting); var url = this.GetPluginIconUrl(manifest, isThirdParty, useTesting);
if (url != null) if (url != null)