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

Merge branch 'master' of https://github.com/goatcorp/Dalamud

Browse source
This commit is contained in:
goat 2021-07-15 23:30:44 +02:00
commit 85113e263f
No known key found for this signature in database
GPG key ID: F18F057873895461
3 changed files with 42 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -789,7 +789,7 @@ namespace Dalamud.Interface.Internal.Windows
{
this.installStatus = OperationStatus.InProgress;
Task.Run(() => this.dalamud.PluginManager.UpdateSinglePlugin(update, false))
Task.Run(() => this.dalamud.PluginManager.UpdateSinglePlugin(update, true, false))
.ContinueWith(task =>
{
// There is no need to set as Complete for an individual plugin installation

18
Dalamud/Interface/Internal/Windows/SettingsWindow.cs
View file

@ -45,6 +45,7 @@ namespace Dalamud.Interface.Internal.Windows
private bool doViewport;
private bool doGamepad;
private List<ThirdPartyRepoSettings> thirdRepoList;
private bool thirdRepoListChanged;
private bool printPluginsWelcomeMsg;
private bool autoUpdatePlugins;
@ -142,6 +143,7 @@ namespace Dalamud.Interface.Internal.Windows
/// <inheritdoc/>
public override void OnOpen()
{
this.thirdRepoListChanged = false;
}
/// <inheritdoc/>
@ -337,6 +339,7 @@ namespace Dalamud.Interface.Internal.Windows
if (toRemove != null)
{
this.thirdRepoList.Remove(toRemove);
this.thirdRepoListChanged = true;
}
ImGui.SetCursorPosX(ImGui.GetCursorPosX() + (ImGui.GetColumnWidth() / 2) - 8 - (ImGui.CalcTextSize(repoNumber.ToString()).X / 2));
@ -361,7 +364,7 @@ namespace Dalamud.Interface.Internal.Windows
Url = this.thirdRepoTempUrl,
IsEnabled = true,
});
this.thirdRepoListChanged = true;
this.thirdRepoTempUrl = string.Empty;
}
}
@ -384,6 +387,12 @@ namespace Dalamud.Interface.Internal.Windows
if (ImGui.Button(Loc.Localize("Save", "Save")))
{
this.Save();
if (this.thirdRepoListChanged)
{
this.dalamud.PluginManager.SetPluginReposFromConfig(true);
this.thirdRepoListChanged = false;
}
}
ImGui.SameLine();
@ -391,6 +400,13 @@ namespace Dalamud.Interface.Internal.Windows
if (ImGui.Button(Loc.Localize("SaveAndClose", "Save and Close")))
{
this.Save();
if (this.thirdRepoListChanged)
{
this.dalamud.PluginManager.SetPluginReposFromConfig(true);
this.thirdRepoListChanged = false;
}
this.IsOpen = false;
}
}

30
Dalamud/Plugin/Internal/PluginManager.cs
View file

@ -64,9 +64,7 @@ namespace Dalamud.Plugin.Internal
var bannedPluginsJson = File.ReadAllText(Path.Combine(this.dalamud.StartInfo.AssetDirectory, "UIRes", "bannedplugin.json"));
this.bannedPlugins = JsonConvert.DeserializeObject<BannedPlugin[]>(bannedPluginsJson);
this.Repos.Add(PluginRepository.MainRepo);
this.Repos.AddRange(this.dalamud.Configuration.ThirdRepoList
.Select(repo => new PluginRepository(repo.Url, repo.IsEnabled)));
this.SetPluginReposFromConfig(false);
this.ApplyPatches();
}
@ -99,7 +97,7 @@ namespace Dalamud.Plugin.Internal
/// <summary>
/// Gets a list of all plugin repositories. The main repo should always be first.
/// </summary>
public List<PluginRepository> Repos { get; } = new();
public List<PluginRepository> Repos { get; private set; } = new();
/// <summary>
/// Gets a value indicating whether plugins are not still loading from boot.
@ -137,6 +135,22 @@ namespace Dalamud.Plugin.Internal
}
}
/// <summary>
/// Set the list of repositories to use. Should be called when the Settings window has been updated or at instantiation.
/// </summary>
/// <param name="notify">Whether the available plugins changed should be evented after.</param>
public void SetPluginReposFromConfig(bool notify)
{
var repos = new List<PluginRepository>() { PluginRepository.MainRepo };
repos.AddRange(this.dalamud.Configuration.ThirdRepoList
.Select(repo => new PluginRepository(repo.Url, repo.IsEnabled)));
this.Repos = repos;
if (notify)
this.NotifyAvailablePluginsChanged();
}
/// <summary>
/// Load all plugins, sorted by priority. Any plugins with no explicit definition file or a negative priority
/// are loaded asynchronously. Should only be called during Dalamud startup.
@ -606,7 +620,7 @@ namespace Dalamud.Plugin.Internal
// Prevent collection was modified errors
for (var i = 0; i < this.updatablePlugins.Count; i++)
{
updatedList.Add(this.UpdateSinglePlugin(this.updatablePlugins[i], dryRun));
updatedList.Add(this.UpdateSinglePlugin(this.updatablePlugins[i], false, dryRun));
}
this.NotifyInstalledPluginsChanged();
@ -620,10 +634,11 @@ namespace Dalamud.Plugin.Internal
/// Update a single plugin, provided a valid <see cref="AvailablePluginUpdate"/>.
/// </summary>
/// <param name="metadata">The available plugin update.</param>
/// <param name="notify">Whether to notify that installed plugins have changed afterwards.</param>
/// <param name="dryRun">Whether or not to actually perform the update, or just indicate success.</param>
/// <returns>The status of the update.</returns>
[CanBeNull]
public PluginUpdateStatus UpdateSinglePlugin(AvailablePluginUpdate metadata, bool dryRun)
public PluginUpdateStatus UpdateSinglePlugin(AvailablePluginUpdate metadata, bool notify, bool dryRun)
{
var plugin = metadata.InstalledPlugin;
@ -685,6 +700,9 @@ namespace Dalamud.Plugin.Internal
}
}
if (notify && updateStatus.WasUpdated)
this.NotifyInstalledPluginsChanged();
return updateStatus;
}