mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-11-16 02:18:54 -07:00
Changed PluginId to guid so its the same type as plugin.id
This commit is contained in:
parent
eb2439f23b
commit
c197dca759
@ -1,3 +1,4 @@
|
||||
using System;
|
||||
using MediaBrowser.Common.Plugins;
|
||||
using MediaBrowser.Controller.Plugins;
|
||||
using MediaBrowser.Model.Plugins;
|
||||
@ -23,7 +24,7 @@ namespace Jellyfin.Api.Models
|
||||
{
|
||||
DisplayName = page.Plugin.Name;
|
||||
// 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;
|
||||
MenuIcon = page.MenuIcon;
|
||||
DisplayName = string.IsNullOrWhiteSpace(page.DisplayName) ? plugin?.Name : page.DisplayName;
|
||||
|
||||
// Don't use "N" because it needs to match Plugin.Id
|
||||
PluginId = plugin?.Id.ToString();
|
||||
PluginId = plugin?.Id;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@ -80,6 +79,6 @@ namespace Jellyfin.Api.Models
|
||||
/// Gets or sets the plugin id.
|
||||
/// </summary>
|
||||
/// <value>The plugin id.</value>
|
||||
public string? PluginId { get; set; }
|
||||
public Guid? PluginId { get; set; }
|
||||
}
|
||||
}
|
||||
|
@ -1,11 +1,12 @@
|
||||
#nullable enable
|
||||
|
||||
using System.Text.Json.Serialization;
|
||||
using SysVersion = System.Version;
|
||||
|
||||
namespace MediaBrowser.Model.Updates
|
||||
{
|
||||
/// <summary>
|
||||
/// Class PackageVersionInfo.
|
||||
/// Defines the <see cref="VersionInfo"/> class.
|
||||
/// </summary>
|
||||
public class VersionInfo
|
||||
{
|
||||
@ -15,6 +16,7 @@ namespace MediaBrowser.Model.Updates
|
||||
/// Gets or sets the version.
|
||||
/// </summary>
|
||||
/// <value>The version.</value>
|
||||
[JsonPropertyName("version")]
|
||||
public string Version
|
||||
{
|
||||
get => _version == null ? string.Empty : _version.ToString();
|
||||
@ -31,46 +33,54 @@ namespace MediaBrowser.Model.Updates
|
||||
/// Gets or sets the changelog for this version.
|
||||
/// </summary>
|
||||
/// <value>The changelog.</value>
|
||||
[JsonPropertyName("changelog")]
|
||||
public string? Changelog { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the ABI that this version was built against.
|
||||
/// </summary>
|
||||
/// <value>The target ABI version.</value>
|
||||
[JsonPropertyName("targetAbi")]
|
||||
public string? TargetAbi { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the maximum ABI that this version will work with.
|
||||
/// </summary>
|
||||
/// <value>The target ABI version.</value>
|
||||
[JsonPropertyName("maxAbi")]
|
||||
public string? MaxAbi { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the source URL.
|
||||
/// </summary>
|
||||
/// <value>The source URL.</value>
|
||||
[JsonPropertyName("sourceUrl")]
|
||||
public string? SourceUrl { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets a checksum for the binary.
|
||||
/// </summary>
|
||||
/// <value>The checksum.</value>
|
||||
[JsonPropertyName("checksum")]
|
||||
public string? Checksum { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets a timestamp of when the binary was built.
|
||||
/// </summary>
|
||||
/// <value>The timestamp.</value>
|
||||
[JsonPropertyName("timestamp")]
|
||||
public string? Timestamp { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the repository name.
|
||||
/// </summary>
|
||||
[JsonPropertyName("repositoryName")]
|
||||
public string RepositoryName { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the repository url.
|
||||
/// </summary>
|
||||
[JsonPropertyName("repositoryUrl")]
|
||||
public string RepositoryUrl { get; set; } = string.Empty;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user