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

Log STBI error source

Browse source
This commit is contained in:
Raymond 2021-09-22 20:19:58 -04:00
parent 949a6072ce
commit 6527ebed01
1 changed files with 34 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1786,6 +1786,17 @@ namespace Dalamud.Interface.Internal.Windows
return true; return true;
} }
static bool TryLoadIcon(byte[] bytes, PluginManifest manifest, InterfaceManager interfaceManager, out TextureWrap image)
{
image = interfaceManager.LoadImage(bytes);
var success = image != null;
if (!success)
Log.Error($"Could not load icon for {manifest.InternalName}");
return success;
}
if (plugin != null && plugin.IsDev) if (plugin != null && plugin.IsDev)
{ {
var file = GetPluginIconFileInfo(plugin); var file = GetPluginIconFileInfo(plugin);
@ -1793,7 +1804,9 @@ namespace Dalamud.Interface.Internal.Windows
{ {
Log.Verbose($"Fetching icon for {manifest.InternalName} from {file.FullName}"); Log.Verbose($"Fetching icon for {manifest.InternalName} from {file.FullName}");
var icon = interfaceManager.LoadImage(file.FullName); var bytes = await File.ReadAllBytesAsync(file.FullName);
if (!TryLoadIcon(bytes, manifest, interfaceManager, out var icon))
return;
if (!ValidateIcon(icon, file.FullName)) if (!ValidateIcon(icon, file.FullName))
return; return;
@ -1819,7 +1832,9 @@ namespace Dalamud.Interface.Internal.Windows
data.EnsureSuccessStatusCode(); data.EnsureSuccessStatusCode();
var icon = interfaceManager.LoadImage(await data.Content.ReadAsByteArrayAsync()); var bytes = await data.Content.ReadAsByteArrayAsync();
if (!TryLoadIcon(bytes, manifest, interfaceManager, out var icon))
return;
if (!ValidateIcon(icon, url)) if (!ValidateIcon(icon, url))
return; return;
@ -1852,6 +1867,17 @@ namespace Dalamud.Interface.Internal.Windows
return true; return true;
} }
static bool TryLoadImage(int i, byte[] bytes, PluginManifest manifest, InterfaceManager interfaceManager, out TextureWrap image)
{
image = interfaceManager.LoadImage(bytes);
var success = image != null;
if (!success)
Log.Error($"Could not load image{i + 1} for {manifest.InternalName}");
return success;
}
if (plugin != null && plugin.IsDev) if (plugin != null && plugin.IsDev)
{ {
var files = GetPluginImageFileInfos(plugin); var files = GetPluginImageFileInfos(plugin);
@ -1868,7 +1894,9 @@ namespace Dalamud.Interface.Internal.Windows
Log.Verbose($"Loading image{i + 1} for {manifest.InternalName} from {file.FullName}"); Log.Verbose($"Loading image{i + 1} for {manifest.InternalName} from {file.FullName}");
var image = interfaceManager.LoadImage(await File.ReadAllBytesAsync(file.FullName)); var bytes = await File.ReadAllBytesAsync(file.FullName);
if (!TryLoadImage(i, bytes, manifest, interfaceManager, out var image))
continue;
if (!ValidateImage(image, file.FullName)) if (!ValidateImage(image, file.FullName))
continue; continue;
@ -1911,7 +1939,9 @@ namespace Dalamud.Interface.Internal.Windows
data.EnsureSuccessStatusCode(); data.EnsureSuccessStatusCode();
var image = interfaceManager.LoadImage(await data.Content.ReadAsByteArrayAsync()); var bytes = await data.Content.ReadAsByteArrayAsync();
if (!TryLoadImage(i, bytes, manifest, interfaceManager, out var image))
continue;
if (!ValidateImage(image, url)) if (!ValidateImage(image, url))
continue; continue;