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

Allow devIcons to load images from the manifest

Browse source
This commit is contained in:
Raymond 2021-09-22 19:34:23 -04:00
parent 7f6f1d35d8
commit 949a6072ce
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -205,11 +205,11 @@ namespace Dalamud.Interface.Internal.Windows
return MainRepoImageUrl.Format(isTesting ? "testing" : "plugins", manifest.InternalName, "icon.png"); return MainRepoImageUrl.Format(isTesting ? "testing" : "plugins", manifest.InternalName, "icon.png");
} }
private static List<string?> GetPluginImageUrls(PluginManifest manifest, bool isThirdParty, bool isTesting) private static List<string?>? GetPluginImageUrls(PluginManifest manifest, bool isThirdParty, bool isTesting)
{ {
if (isThirdParty) if (isThirdParty)
{ {
if (manifest.ImageUrls.Count > 5) if (manifest.ImageUrls?.Count > 5)
{ {
Log.Warning($"Plugin {manifest.InternalName} has too many images"); Log.Warning($"Plugin {manifest.InternalName} has too many images");
return manifest.ImageUrls.Take(5).ToList(); return manifest.ImageUrls.Take(5).ToList();
@ -1802,7 +1802,9 @@ namespace Dalamud.Interface.Internal.Windows
Log.Verbose($"Plugin icon for {manifest.InternalName} loaded from disk"); Log.Verbose($"Plugin icon for {manifest.InternalName} loaded from disk");
} }
return; // 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);
@ -1885,8 +1887,9 @@ namespace Dalamud.Interface.Internal.Windows
} }
} }
// Dev plugins are loaded from disk only // Dev plugins are likely going to look like a main repo plugin, the InstalledFrom field is going to be null.
return; // 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);