Skip to content

Commit

Permalink
https://www.dictionary.com/browse/supersede
Browse files Browse the repository at this point in the history
Latin root: sedere - to sit (compare: sedentary)

Consider: cede: to give up or yield; supercede; to super give up?
  • Loading branch information
systemcrash committed May 13, 2024
1 parent f20a9c9 commit 644301a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
18 changes: 9 additions & 9 deletions Emby.Server.Implementations/Plugins/PluginManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public IEnumerable<Assembly> LoadAssemblies()
// Now load the assemblies..
foreach (var plugin in _plugins)
{
UpdatePluginSuperceedStatus(plugin);
UpdatePluginSupersedeStatus(plugin);

if (plugin.IsEnabledAndSupported == false)
{
Expand Down Expand Up @@ -214,7 +214,7 @@ public void RegisterServices(IServiceCollection serviceCollection)
continue;
}

UpdatePluginSuperceedStatus(plugin);
UpdatePluginSupersedeStatus(plugin);
if (!plugin.IsEnabledAndSupported)
{
continue;
Expand Down Expand Up @@ -320,7 +320,7 @@ public void EnablePlugin(LocalPlugin plugin)

if (ChangePluginState(plugin, PluginStatus.Active))
{
// See if there is another version, and if so, supercede it.
// See if there is another version, and if so, supersede it.
ProcessAlternative(plugin);
}
}
Expand Down Expand Up @@ -624,9 +624,9 @@ private bool ChangePluginState(LocalPlugin plugin, PluginStatus state)
}
}

private void UpdatePluginSuperceedStatus(LocalPlugin plugin)
private void UpdatePluginSupersedeStatus(LocalPlugin plugin)
{
if (plugin.Manifest.Status != PluginStatus.Superceded)
if (plugin.Manifest.Status != PluginStatus.Superseded)
{
return;
}
Expand Down Expand Up @@ -879,7 +879,7 @@ private bool TryGetPluginDlls(LocalPlugin plugin, out IReadOnlyList<string> whit
}

/// <summary>
/// Changes the status of the other versions of the plugin to "Superceded".
/// Changes the status of the other versions of the plugin to "Superseded".
/// </summary>
/// <param name="plugin">The <see cref="LocalPlugin"/> that's master.</param>
private void ProcessAlternative(LocalPlugin plugin)
Expand All @@ -899,13 +899,13 @@ private void ProcessAlternative(LocalPlugin plugin)
return;
}

if (plugin.Manifest.Status == PluginStatus.Active && !ChangePluginState(previousVersion, PluginStatus.Superceded))
if (plugin.Manifest.Status == PluginStatus.Active && !ChangePluginState(previousVersion, PluginStatus.Superseded))
{
_logger.LogError("Unable to enable version {Version} of {Name}", previousVersion.Version, previousVersion.Name);
}
else if (plugin.Manifest.Status == PluginStatus.Superceded && !ChangePluginState(previousVersion, PluginStatus.Active))
else if (plugin.Manifest.Status == PluginStatus.Superseded && !ChangePluginState(previousVersion, PluginStatus.Active))
{
_logger.LogError("Unable to supercede version {Version} of {Name}", previousVersion.Version, previousVersion.Name);
_logger.LogError("Unable to supersede version {Version} of {Name}", previousVersion.Version, previousVersion.Name);
}

// This value is memory only - so that the web will show restart required.
Expand Down
4 changes: 2 additions & 2 deletions MediaBrowser.Model/Plugins/PluginStatus.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ public enum PluginStatus
Malfunctioned = -3,

/// <summary>
/// This plugin has been superceded by another version.
/// This plugin has been superseded by another version.
/// </summary>
Superceded = -4,
Superseded = -4,

/// <summary>
/// An attempt to remove this plugin from disk will happen at every restart.
Expand Down

0 comments on commit 644301a

Please sign in to comment.