lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added image processor error handling

Browse Source
This commit is contained in:
Luke Pulverenti 2013-11-12 10:36:25 -05:00
parent 9758adb8a5
commit b07193e1bc
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Api/LiveTv/LiveTvService.cs
View File

@ -85,7 +85,7 @@ namespace MediaBrowser.Api.LiveTv
{ {
var result = GetChannelsAsync(request).Result; var result = GetChannelsAsync(request).Result;
return ToOptimizedResult(result); return ToOptimizedResult(result.ToList());
} }
private async Task<IEnumerable<ChannelInfoDto>> GetChannelsAsync(GetChannels request) private async Task<IEnumerable<ChannelInfoDto>> GetChannelsAsync(GetChannels request)
@ -105,7 +105,7 @@ namespace MediaBrowser.Api.LiveTv
{ {
var result = GetRecordingsAsync(request).Result; var result = GetRecordingsAsync(request).Result;
return ToOptimizedResult(result); return ToOptimizedResult(result.ToList());
} }
private async Task<IEnumerable<RecordingInfo>> GetRecordingsAsync(GetRecordings request) private async Task<IEnumerable<RecordingInfo>> GetRecordingsAsync(GetRecordings request)

10
MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs
View File

@ -53,7 +53,6 @@ namespace MediaBrowser.Server.Implementations.Drawing
private readonly IJsonSerializer _jsonSerializer; private readonly IJsonSerializer _jsonSerializer;
private readonly IServerApplicationPaths _appPaths; private readonly IServerApplicationPaths _appPaths;
private readonly string _imageSizeCachePath;
private readonly string _croppedWhitespaceImageCachePath; private readonly string _croppedWhitespaceImageCachePath;
private readonly string _enhancedImageCachePath; private readonly string _enhancedImageCachePath;
private readonly string _resizedImageCachePath; private readonly string _resizedImageCachePath;
@ -65,7 +64,6 @@ namespace MediaBrowser.Server.Implementations.Drawing
_jsonSerializer = jsonSerializer; _jsonSerializer = jsonSerializer;
_appPaths = appPaths; _appPaths = appPaths;
_imageSizeCachePath = Path.Combine(appPaths.ImageCachePath, "image-sizes");
_croppedWhitespaceImageCachePath = Path.Combine(appPaths.ImageCachePath, "cropped-images"); _croppedWhitespaceImageCachePath = Path.Combine(appPaths.ImageCachePath, "cropped-images");
_enhancedImageCachePath = Path.Combine(appPaths.ImageCachePath, "enhanced-images"); _enhancedImageCachePath = Path.Combine(appPaths.ImageCachePath, "enhanced-images");
_resizedImageCachePath = Path.Combine(appPaths.ImageCachePath, "resized-images"); _resizedImageCachePath = Path.Combine(appPaths.ImageCachePath, "resized-images");
@ -78,11 +76,17 @@ namespace MediaBrowser.Server.Implementations.Drawing
{ {
sizeDictionary = jsonSerializer.DeserializeFromFile<Dictionary<Guid, ImageSize>>(ImageSizeFile); sizeDictionary = jsonSerializer.DeserializeFromFile<Dictionary<Guid, ImageSize>>(ImageSizeFile);
} }
catch (IOException) catch (FileNotFoundException)
{ {
// No biggie // No biggie
sizeDictionary = new Dictionary<Guid, ImageSize>(); 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); _cachedImagedSizes = new ConcurrentDictionary<Guid, ImageSize>(sizeDictionary);
} }