Changed PluginId to guid so its the same type as plugin.id

This commit is contained in:
Greenback 2020-12-15 18:27:31 +00:00
parent eb2439f23b
commit c197dca759
2 changed files with 15 additions and 6 deletions

View File

@ -1,3 +1,4 @@
using System;
using MediaBrowser.Common.Plugins; using MediaBrowser.Common.Plugins;
using MediaBrowser.Controller.Plugins; using MediaBrowser.Controller.Plugins;
using MediaBrowser.Model.Plugins; using MediaBrowser.Model.Plugins;
@ -23,7 +24,7 @@ namespace Jellyfin.Api.Models
{ {
DisplayName = page.Plugin.Name; DisplayName = page.Plugin.Name;
// Don't use "N" because it needs to match Plugin.Id // Don't use "N" because it needs to match Plugin.Id
PluginId = page.Plugin.Id.ToString(); PluginId = page.Plugin.Id;
} }
} }
@ -39,9 +40,7 @@ namespace Jellyfin.Api.Models
MenuSection = page.MenuSection; MenuSection = page.MenuSection;
MenuIcon = page.MenuIcon; MenuIcon = page.MenuIcon;
DisplayName = string.IsNullOrWhiteSpace(page.DisplayName) ? plugin?.Name : page.DisplayName; DisplayName = string.IsNullOrWhiteSpace(page.DisplayName) ? plugin?.Name : page.DisplayName;
PluginId = plugin?.Id;
// Don't use "N" because it needs to match Plugin.Id
PluginId = plugin?.Id.ToString();
} }
/// <summary> /// <summary>
@ -80,6 +79,6 @@ namespace Jellyfin.Api.Models
/// Gets or sets the plugin id. /// Gets or sets the plugin id.
/// </summary> /// </summary>
/// <value>The plugin id.</value> /// <value>The plugin id.</value>
public string? PluginId { get; set; } public Guid? PluginId { get; set; }
} }
} }

View File

@ -1,11 +1,12 @@
#nullable enable #nullable enable
using System.Text.Json.Serialization;
using SysVersion = System.Version; using SysVersion = System.Version;
namespace MediaBrowser.Model.Updates namespace MediaBrowser.Model.Updates
{ {
/// <summary> /// <summary>
/// Class PackageVersionInfo. /// Defines the <see cref="VersionInfo"/> class.
/// </summary> /// </summary>
public class VersionInfo public class VersionInfo
{ {
@ -15,6 +16,7 @@ namespace MediaBrowser.Model.Updates
/// Gets or sets the version. /// Gets or sets the version.
/// </summary> /// </summary>
/// <value>The version.</value> /// <value>The version.</value>
[JsonPropertyName("version")]
public string Version public string Version
{ {
get => _version == null ? string.Empty : _version.ToString(); get => _version == null ? string.Empty : _version.ToString();
@ -31,46 +33,54 @@ namespace MediaBrowser.Model.Updates
/// Gets or sets the changelog for this version. /// Gets or sets the changelog for this version.
/// </summary> /// </summary>
/// <value>The changelog.</value> /// <value>The changelog.</value>
[JsonPropertyName("changelog")]
public string? Changelog { get; set; } public string? Changelog { get; set; }
/// <summary> /// <summary>
/// Gets or sets the ABI that this version was built against. /// Gets or sets the ABI that this version was built against.
/// </summary> /// </summary>
/// <value>The target ABI version.</value> /// <value>The target ABI version.</value>
[JsonPropertyName("targetAbi")]
public string? TargetAbi { get; set; } public string? TargetAbi { get; set; }
/// <summary> /// <summary>
/// Gets or sets the maximum ABI that this version will work with. /// Gets or sets the maximum ABI that this version will work with.
/// </summary> /// </summary>
/// <value>The target ABI version.</value> /// <value>The target ABI version.</value>
[JsonPropertyName("maxAbi")]
public string? MaxAbi { get; set; } public string? MaxAbi { get; set; }
/// <summary> /// <summary>
/// Gets or sets the source URL. /// Gets or sets the source URL.
/// </summary> /// </summary>
/// <value>The source URL.</value> /// <value>The source URL.</value>
[JsonPropertyName("sourceUrl")]
public string? SourceUrl { get; set; } public string? SourceUrl { get; set; }
/// <summary> /// <summary>
/// Gets or sets a checksum for the binary. /// Gets or sets a checksum for the binary.
/// </summary> /// </summary>
/// <value>The checksum.</value> /// <value>The checksum.</value>
[JsonPropertyName("checksum")]
public string? Checksum { get; set; } public string? Checksum { get; set; }
/// <summary> /// <summary>
/// Gets or sets a timestamp of when the binary was built. /// Gets or sets a timestamp of when the binary was built.
/// </summary> /// </summary>
/// <value>The timestamp.</value> /// <value>The timestamp.</value>
[JsonPropertyName("timestamp")]
public string? Timestamp { get; set; } public string? Timestamp { get; set; }
/// <summary> /// <summary>
/// Gets or sets the repository name. /// Gets or sets the repository name.
/// </summary> /// </summary>
[JsonPropertyName("repositoryName")]
public string RepositoryName { get; set; } = string.Empty; public string RepositoryName { get; set; } = string.Empty;
/// <summary> /// <summary>
/// Gets or sets the repository url. /// Gets or sets the repository url.
/// </summary> /// </summary>
[JsonPropertyName("repositoryUrl")]
public string RepositoryUrl { get; set; } = string.Empty; public string RepositoryUrl { get; set; } = string.Empty;
} }
} }