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

Merge branch 'fix_update'

Browse source
This commit is contained in:
goat 2021-07-15 15:22:28 +02:00
commit ea9ce0d776
No known key found for this signature in database
GPG key ID: F18F057873895461
1 changed files with 1 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -800,24 +800,15 @@ namespace Dalamud.Plugin.Internal
{ {
var updatablePlugins = new List<AvailablePluginUpdate>(); var updatablePlugins = new List<AvailablePluginUpdate>();
if (!this.ReposReady)
throw new Exception("Plugin updates can only be detected when repos are available.");
// Collect all outdated and current plugin manifests
var remoteManifests =
this.Repos.SelectMany(x => x.PluginMaster).Where(x => x.DalamudApiLevel <= DalamudApiLevel).ToList();
for (var i = 0; i < this.installedPlugins.Count; i++) for (var i = 0; i < this.installedPlugins.Count; i++)
{ {
var plugin = this.installedPlugins[i]; var plugin = this.installedPlugins[i];
Log.Debug($"Checking plugin updates for {plugin.Manifest.InternalName}");
var installedVersion = plugin.IsTesting var installedVersion = plugin.IsTesting
? plugin.Manifest.TestingAssemblyVersion ? plugin.Manifest.TestingAssemblyVersion
: plugin.Manifest.AssemblyVersion; : plugin.Manifest.AssemblyVersion;
var updates = remoteManifests var updates = this.availablePlugins
.Where(remoteManifest => plugin.Manifest.InternalName == remoteManifest.InternalName) .Where(remoteManifest => plugin.Manifest.InternalName == remoteManifest.InternalName)
.Select(remoteManifest => .Select(remoteManifest =>
{ {
@ -827,8 +818,6 @@ namespace Dalamud.Plugin.Internal
: remoteManifest.AssemblyVersion; : remoteManifest.AssemblyVersion;
var isUpdate = candidateVersion > installedVersion; var isUpdate = candidateVersion > installedVersion;
Log.Debug($" => {remoteManifest.InternalName} from {remoteManifest.SourceRepo.PluginMasterUrl} - candidate: {candidateVersion} installed: {installedVersion}");
return (isUpdate, useTesting, candidateVersion, remoteManifest); return (isUpdate, useTesting, candidateVersion, remoteManifest);
}) })
.Where(tpl => tpl.isUpdate) .Where(tpl => tpl.isUpdate)