Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up handling of missing source/attachment in AttachmentExtractor.

Browse Source
This commit is contained in:
Andrew Mahone 2019-11-06 09:46:31 -05:00
parent 79bbf09ecb
commit 4f3b883155
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,23 +66,15 @@ 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);
MediaSourceInfo mediaSource; var mediaSource = mediaSources
MediaAttachment mediaAttachment; .FirstOrDefault(i => string.Equals(i.Id, mediaSourceId, StringComparison.OrdinalIgnoreCase));
try if (mediaSource == null)
{
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"); throw new ResourceNotFoundException($"MediaSource {mediaSourceId} not found");
} }
try var mediaAttachment = mediaSource.MediaAttachments
{ .FirstOrDefault(i => i.Index == attachmentStreamIndex);
mediaAttachment = mediaSource.MediaAttachments if (mediaAttachment == null)
.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}"); throw new ResourceNotFoundException($"MediaSource {mediaSourceId} has no attachment with stream index {attachmentStreamIndex}");
} }