mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 03:26:07 +02:00
added image processor error handling
This commit is contained in:
parent
9758adb8a5
commit
b07193e1bc
2 changed files with 9 additions and 5 deletions
|
@ -85,7 +85,7 @@ namespace MediaBrowser.Api.LiveTv
|
|||
{
|
||||
var result = GetChannelsAsync(request).Result;
|
||||
|
||||
return ToOptimizedResult(result);
|
||||
return ToOptimizedResult(result.ToList());
|
||||
}
|
||||
|
||||
private async Task<IEnumerable<ChannelInfoDto>> GetChannelsAsync(GetChannels request)
|
||||
|
@ -105,7 +105,7 @@ namespace MediaBrowser.Api.LiveTv
|
|||
{
|
||||
var result = GetRecordingsAsync(request).Result;
|
||||
|
||||
return ToOptimizedResult(result);
|
||||
return ToOptimizedResult(result.ToList());
|
||||
}
|
||||
|
||||
private async Task<IEnumerable<RecordingInfo>> GetRecordingsAsync(GetRecordings request)
|
||||
|
|
|
@ -53,7 +53,6 @@ namespace MediaBrowser.Server.Implementations.Drawing
|
|||
private readonly IJsonSerializer _jsonSerializer;
|
||||
private readonly IServerApplicationPaths _appPaths;
|
||||
|
||||
private readonly string _imageSizeCachePath;
|
||||
private readonly string _croppedWhitespaceImageCachePath;
|
||||
private readonly string _enhancedImageCachePath;
|
||||
private readonly string _resizedImageCachePath;
|
||||
|
@ -65,7 +64,6 @@ namespace MediaBrowser.Server.Implementations.Drawing
|
|||
_jsonSerializer = jsonSerializer;
|
||||
_appPaths = appPaths;
|
||||
|
||||
_imageSizeCachePath = Path.Combine(appPaths.ImageCachePath, "image-sizes");
|
||||
_croppedWhitespaceImageCachePath = Path.Combine(appPaths.ImageCachePath, "cropped-images");
|
||||
_enhancedImageCachePath = Path.Combine(appPaths.ImageCachePath, "enhanced-images");
|
||||
_resizedImageCachePath = Path.Combine(appPaths.ImageCachePath, "resized-images");
|
||||
|
@ -78,11 +76,17 @@ namespace MediaBrowser.Server.Implementations.Drawing
|
|||
{
|
||||
sizeDictionary = jsonSerializer.DeserializeFromFile<Dictionary<Guid, ImageSize>>(ImageSizeFile);
|
||||
}
|
||||
catch (IOException)
|
||||
catch (FileNotFoundException)
|
||||
{
|
||||
// No biggie
|
||||
sizeDictionary = new Dictionary<Guid, ImageSize>();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.ErrorException("Error parsing image size cache file", ex);
|
||||
|
||||
sizeDictionary = new Dictionary<Guid, ImageSize>();
|
||||
}
|
||||
|
||||
_cachedImagedSizes = new ConcurrentDictionary<Guid, ImageSize>(sizeDictionary);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue