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

merge internal methods, improve logging

Browse source
This commit is contained in:
Raymond 2021-09-23 07:54:09 -04:00
parent 347ae4b679
commit 3790fb44c0
1 changed files with 31 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1706,49 +1706,40 @@ namespace Dalamud.Interface.Internal.Windows
var interfaceManager = Service<InterfaceManager>.Get(); var interfaceManager = Service<InterfaceManager>.Get();
var pluginManager = Service<PluginManager>.Get(); var pluginManager = Service<PluginManager>.Get();
static bool ValidateIcon(TextureWrap icon, string loc) static bool TryLoadIcon(byte[] bytes, string loc, PluginManifest manifest, InterfaceManager interfaceManager, out TextureWrap icon)
{ {
if (icon == null) icon = interfaceManager.LoadImage(bytes);
return false;
if (icon.Height > PluginIconHeight || icon.Width > PluginIconWidth) if (icon == null)
{ {
Log.Error($"Icon at {loc} was not of the correct resolution."); Log.Error($"Could not load icon for {manifest.InternalName} at {loc}");
return false;
}
if (icon.Width > PluginIconWidth || icon.Height > PluginIconHeight)
{
Log.Error($"Icon for {manifest.InternalName} at {loc} was larger than the maximum allowed resolution ({PluginIconWidth}x{PluginIconHeight}).");
return false; return false;
} }
if (icon.Height != icon.Width) if (icon.Height != icon.Width)
{ {
Log.Error($"Icon at {loc} was not square."); Log.Error($"Icon for {manifest.InternalName} at {loc} was not square.");
return false; return false;
} }
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 = this.GetPluginIconFileInfo(plugin);
if (file != null) if (file != null)
{ {
Log.Verbose($"Fetching icon for {manifest.InternalName} from {file.FullName}"); Log.Verbose($"Fetching icon for {manifest.InternalName} from {file.FullName}");
var bytes = await File.ReadAllBytesAsync(file.FullName); var bytes = await File.ReadAllBytesAsync(file.FullName);
if (!TryLoadIcon(bytes, manifest, interfaceManager, out var icon)) if (!TryLoadIcon(bytes, file.FullName, manifest, interfaceManager, out var icon))
return;
if (!ValidateIcon(icon, file.FullName))
return; return;
this.pluginIconMap[manifest.InternalName] = icon; this.pluginIconMap[manifest.InternalName] = icon;
@ -1761,7 +1752,7 @@ namespace Dalamud.Interface.Internal.Windows
} }
var useTesting = pluginManager.UseTesting(manifest); var useTesting = pluginManager.UseTesting(manifest);
var url = GetPluginIconUrl(manifest, isThirdParty, useTesting); var url = this.GetPluginIconUrl(manifest, isThirdParty, useTesting);
if (url != null) if (url != null)
{ {
Log.Verbose($"Downloading icon for {manifest.InternalName} from {url}"); Log.Verbose($"Downloading icon for {manifest.InternalName} from {url}");
@ -1773,10 +1764,7 @@ namespace Dalamud.Interface.Internal.Windows
data.EnsureSuccessStatusCode(); data.EnsureSuccessStatusCode();
var bytes = await data.Content.ReadAsByteArrayAsync(); var bytes = await data.Content.ReadAsByteArrayAsync();
if (!TryLoadIcon(bytes, manifest, interfaceManager, out var icon)) if (!TryLoadIcon(bytes, url, manifest, interfaceManager, out var icon))
return;
if (!ValidateIcon(icon, url))
return; return;
this.pluginIconMap[manifest.InternalName] = icon; this.pluginIconMap[manifest.InternalName] = icon;
@ -1793,34 +1781,28 @@ namespace Dalamud.Interface.Internal.Windows
var interfaceManager = Service<InterfaceManager>.Get(); var interfaceManager = Service<InterfaceManager>.Get();
var pluginManager = Service<PluginManager>.Get(); var pluginManager = Service<PluginManager>.Get();
static bool ValidateImage(TextureWrap image, string loc) static bool TryLoadImage(int i, byte[] bytes, string loc, PluginManifest manifest, InterfaceManager interfaceManager, out TextureWrap image)
{ {
if (image == null) image = interfaceManager.LoadImage(bytes);
return false;
if (image.Height != PluginImageHeight || image.Width != PluginImageWidth) if (image == null)
{ {
Log.Error($"Image at {loc} was not of the correct resolution."); Log.Error($"Could not load image{i + 1} for {manifest.InternalName} at {loc}");
return false;
}
if (image.Width > PluginImageWidth || image.Height > PluginImageHeight)
{
Log.Error($"Image{i + 1} for {manifest.InternalName} at {loc} was larger than the maximum allowed resolution ({PluginImageWidth}x{PluginImageHeight}).");
return false; return false;
} }
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 = this.GetPluginImageFileInfos(plugin);
if (files != null) if (files != null)
{ {
var didAny = false; var didAny = false;
@ -1833,16 +1815,14 @@ namespace Dalamud.Interface.Internal.Windows
continue; continue;
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 bytes = 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 (!TryLoadImage(i, bytes, file.FullName, manifest, interfaceManager, out var image))
continue; continue;
Log.Verbose($"Plugin image{i + 1} for {manifest.InternalName} loaded from disk"); Log.Verbose($"Plugin image{i + 1} for {manifest.InternalName} loaded from disk");
pluginImages[i] = image; pluginImages[i] = image;
didAny = true; didAny = true;
} }
@ -1861,7 +1841,7 @@ namespace Dalamud.Interface.Internal.Windows
} }
var useTesting = pluginManager.UseTesting(manifest); var useTesting = pluginManager.UseTesting(manifest);
var urls = GetPluginImageUrls(manifest, isThirdParty, useTesting); var urls = this.GetPluginImageUrls(manifest, isThirdParty, useTesting);
if (urls != null) if (urls != null)
{ {
var didAny = false; var didAny = false;
@ -1880,14 +1860,12 @@ namespace Dalamud.Interface.Internal.Windows
data.EnsureSuccessStatusCode(); data.EnsureSuccessStatusCode();
var bytes = await data.Content.ReadAsByteArrayAsync(); var bytes = await data.Content.ReadAsByteArrayAsync();
if (!TryLoadImage(i, bytes, manifest, interfaceManager, out var image)) if (!TryLoadImage(i, bytes, url, manifest, interfaceManager, out var image))
continue;
if (!ValidateImage(image, url))
continue; continue;
Log.Verbose($"Plugin image{i + 1} for {manifest.InternalName} downloaded"); Log.Verbose($"Plugin image{i + 1} for {manifest.InternalName} downloaded");
pluginImages[i] = image; pluginImages[i] = image;
didAny = true; didAny = true;
} }