mirror of
https://github.com/jellyfin/jellyfin
synced 2024-09-06 08:04:44 +00:00
Renamed Guid property to Id
This commit is contained in:
parent
486148dd6b
commit
ce19f2be55
|
@ -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()
|
||||
};
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -48,7 +48,7 @@ namespace MediaBrowser.Common.Plugins
|
|||
var assemblyFilePath = assembly.Location;
|
||||
|
||||
var dataFolderPath = Path.Combine(ApplicationPaths.PluginsPath, Path.GetFileNameWithoutExtension(assemblyFilePath));
|
||||
if (!Directory.Exists(dataFolderPath))
|
||||
if (!Directory.Exists(dataFolderPath) && Version != null)
|
||||
{
|
||||
// Try again with the version number appended to the folder name.
|
||||
dataFolderPath = dataFolderPath + "_" + Version.ToString();
|
||||
|
@ -137,7 +137,20 @@ namespace MediaBrowser.Common.Plugins
|
|||
/// Gets the full path to the configuration file.
|
||||
/// </summary>
|
||||
/// <value>The configuration file path.</value>
|
||||
public string ConfigurationFilePath { get; }
|
||||
public string ConfigurationFilePath
|
||||
{
|
||||
get
|
||||
{
|
||||
var dataFolderPath = Path.Combine(ApplicationPaths.PluginsPath, Path.GetFileNameWithoutExtension(AssemblyFilePath));
|
||||
if (!Directory.Exists(dataFolderPath) && Version != null)
|
||||
{
|
||||
// Try again with the version number appended to the folder name.
|
||||
return dataFolderPath + "_" + Version.ToString();
|
||||
}
|
||||
|
||||
return dataFolderPath;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the plugin configuration.
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
#nullable enable
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Reflection;
|
||||
using MediaBrowser.Model.Plugins;
|
||||
|
||||
namespace MediaBrowser.Common.Plugins
|
||||
|
@ -32,7 +30,7 @@ namespace MediaBrowser.Common.Plugins
|
|||
/// <summary>
|
||||
/// Gets the plugin id.
|
||||
/// </summary>
|
||||
public Guid Id => Manifest.Guid;
|
||||
public Guid Id => Manifest.Id;
|
||||
|
||||
/// <summary>
|
||||
/// Gets the plugin name.
|
||||
|
@ -110,7 +108,7 @@ namespace MediaBrowser.Common.Plugins
|
|||
/// <returns>A <see cref="PluginInfo"/> instance containing the information.</returns>
|
||||
public PluginInfo GetPluginInfo()
|
||||
{
|
||||
var inst = Instance?.GetPluginInfo() ?? new PluginInfo(Manifest.Name, Version, Manifest.Description, Manifest.Guid, true);
|
||||
var inst = Instance?.GetPluginInfo() ?? new PluginInfo(Manifest.Name, Version, Manifest.Description, Manifest.Id, true);
|
||||
inst.Status = Manifest.Status;
|
||||
inst.HasImage = !string.IsNullOrEmpty(Manifest.ImageUrl);
|
||||
return inst;
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
#nullable enable
|
||||
using System;
|
||||
using System.Text.Json.Serialization;
|
||||
using MediaBrowser.Model.Plugins;
|
||||
|
||||
namespace MediaBrowser.Common.Plugins
|
||||
|
@ -27,9 +28,8 @@ namespace MediaBrowser.Common.Plugins
|
|||
/// <summary>
|
||||
/// Gets or sets the Global Unique Identifier for the plugin.
|
||||
/// </summary>
|
||||
#pragma warning disable CA1720 // Identifier contains type name
|
||||
public Guid Guid { get; set; }
|
||||
#pragma warning restore CA1720 // Identifier contains type name
|
||||
[JsonPropertyName("Guid")]
|
||||
public Guid Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the Name of the plugin.
|
||||
|
|
|
@ -1,20 +1,40 @@
|
|||
#nullable disable
|
||||
#pragma warning disable CS1591
|
||||
#nullable enable
|
||||
|
||||
namespace MediaBrowser.Model.Plugins
|
||||
{
|
||||
/// <summary>
|
||||
/// Defines the <see cref="PluginPageInfo" />.
|
||||
/// </summary>
|
||||
public class PluginPageInfo
|
||||
{
|
||||
public string Name { get; set; }
|
||||
/// <summary>
|
||||
/// Gets or sets the name.
|
||||
/// </summary>
|
||||
public string Name { get; set; } = string.Empty;
|
||||
|
||||
public string DisplayName { get; set; }
|
||||
/// <summary>
|
||||
/// Gets or sets the display name.
|
||||
/// </summary>
|
||||
public string? DisplayName { get; set; }
|
||||
|
||||
public string EmbeddedResourcePath { get; set; }
|
||||
/// <summary>
|
||||
/// Gets or sets the resource path.
|
||||
/// </summary>
|
||||
public string EmbeddedResourcePath { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets a value indicating whether this plugin should appear in the main menu.
|
||||
/// </summary>
|
||||
public bool EnableInMainMenu { get; set; }
|
||||
|
||||
public string MenuSection { get; set; }
|
||||
/// <summary>
|
||||
/// Gets or sets the menu section.
|
||||
/// </summary>
|
||||
public string? MenuSection { get; set; }
|
||||
|
||||
public string MenuIcon { get; set; }
|
||||
/// <summary>
|
||||
/// Gets or sets the menu icon.
|
||||
/// </summary>
|
||||
public string? MenuIcon { get; set; }
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
#nullable disable
|
||||
using System;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace MediaBrowser.Model.Updates
|
||||
{
|
||||
|
@ -9,10 +10,11 @@ namespace MediaBrowser.Model.Updates
|
|||
public class InstallationInfo
|
||||
{
|
||||
/// <summary>
|
||||
/// Gets or sets the guid.
|
||||
/// Gets or sets the Id.
|
||||
/// </summary>
|
||||
/// <value>The guid.</value>
|
||||
public Guid Guid { get; set; }
|
||||
/// <value>The Id.</value>
|
||||
[JsonPropertyName("Guid")]
|
||||
public Guid Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the name.
|
||||
|
|
|
@ -16,7 +16,7 @@ namespace MediaBrowser.Model.Updates
|
|||
public PackageInfo()
|
||||
{
|
||||
Versions = Array.Empty<VersionInfo>();
|
||||
Guid = string.Empty;
|
||||
Id = string.Empty;
|
||||
Category = string.Empty;
|
||||
Name = string.Empty;
|
||||
Overview = string.Empty;
|
||||
|
@ -65,9 +65,7 @@ namespace MediaBrowser.Model.Updates
|
|||
/// </summary>
|
||||
/// <value>The name.</value>
|
||||
[JsonPropertyName("guid")]
|
||||
#pragma warning disable CA1720 // Identifier contains type name
|
||||
public string Guid { get; set; }
|
||||
#pragma warning restore CA1720 // Identifier contains type name
|
||||
public string Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the versions.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#pragma warning disable CS1591
|
||||
#pragma warning disable CS1591
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#pragma warning disable CS1591
|
||||
#pragma warning disable CS1591
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#pragma warning disable CS1591
|
||||
#pragma warning disable CS1591
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
|
Loading…
Reference in a new issue