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 14:07:11 -06:00
parent 30609236ab
commit 02a78aaae9
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Jellyfin.Api/Controllers/Images/ImageByNameController.cs
View File

@ -44,9 +44,8 @@ namespace Jellyfin.Api.Controllers.Images
/// </summary> /// </summary>
/// <returns>General images.</returns> /// <returns>General images.</returns>
[HttpGet("General")] [HttpGet("General")]
[ProducesResponseType(typeof(ImageByNameInfo[]), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)] public ActionResult<ImageByNameInfo[]> GetGeneralImages()
public IActionResult GetGeneralImages()
{ {
return Ok(GetImageList(_applicationPaths.GeneralPath, false)); return Ok(GetImageList(_applicationPaths.GeneralPath, false));
} }
@ -58,10 +57,10 @@ namespace Jellyfin.Api.Controllers.Images
/// <param name="type">Image Type (primary, backdrop, logo, etc).</param> /// <param name="type">Image Type (primary, backdrop, logo, etc).</param>
/// <returns>Image Stream.</returns> /// <returns>Image Stream.</returns>
[HttpGet("General/{Name}/{Type}")] [HttpGet("General/{Name}/{Type}")]
[ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)] [Produces("application/octet-stream")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status404NotFound)] [ProducesResponseType(StatusCodes.Status404NotFound)]
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)] public ActionResult<FileStreamResult> GetGeneralImage([FromRoute] string name, [FromRoute] string type)
public IActionResult GetGeneralImage([FromRoute] string name, [FromRoute] string type)
{ {
var filename = string.Equals(type, "primary", StringComparison.OrdinalIgnoreCase) var filename = string.Equals(type, "primary", StringComparison.OrdinalIgnoreCase)
? "folder" ? "folder"
@ -85,9 +84,8 @@ namespace Jellyfin.Api.Controllers.Images
/// </summary> /// </summary>
/// <returns>General images.</returns> /// <returns>General images.</returns>
[HttpGet("Ratings")] [HttpGet("Ratings")]
[ProducesResponseType(typeof(ImageByNameInfo[]), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)] public ActionResult<ImageByNameInfo[]> GetRatingImages()
public IActionResult GetRatingImages()
{ {
return Ok(GetImageList(_applicationPaths.RatingsPath, false)); return Ok(GetImageList(_applicationPaths.RatingsPath, false));
} }
@ -99,10 +97,10 @@ namespace Jellyfin.Api.Controllers.Images
/// <param name="name">The name of the image.</param> /// <param name="name">The name of the image.</param>
/// <returns>Image Stream.</returns> /// <returns>Image Stream.</returns>
[HttpGet("Ratings/{Theme}/{Name}")] [HttpGet("Ratings/{Theme}/{Name}")]
[ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)] [Produces("application/octet-stream")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status404NotFound)] [ProducesResponseType(StatusCodes.Status404NotFound)]
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)] public ActionResult<FileStreamResult> GetRatingImage(
public IActionResult GetRatingImage(
[FromRoute] string theme, [FromRoute] string theme,
[FromRoute] string name) [FromRoute] string name)
{ {
@ -114,9 +112,8 @@ namespace Jellyfin.Api.Controllers.Images
/// </summary> /// </summary>
/// <returns>Media Info images.</returns> /// <returns>Media Info images.</returns>
[HttpGet("MediaInfo")] [HttpGet("MediaInfo")]
[ProducesResponseType(typeof(ImageByNameInfo[]), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)] public ActionResult<ImageByNameInfo[]> GetMediaInfoImages()
public IActionResult GetMediaInfoImages()
{ {
return Ok(GetImageList(_applicationPaths.MediaInfoImagesPath, false)); return Ok(GetImageList(_applicationPaths.MediaInfoImagesPath, false));
} }
@ -128,10 +125,10 @@ namespace Jellyfin.Api.Controllers.Images
/// <param name="name">The name of the image.</param> /// <param name="name">The name of the image.</param>
/// <returns>Image Stream.</returns> /// <returns>Image Stream.</returns>
[HttpGet("MediaInfo/{Theme}/{Name}")] [HttpGet("MediaInfo/{Theme}/{Name}")]
[ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)] [Produces("application/octet-stream")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status404NotFound)] [ProducesResponseType(StatusCodes.Status404NotFound)]
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)] public ActionResult<FileStreamResult> GetMediaInfoImage(
public IActionResult GetMediaInfoImage(
[FromRoute] string theme, [FromRoute] string theme,
[FromRoute] string name) [FromRoute] string name)
{ {
@ -145,7 +142,7 @@ namespace Jellyfin.Api.Controllers.Images
/// <param name="theme">Theme to search.</param> /// <param name="theme">Theme to search.</param>
/// <param name="name">File name to search for.</param> /// <param name="name">File name to search for.</param>
/// <returns>Image Stream.</returns> /// <returns>Image Stream.</returns>
private IActionResult GetImageFile(string basePath, string theme, string name) private ActionResult<FileStreamResult> GetImageFile(string basePath, string theme, string name)
{ {
var themeFolder = Path.Combine(basePath, theme); var themeFolder = Path.Combine(basePath, theme);
if (Directory.Exists(themeFolder)) if (Directory.Exists(themeFolder))