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

Remove exception handler

Browse Source
This commit is contained in:
crobibero 2020-04-21 07:57:45 -06:00
parent 376619369d
commit 30609236ab
1 changed files with 18 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,14 +48,7 @@ namespace Jellyfin.Api.Controllers.Images
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
public IActionResult GetGeneralImages()
{
try
{
return Ok(GetImageList(_applicationPaths.GeneralPath, false));
}
catch (Exception e)
{
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
}
return Ok(GetImageList(_applicationPaths.GeneralPath, false));
}
/// <summary>
@ -70,28 +63,21 @@ namespace Jellyfin.Api.Controllers.Images
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
public IActionResult GetGeneralImage([FromRoute] string name, [FromRoute] string type)
{
try
var filename = string.Equals(type, "primary", StringComparison.OrdinalIgnoreCase)
? "folder"
: type;
var paths = BaseItem.SupportedImageExtensions
.Select(i => Path.Combine(_applicationPaths.GeneralPath, name, filename + i)).ToList();
var path = paths.FirstOrDefault(System.IO.File.Exists) ?? paths.FirstOrDefault();
if (path == null || !System.IO.File.Exists(path))
{
var filename = string.Equals(type, "primary", StringComparison.OrdinalIgnoreCase)
? "folder"
: type;
var paths = BaseItem.SupportedImageExtensions
.Select(i => Path.Combine(_applicationPaths.GeneralPath, name, filename + i)).ToList();
var path = paths.FirstOrDefault(System.IO.File.Exists) ?? paths.FirstOrDefault();
if (path == null || !System.IO.File.Exists(path))
{
return NotFound();
}
var contentType = MimeTypes.GetMimeType(path);
return new FileStreamResult(System.IO.File.OpenRead(path), contentType);
}
catch (Exception e)
{
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
return NotFound();
}
var contentType = MimeTypes.GetMimeType(path);
return new FileStreamResult(System.IO.File.OpenRead(path), contentType);
}
/// <summary>
@ -103,14 +89,7 @@ namespace Jellyfin.Api.Controllers.Images
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
public IActionResult GetRatingImages()
{
try
{
return Ok(GetImageList(_applicationPaths.RatingsPath, false));
}
catch (Exception e)
{
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
}
return Ok(GetImageList(_applicationPaths.RatingsPath, false));
}
/// <summary>
@ -127,14 +106,7 @@ namespace Jellyfin.Api.Controllers.Images
[FromRoute] string theme,
[FromRoute] string name)
{
try
{
return GetImageFile(_applicationPaths.RatingsPath, theme, name);
}
catch (Exception e)
{
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
}
return GetImageFile(_applicationPaths.RatingsPath, theme, name);
}
/// <summary>
@ -146,14 +118,7 @@ namespace Jellyfin.Api.Controllers.Images
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
public IActionResult GetMediaInfoImages()
{
try
{
return Ok(GetImageList(_applicationPaths.MediaInfoImagesPath, false));
}
catch (Exception e)
{
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
}
return Ok(GetImageList(_applicationPaths.MediaInfoImagesPath, false));
}
/// <summary>
@ -170,14 +135,7 @@ namespace Jellyfin.Api.Controllers.Images
[FromRoute] string theme,
[FromRoute] string name)
{
try
{
return GetImageFile(_applicationPaths.MediaInfoImagesPath, theme, name);
}
catch (Exception e)
{
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
}
return GetImageFile(_applicationPaths.MediaInfoImagesPath, theme, name);
}
/// <summary>