aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Providers/Subtitles/SubtitleManager.cs')
-rw-r--r--MediaBrowser.Providers/Subtitles/SubtitleManager.cs40
1 files changed, 20 insertions, 20 deletions
diff --git a/MediaBrowser.Providers/Subtitles/SubtitleManager.cs b/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
index fce95364e..fe655759e 100644
--- a/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
+++ b/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
@@ -48,12 +48,12 @@ namespace MediaBrowser.Providers.Subtitles
_subtitleProviders = subtitleProviders.ToArray();
}
- public async Task<IEnumerable<RemoteSubtitleInfo>> SearchSubtitles(SubtitleSearchRequest request, CancellationToken cancellationToken)
+ public async Task<RemoteSubtitleInfo[]> SearchSubtitles(SubtitleSearchRequest request, CancellationToken cancellationToken)
{
var contentType = request.ContentType;
var providers = _subtitleProviders
.Where(i => i.SupportedMediaTypes.Contains(contentType))
- .ToList();
+ .ToArray();
// If not searching all, search one at a time until something is found
if (!request.SearchAllProviders)
@@ -64,9 +64,9 @@ namespace MediaBrowser.Providers.Subtitles
{
var searchResults = await provider.Search(request, cancellationToken).ConfigureAwait(false);
- var list = searchResults.ToList();
+ var list = searchResults.ToArray();
- if (list.Count > 0)
+ if (list.Length > 0)
{
Normalize(list);
return list;
@@ -77,7 +77,7 @@ namespace MediaBrowser.Providers.Subtitles
_logger.ErrorException("Error downloading subtitles from {0}", ex, provider.Name);
}
}
- return new List<RemoteSubtitleInfo>();
+ return new RemoteSubtitleInfo[] { };
}
var tasks = providers.Select(async i =>
@@ -86,20 +86,20 @@ namespace MediaBrowser.Providers.Subtitles
{
var searchResults = await i.Search(request, cancellationToken).ConfigureAwait(false);
- var list = searchResults.ToList();
+ var list = searchResults.ToArray();
Normalize(list);
return list;
}
catch (Exception ex)
{
_logger.ErrorException("Error downloading subtitles from {0}", ex, i.Name);
- return new List<RemoteSubtitleInfo>();
+ return new RemoteSubtitleInfo[] { };
}
});
var results = await Task.WhenAll(tasks).ConfigureAwait(false);
- return results.SelectMany(i => i);
+ return results.SelectMany(i => i).ToArray();
}
public async Task DownloadSubtitles(Video video,
@@ -173,12 +173,12 @@ namespace MediaBrowser.Providers.Subtitles
}
}
- public Task<IEnumerable<RemoteSubtitleInfo>> SearchSubtitles(Video video, string language, bool? isPerfectMatch, CancellationToken cancellationToken)
+ public Task<RemoteSubtitleInfo[]> SearchSubtitles(Video video, string language, bool? isPerfectMatch, CancellationToken cancellationToken)
{
if (video.LocationType != LocationType.FileSystem ||
video.VideoType != VideoType.VideoFile)
{
- return Task.FromResult<IEnumerable<RemoteSubtitleInfo>>(new List<RemoteSubtitleInfo>());
+ return Task.FromResult<RemoteSubtitleInfo[]>(new RemoteSubtitleInfo[] { });
}
VideoContentType mediaType;
@@ -194,7 +194,7 @@ namespace MediaBrowser.Providers.Subtitles
else
{
// These are the only supported types
- return Task.FromResult<IEnumerable<RemoteSubtitleInfo>>(new List<RemoteSubtitleInfo>());
+ return Task.FromResult<RemoteSubtitleInfo[]>(new RemoteSubtitleInfo[] { });
}
var request = new SubtitleSearchRequest
@@ -275,7 +275,7 @@ namespace MediaBrowser.Providers.Subtitles
return provider.GetSubtitles(id, cancellationToken);
}
- public IEnumerable<SubtitleProviderInfo> GetProviders(string itemId)
+ public SubtitleProviderInfo[] GetProviders(string itemId)
{
var video = _libraryManager.GetItemById(itemId) as Video;
VideoContentType mediaType;
@@ -291,17 +291,17 @@ namespace MediaBrowser.Providers.Subtitles
else
{
// These are the only supported types
- return new List<SubtitleProviderInfo>();
+ return new SubtitleProviderInfo[] { };
}
- var providers = _subtitleProviders
- .Where(i => i.SupportedMediaTypes.Contains(mediaType));
+ return _subtitleProviders
+ .Where(i => i.SupportedMediaTypes.Contains(mediaType))
+ .Select(i => new SubtitleProviderInfo
+ {
+ Name = i.Name,
+ Id = GetProviderId(i.Name)
- return providers.Select(i => new SubtitleProviderInfo
- {
- Name = i.Name,
- Id = GetProviderId(i.Name)
- });
+ }).ToArray();
}
}