Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

move to ActionResult<T>

Browse Source
This commit is contained in:
crobibero 2020-04-21 13:59:43 -06:00
parent 5ef71d592b
commit 927696c403
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,9 +49,8 @@ namespace Jellyfin.Api.Controllers
/// <returns>Device Infos.</returns> /// <returns>Device Infos.</returns>
[HttpGet] [HttpGet]
[Authenticated(Roles = "Admin")] [Authenticated(Roles = "Admin")]
[ProducesResponseType(typeof(DeviceInfo[]), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)] public ActionResult<DeviceInfo[]> GetDevices([FromQuery] bool? supportsSync, [FromQuery] Guid? userId)
public IActionResult GetDevices([FromQuery] bool? supportsSync, [FromQuery] Guid? userId)
{ {
var deviceQuery = new DeviceQuery { SupportsSync = supportsSync, UserId = userId ?? Guid.Empty }; var deviceQuery = new DeviceQuery { SupportsSync = supportsSync, UserId = userId ?? Guid.Empty };
var devices = _deviceManager.GetDevices(deviceQuery); var devices = _deviceManager.GetDevices(deviceQuery);
@ -65,10 +64,9 @@ namespace Jellyfin.Api.Controllers
/// <returns>Device Info.</returns> /// <returns>Device Info.</returns>
[HttpGet("Info")] [HttpGet("Info")]
[Authenticated(Roles = "Admin")] [Authenticated(Roles = "Admin")]
[ProducesResponseType(typeof(DeviceInfo), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status404NotFound)] [ProducesResponseType(StatusCodes.Status404NotFound)]
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)] public ActionResult<DeviceInfo> GetDeviceInfo([FromQuery, BindRequired] string id)
public IActionResult GetDeviceInfo([FromQuery, BindRequired] string id)
{ {
var deviceInfo = _deviceManager.GetDevice(id); var deviceInfo = _deviceManager.GetDevice(id);
if (deviceInfo == null) if (deviceInfo == null)
@ -86,10 +84,9 @@ namespace Jellyfin.Api.Controllers
/// <returns>Device Info.</returns> /// <returns>Device Info.</returns>
[HttpGet("Options")] [HttpGet("Options")]
[Authenticated(Roles = "Admin")] [Authenticated(Roles = "Admin")]
[ProducesResponseType(typeof(DeviceOptions), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status404NotFound)] [ProducesResponseType(StatusCodes.Status404NotFound)]
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)] public ActionResult<DeviceInfo> GetDeviceOptions([FromQuery, BindRequired] string id)
public IActionResult GetDeviceOptions([FromQuery, BindRequired] string id)
{ {
var deviceInfo = _deviceManager.GetDeviceOptions(id); var deviceInfo = _deviceManager.GetDeviceOptions(id);
if (deviceInfo == null) if (deviceInfo == null)
@ -110,8 +107,7 @@ namespace Jellyfin.Api.Controllers
[Authenticated(Roles = "Admin")] [Authenticated(Roles = "Admin")]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status404NotFound)] [ProducesResponseType(StatusCodes.Status404NotFound)]
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)] public ActionResult UpdateDeviceOptions(
public IActionResult UpdateDeviceOptions(
[FromQuery, BindRequired] string id, [FromQuery, BindRequired] string id,
[FromBody, BindRequired] DeviceOptions deviceOptions) [FromBody, BindRequired] DeviceOptions deviceOptions)
{ {
@ -132,8 +128,7 @@ namespace Jellyfin.Api.Controllers
/// <returns>Status.</returns> /// <returns>Status.</returns>
[HttpDelete] [HttpDelete]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)] public ActionResult DeleteDevice([FromQuery, BindRequired] string id)
public IActionResult DeleteDevice([FromQuery, BindRequired] string id)
{ {
var sessions = _authenticationRepository.Get(new AuthenticationInfoQuery { DeviceId = id }).Items; var sessions = _authenticationRepository.Get(new AuthenticationInfoQuery { DeviceId = id }).Items;
@ -151,9 +146,8 @@ namespace Jellyfin.Api.Controllers
/// <param name="id">Device Id.</param> /// <param name="id">Device Id.</param>
/// <returns>Content Upload History.</returns> /// <returns>Content Upload History.</returns>
[HttpGet("CameraUploads")] [HttpGet("CameraUploads")]
[ProducesResponseType(typeof(ContentUploadHistory), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)] public ActionResult<ContentUploadHistory> GetCameraUploads([FromQuery, BindRequired] string id)
public IActionResult GetCameraUploads([FromQuery, BindRequired] string id)
{ {
var uploadHistory = _deviceManager.GetCameraUploadHistory(id); var uploadHistory = _deviceManager.GetCameraUploadHistory(id);
return Ok(uploadHistory); return Ok(uploadHistory);
@ -170,8 +164,7 @@ namespace Jellyfin.Api.Controllers
[HttpPost("CameraUploads")] [HttpPost("CameraUploads")]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)] [ProducesResponseType(StatusCodes.Status400BadRequest)]
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)] public async Task<ActionResult> PostCameraUploadAsync(
public async Task<IActionResult> PostCameraUploadAsync(
[FromQuery, BindRequired] string deviceId, [FromQuery, BindRequired] string deviceId,
[FromQuery, BindRequired] string album, [FromQuery, BindRequired] string album,
[FromQuery, BindRequired] string name, [FromQuery, BindRequired] string name,