alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 17:14:42 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Renamed Guid property to Id

Browse Source
This commit is contained in:
Greenback
2020-12-18 20:37:35 +00:00
parent 486148dd6b
commit ce19f2be55
11 changed files with 65 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Emby.Server.Implementations/Plugins/PluginManager.cs
View File

@@ -376,7 +376,7 @@ namespace Emby.Server.Implementations.Plugins
true,
new PluginManifest
{
Guid = instance.Id,
Id = instance.Id,
Status = PluginStatus.Active,
Name = instance.Name,
Version = instance.Version.ToString()
@@ -537,7 +537,7 @@ namespace Emby.Server.Implementations.Plugins
Status = PluginStatus.Restart,
Name = metafile,
AutoUpdate = false,
Guid = metafile.GetMD5(),
Id = metafile.GetMD5(),
TargetAbi = _appVersion.ToString(),
Version = version.ToString()
};

12
Emby.Server.Implementations/Updates/InstallationManager.cs
View File

@@ -178,7 +178,7 @@ namespace Emby.Server.Implementations.Updates
// Where repositories have the same content, the details from the first is taken.
foreach (var package in await GetPackages(repository.Name ?? "Unnamed Repo", repository.Url, true, cancellationToken).ConfigureAwait(true))
{
if (!Guid.TryParse(package.Guid, out var packageGuid))
if (!Guid.TryParse(package.Id, out var packageGuid))
{
// Package doesn't have a valid GUID, skip.
continue;
@@ -245,7 +245,7 @@ namespace Emby.Server.Implementations.Updates
if (guid != Guid.Empty)
{
availablePackages = availablePackages.Where(x => Guid.Parse(x.Guid) == guid);
availablePackages = availablePackages.Where(x => Guid.Parse(x.Id) == guid);
}
if (specificVersion != null)
@@ -290,7 +290,7 @@ namespace Emby.Server.Implementations.Updates
yield return new InstallationInfo
{
Changelog = v.Changelog,
Guid = new Guid(package.Guid),
Id = new Guid(package.Id),
Name = package.Name,
Version = v.VersionNumber,
SourceUrl = v.SourceUrl,
@@ -414,7 +414,7 @@ namespace Emby.Server.Implementations.Updates
{
lock (_currentInstallationsLock)
{
var install = _currentInstallations.Find(x => x.info.Guid == id);
var install = _currentInstallations.Find(x => x.info.Id == id);
if (install == default((InstallationInfo, CancellationTokenSource)))
{
return false;
@@ -512,7 +512,7 @@ namespace Emby.Server.Implementations.Updates
var compatibleVersions = GetCompatibleVersions(pluginCatalog, plugin.Name, plugin.Id, minVersion: plugin.Version);
var version = compatibleVersions.FirstOrDefault(y => y.Version > plugin.Version);
if (version != null && CompletedInstallations.All(x => x.Guid != version.Guid))
if (version != null && CompletedInstallations.All(x => x.Id != version.Id))
{
yield return version;
}
@@ -577,7 +577,7 @@ namespace Emby.Server.Implementations.Updates
private async Task<bool> InstallPackageInternal(InstallationInfo package, CancellationToken cancellationToken)
{
// Set last update time if we were installed before
LocalPlugin? plugin = _pluginManager.Plugins.FirstOrDefault(p => p.Id.Equals(package.Guid) && p.Version.Equals(package.Version))
LocalPlugin? plugin = _pluginManager.Plugins.FirstOrDefault(p => p.Id.Equals(package.Id) && p.Version.Equals(package.Version))
?? _pluginManager.Plugins.FirstOrDefault(p => p.Name.Equals(package.Name, StringComparison.OrdinalIgnoreCase) && p.Version.Equals(package.Version));
if (plugin != null)
{