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

fix: don't try to load changelogs for dev plugins, show changelogs that loaded if any failed

Browse source
This commit is contained in:
goat 2023-08-12 12:04:22 +02:00
parent bfbfe8c918
commit 593b338a26
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
3 changed files with 28 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Dalamud/Interface/Internal/TextureManager.cs
View file

@ -241,6 +241,7 @@ internal class TextureManager : IDisposable, IServiceType, ITextureSubstitutionP
if (!this.activeTextures.TryGetValue(path, out var info) || info == null) if (!this.activeTextures.TryGetValue(path, out var info) || info == null)
continue; continue;
info.Wrap?.Dispose();
info.Wrap = null; info.Wrap = null;
} }
} }

29
Dalamud/Interface/Internal/Windows/PluginInstaller/DalamudChangelogManager.cs
View file

@ -7,6 +7,7 @@ using System.Threading.Tasks;
using Dalamud.Networking.Http; using Dalamud.Networking.Http;
using Dalamud.Plugin.Internal; using Dalamud.Plugin.Internal;
using Dalamud.Utility; using Dalamud.Utility;
using Serilog;
namespace Dalamud.Interface.Internal.Windows.PluginInstaller; namespace Dalamud.Interface.Internal.Windows.PluginInstaller;
@ -44,27 +45,35 @@ internal class DalamudChangelogManager
this.Changelogs = null; this.Changelogs = null;
var dalamudChangelogs = await client.GetFromJsonAsync<List<DalamudChangelog>>(DalamudChangelogUrl); var dalamudChangelogs = await client.GetFromJsonAsync<List<DalamudChangelog>>(DalamudChangelogUrl);
var changelogs = dalamudChangelogs.Select(x => new DalamudChangelogEntry(x)).Cast<IChangelogEntry>(); var changelogs = dalamudChangelogs.Select(x => new DalamudChangelogEntry(x)).Cast<IChangelogEntry>().ToList();
foreach (var plugin in this.manager.InstalledPlugins) foreach (var plugin in this.manager.InstalledPlugins)
{ {
if (!plugin.IsThirdParty) if (!plugin.IsThirdParty && !plugin.IsDev)
{ {
var pluginChangelogs = await client.GetFromJsonAsync<PluginHistory>(string.Format( try
PluginChangelogUrl, {
plugin.Manifest.InternalName, var pluginChangelogs = await client.GetFromJsonAsync<PluginHistory>(string.Format(
plugin.Manifest.Dip17Channel)); PluginChangelogUrl,
plugin.Manifest.InternalName,
plugin.Manifest.Dip17Channel));
changelogs = changelogs.Concat(pluginChangelogs.Versions changelogs.AddRange(pluginChangelogs.Versions
.Where(x => x.Dip17Track == plugin.Manifest.Dip17Channel) .Where(x => x.Dip17Track ==
.Select(x => new PluginChangelogEntry(plugin, x))); plugin.Manifest.Dip17Channel)
.Select(x => new PluginChangelogEntry(plugin, x)));
}
catch (Exception ex)
{
Log.Error(ex, "Failed to load changelog for {PluginName}", plugin.Manifest.Name);
}
} }
else else
{ {
if (plugin.Manifest.Changelog.IsNullOrWhitespace()) if (plugin.Manifest.Changelog.IsNullOrWhitespace())
continue; continue;
changelogs = changelogs.Append(new PluginChangelogEntry(plugin)); changelogs.Add(new PluginChangelogEntry(plugin));
} }
} }

9
Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
View file

@ -967,7 +967,14 @@ internal class PluginInstallerWindow : Window, IDisposable
{ {
this.dalamudChangelogRefreshTaskCts = new CancellationTokenSource(); this.dalamudChangelogRefreshTaskCts = new CancellationTokenSource();
this.dalamudChangelogRefreshTask = this.dalamudChangelogRefreshTask =
Task.Run(this.dalamudChangelogManager.ReloadChangelogAsync, this.dalamudChangelogRefreshTaskCts.Token); Task.Run(this.dalamudChangelogManager.ReloadChangelogAsync, this.dalamudChangelogRefreshTaskCts.Token)
.ContinueWith(t =>
{
if (!t.IsCompletedSuccessfully)
{
Log.Error(t.Exception, "Failed to load changelogs.");
}
});
} }
return; return;