mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 13:57:14 -04:00
Convert exceptions for missing MediaSource or MediaAttachment to ResourceNotFoundException with appropriate message.
This commit is contained in:
parent
154fb1fe9b
commit
04a96788f9
@ -65,10 +65,26 @@ namespace MediaBrowser.MediaEncoding.Attachments
|
|||||||
}
|
}
|
||||||
|
|
||||||
var mediaSources = await _mediaSourceManager.GetPlayackMediaSources(item, null, true, false, cancellationToken).ConfigureAwait(false);
|
var mediaSources = await _mediaSourceManager.GetPlayackMediaSources(item, null, true, false, cancellationToken).ConfigureAwait(false);
|
||||||
var mediaSource = mediaSources
|
MediaSourceInfo mediaSource;
|
||||||
.First(i => string.Equals(i.Id, mediaSourceId, StringComparison.OrdinalIgnoreCase));
|
MediaAttachment mediaAttachment;
|
||||||
var mediaAttachment = mediaSource.MediaAttachments
|
try
|
||||||
.First(i => i.Index == attachmentStreamIndex);
|
{
|
||||||
|
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)
|
var attachmentStream = await GetAttachmentStream(mediaSource, mediaAttachment, cancellationToken)
|
||||||
.ConfigureAwait(false);
|
.ConfigureAwait(false);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user