michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update /Device endpoint to return CustomName

Browse Source
This commit is contained in:
LJQ 2023-10-17 17:25:41 +08:00
parent 6fce863146
commit 259fe4522c
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Jellyfin.Server.Implementations/Devices/DeviceManager.cs
View File

@ -177,7 +177,7 @@ namespace Jellyfin.Server.Implementations.Devices
.OrderByDescending(d => d.DateLastActivity)
.ThenBy(d => d.DeviceId)
.AsAsyncEnumerable();
IAsyncEnumerable<DeviceOptions> deviceOptions = dbContext.DeviceOptions.AsAsyncEnumerable();
if (supportsSync.HasValue)
{
sessions = sessions.Where(i => GetCapabilities(i.DeviceId).SupportsSync == supportsSync.Value);
@ -195,6 +195,14 @@ namespace Jellyfin.Server.Implementations.Devices
}
var array = await sessions.Select(device => ToDeviceInfo(device)).ToArrayAsync().ConfigureAwait(false);
await foreach (var deviceOption in deviceOptions)
{
var deviceInfo = array.FirstOrDefault(d => d.Id.Equals(deviceOption.DeviceId, StringComparison.OrdinalIgnoreCase));
if (deviceInfo != null)
{
deviceInfo.CustomName = deviceOption.CustomName;
}
}
return new QueryResult<DeviceInfo>(array);
}

2
MediaBrowser.Model/Devices/DeviceInfo.cs
View File

@ -15,6 +15,8 @@ namespace MediaBrowser.Model.Devices
public string Name { get; set; }
public string CustomName { get; set; }
/// <summary>
/// Gets or sets the access token.
/// </summary>