pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10422 from scampower3/api-update 

Update /Device endpoint to return CustomName
This commit is contained in:
Bond-009 2023-12-18 21:06:30 +01:00 committed by GitHub
parent ce45b73c8b 98bc2fea8b
commit 21374775e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,21 +110,21 @@ namespace Jellyfin.Server.Implementations.Devices
/// <inheritdoc /> /// <inheritdoc />
public async Task<DeviceInfo?> GetDevice(string id) public async Task<DeviceInfo?> GetDevice(string id)
{ {
Device? device;
var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false); var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
await using (dbContext.ConfigureAwait(false)) await using (dbContext.ConfigureAwait(false))
{ {
device = await dbContext.Devices var device = await dbContext.Devices
.Where(d => d.DeviceId == id) .Where(d => d.DeviceId == id)
.OrderByDescending(d => d.DateLastActivity) .OrderByDescending(d => d.DateLastActivity)
.Include(d => d.User) .Include(d => d.User)
.SelectMany(d => dbContext.DeviceOptions.Where(o => o.DeviceId == d.DeviceId).DefaultIfEmpty(), (d, o) => new { Device = d, Options = o })
.FirstOrDefaultAsync() .FirstOrDefaultAsync()
.ConfigureAwait(false); .ConfigureAwait(false);
var deviceInfo = device is null ? null : ToDeviceInfo(device.Device, device.Options);
return deviceInfo;
} }
var deviceInfo = device is null ? null : ToDeviceInfo(device);
return deviceInfo;
} }
/// <inheritdoc /> /// <inheritdoc />
@ -172,15 +172,15 @@ namespace Jellyfin.Server.Implementations.Devices
var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false); var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
await using (dbContext.ConfigureAwait(false)) await using (dbContext.ConfigureAwait(false))
{ {
IAsyncEnumerable<Device> sessions = dbContext.Devices var sessions = dbContext.Devices
.Include(d => d.User) .Include(d => d.User)
.OrderByDescending(d => d.DateLastActivity) .OrderByDescending(d => d.DateLastActivity)
.ThenBy(d => d.DeviceId) .ThenBy(d => d.DeviceId)
.SelectMany(d => dbContext.DeviceOptions.Where(o => o.DeviceId == d.DeviceId).DefaultIfEmpty(), (d, o) => new { Device = d, Options = o })
.AsAsyncEnumerable(); .AsAsyncEnumerable();
if (supportsSync.HasValue) if (supportsSync.HasValue)
{ {
sessions = sessions.Where(i => GetCapabilities(i.DeviceId).SupportsSync == supportsSync.Value); sessions = sessions.Where(i => GetCapabilities(i.Device.DeviceId).SupportsSync == supportsSync.Value);
} }
if (userId.HasValue) if (userId.HasValue)
@ -191,10 +191,10 @@ namespace Jellyfin.Server.Implementations.Devices
throw new ResourceNotFoundException(); throw new ResourceNotFoundException();
} }
sessions = sessions.Where(i => CanAccessDevice(user, i.DeviceId)); sessions = sessions.Where(i => CanAccessDevice(user, i.Device.DeviceId));
} }
var array = await sessions.Select(device => ToDeviceInfo(device)).ToArrayAsync().ConfigureAwait(false); var array = await sessions.Select(device => ToDeviceInfo(device.Device, device.Options)).ToArrayAsync().ConfigureAwait(false);
return new QueryResult<DeviceInfo>(array); return new QueryResult<DeviceInfo>(array);
} }
@ -226,7 +226,7 @@ namespace Jellyfin.Server.Implementations.Devices
|| !GetCapabilities(deviceId).SupportsPersistentIdentifier; || !GetCapabilities(deviceId).SupportsPersistentIdentifier;
} }
private DeviceInfo ToDeviceInfo(Device authInfo) private DeviceInfo ToDeviceInfo(Device authInfo, DeviceOptions? options = null)
{ {
var caps = GetCapabilities(authInfo.DeviceId); var caps = GetCapabilities(authInfo.DeviceId);
@ -239,7 +239,8 @@ namespace Jellyfin.Server.Implementations.Devices
LastUserName = authInfo.User.Username, LastUserName = authInfo.User.Username,
Name = authInfo.DeviceName, Name = authInfo.DeviceName,
DateLastActivity = authInfo.DateLastActivity, DateLastActivity = authInfo.DateLastActivity,
IconUrl = caps.IconUrl IconUrl = caps.IconUrl,
CustomName = options?.CustomName,
}; };
} }
} }

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

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