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

GetDeviceOptions always returns an instance of DeviceOptions

This commit is contained in:
Patrick Barron 2021-06-27 16:42:26 -04:00
parent d3e02e918d
commit bbac9ff67e
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/Session/SessionManager.cs
View File

@ -535,7 +535,7 @@ namespace Emby.Server.Implementations.Session
} }
var deviceOptions = await _deviceManager.GetDeviceOptions(deviceId).ConfigureAwait(false); var deviceOptions = await _deviceManager.GetDeviceOptions(deviceId).ConfigureAwait(false);
if (string.IsNullOrEmpty(deviceOptions?.CustomName)) if (string.IsNullOrEmpty(deviceOptions.CustomName))
{ {
sessionInfo.DeviceName = deviceName; sessionInfo.DeviceName = deviceName;
} }

6
Jellyfin.Api/Controllers/DevicesController.cs
View File

@ -107,12 +107,6 @@ namespace Jellyfin.Api.Controllers
[FromQuery, Required] string id, [FromQuery, Required] string id,
[FromBody, Required] DeviceOptions deviceOptions) [FromBody, Required] DeviceOptions deviceOptions)
{ {
var existingDeviceOptions = await _deviceManager.GetDeviceOptions(id).ConfigureAwait(false);
if (existingDeviceOptions == null)
{
return NotFound();
}
await _deviceManager.UpdateDeviceOptions(id, deviceOptions).ConfigureAwait(false); await _deviceManager.UpdateDeviceOptions(id, deviceOptions).ConfigureAwait(false);
return NoContent(); return NoContent();
} }

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

@ -74,13 +74,15 @@ namespace Jellyfin.Server.Implementations.Devices
} }
/// <inheritdoc /> /// <inheritdoc />
public async Task<DeviceOptions?> GetDeviceOptions(string deviceId) public async Task<DeviceOptions> GetDeviceOptions(string deviceId)
{ {
await using var dbContext = _dbProvider.CreateContext(); await using var dbContext = _dbProvider.CreateContext();
return await dbContext.DeviceOptions var deviceOptions = await dbContext.DeviceOptions
.AsQueryable() .AsQueryable()
.FirstOrDefaultAsync(d => d.DeviceId == deviceId) .FirstOrDefaultAsync(d => d.DeviceId == deviceId)
.ConfigureAwait(false); .ConfigureAwait(false);
return deviceOptions ?? new DeviceOptions(deviceId);
} }
/// <inheritdoc /> /// <inheritdoc />