pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Convert exceptions for missing MediaSource or MediaAttachment to ResourceNotFoundException with appropriate message.

This commit is contained in:
Andrew Mahone 2019-11-04 14:34:21 -05:00
parent 154fb1fe9b
commit 04a96788f9
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
View File

@ -65,10 +65,26 @@ namespace MediaBrowser.MediaEncoding.Attachments
}
var mediaSources = await _mediaSourceManager.GetPlayackMediaSources(item, null, true, false, cancellationToken).ConfigureAwait(false);
var mediaSource = mediaSources
.First(i => string.Equals(i.Id, mediaSourceId, StringComparison.OrdinalIgnoreCase));
var mediaAttachment = mediaSource.MediaAttachments
.First(i => i.Index == attachmentStreamIndex);
MediaSourceInfo mediaSource;
MediaAttachment mediaAttachment;
try
{
mediaSource = mediaSources
.First(i => string.Equals(i.Id, mediaSourceId, StringComparison.OrdinalIgnoreCase));
}
catch (Exception ex) when (ex is ArgumentNullException || ex is InvalidOperationException)
{
throw new ResourceNotFoundException($"MediaSource {mediaSourceId} not found");
}
try
{
mediaAttachment = mediaSource.MediaAttachments
.First(i => i.Index == attachmentStreamIndex);
}
catch (Exception ex) when (ex is ArgumentNullException || ex is InvalidOperationException)
{
throw new ResourceNotFoundException($"MediaSource {mediaSourceId} has no attachment with stream index {attachmentStreamIndex}");
}
var attachmentStream = await GetAttachmentStream(mediaSource, mediaAttachment, cancellationToken)
.ConfigureAwait(false);