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

Merge pull request #557 from goatcorp/autoUpdate

Browse source 
AutoUpdate plugins when pluginManager is ready
This commit is contained in:
goaaats 2021-09-13 06:13:47 +02:00 • committed by GitHub
commit 3985d3eadd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

66
Dalamud/Game/ChatHandlers.cs
View file

@ -106,6 +106,7 @@ namespace Dalamud.Game
private readonly DalamudLinkPayload openInstallerWindowLink; private readonly DalamudLinkPayload openInstallerWindowLink;
private bool hasSeenLoadingMsg; private bool hasSeenLoadingMsg;
private bool hasAutoUpdatedPlugins;
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="ChatHandlers"/> class. /// Initializes a new instance of the <see cref="ChatHandlers"/> class.
@ -181,6 +182,9 @@ namespace Dalamud.Game
if (clientState.LocalPlayer != null && clientState.TerritoryType == 0 && !this.hasSeenLoadingMsg) if (clientState.LocalPlayer != null && clientState.TerritoryType == 0 && !this.hasSeenLoadingMsg)
this.PrintWelcomeMessage(); this.PrintWelcomeMessage();
if (!this.hasAutoUpdatedPlugins)
this.AutoUpdatePlugins();
#if !DEBUG && false #if !DEBUG && false
if (!this.hasSeenLoadingMsg) if (!this.hasSeenLoadingMsg)
return; return;
@ -231,7 +235,6 @@ namespace Dalamud.Game
var configuration = Service<DalamudConfiguration>.Get(); var configuration = Service<DalamudConfiguration>.Get();
var pluginManager = Service<PluginManager>.Get(); var pluginManager = Service<PluginManager>.Get();
var dalamudInterface = Service<DalamudInterface>.Get(); var dalamudInterface = Service<DalamudInterface>.Get();
var notifications = Service<NotificationManager>.Get();
var assemblyVersion = Assembly.GetAssembly(typeof(ChatHandlers)).GetName().Version.ToString(); var assemblyVersion = Assembly.GetAssembly(typeof(ChatHandlers)).GetName().Version.ToString();
@ -261,31 +264,47 @@ namespace Dalamud.Game
configuration.Save(); configuration.Save();
} }
Task.Run(() => pluginManager.UpdatePluginsAsync(!configuration.AutoUpdatePlugins)) this.hasSeenLoadingMsg = true;
.ContinueWith(t => }
private void AutoUpdatePlugins()
{
var chatGui = Service<ChatGui>.Get();
var configuration = Service<DalamudConfiguration>.Get();
var pluginManager = Service<PluginManager>.Get();
var notifications = Service<NotificationManager>.Get();
if (!pluginManager.ReposReady || pluginManager.InstalledPlugins.Count == 0 || pluginManager.AvailablePlugins.Count == 0)
{ {
if (t.IsFaulted) // Plugins aren't ready yet.
return;
}
this.hasAutoUpdatedPlugins = true;
Task.Run(() => pluginManager.UpdatePluginsAsync(!configuration.AutoUpdatePlugins)).ContinueWith(task =>
{
if (task.IsFaulted)
{ {
Log.Error(t.Exception, Loc.Localize("DalamudPluginUpdateCheckFail", "Could not check for plugin updates.")); Log.Error(task.Exception, Loc.Localize("DalamudPluginUpdateCheckFail", "Could not check for plugin updates."));
return;
} }
else
var updatedPlugins = task.Result;
if (updatedPlugins != null && updatedPlugins.Any())
{ {
var updatedPlugins = t.Result; if (configuration.AutoUpdatePlugins)
if (updatedPlugins != null && updatedPlugins.Any())
{ {
if (configuration.AutoUpdatePlugins) pluginManager.PrintUpdatedPlugins(updatedPlugins, Loc.Localize("DalamudPluginAutoUpdate", "Auto-update:"));
{ notifications.AddNotification(Loc.Localize("NotificationUpdatedPlugins", "{0} of your plugins were updated.").Format(updatedPlugins.Count), Loc.Localize("NotificationAutoUpdate", "Auto-Update"), NotificationType.Info);
pluginManager.PrintUpdatedPlugins(updatedPlugins, Loc.Localize("DalamudPluginAutoUpdate", "Auto-update:")); }
notifications.AddNotification(Loc.Localize("NotificationUpdatedPlugins", "{0} of your plugins were updated.").Format(updatedPlugins.Count), Loc.Localize("NotificationAutoUpdate", "Auto-Update"), NotificationType.Info); else
} {
else var data = Service<DataManager>.Get();
{
var data = Service<DataManager>.Get();
chatGui.PrintChat(new XivChatEntry chatGui.PrintChat(new XivChatEntry
{ {
Message = new SeString(new List<Payload>() Message = new SeString(new List<Payload>()
{ {
new TextPayload(Loc.Localize("DalamudPluginUpdateRequired", "One or more of your plugins needs to be updated. Please use the /xlplugins command in-game to update them!")), new TextPayload(Loc.Localize("DalamudPluginUpdateRequired", "One or more of your plugins needs to be updated. Please use the /xlplugins command in-game to update them!")),
new TextPayload(" ["), new TextPayload(" ["),
@ -296,14 +315,11 @@ namespace Dalamud.Game
new UIForegroundPayload(0), new UIForegroundPayload(0),
new TextPayload("]"), new TextPayload("]"),
}), }),
Type = XivChatType.Urgent, Type = XivChatType.Urgent,
}); });
}
} }
} }
}); });
this.hasSeenLoadingMsg = true;
} }
} }
} }