aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/VideosService.cs
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Api/VideosService.cs')
-rw-r--r--MediaBrowser.Api/VideosService.cs14
1 files changed, 4 insertions, 10 deletions
diff --git a/MediaBrowser.Api/VideosService.cs b/MediaBrowser.Api/VideosService.cs
index c6ec69c85..6cefda3a3 100644
--- a/MediaBrowser.Api/VideosService.cs
+++ b/MediaBrowser.Api/VideosService.cs
@@ -130,6 +130,7 @@ namespace MediaBrowser.Api
var items = request.Ids.Split(',')
.Select(i => new Guid(i))
.Select(i => _libraryManager.GetItemById(i))
+ .OfType<Video>()
.ToList();
if (items.Count < 2)
@@ -137,14 +138,7 @@ namespace MediaBrowser.Api
throw new ArgumentException("Please supply at least two videos to merge.");
}
- if (items.Any(i => !(i is Video)))
- {
- throw new ArgumentException("Only videos can be grouped together.");
- }
-
- var videos = items.Cast<Video>().ToList();
-
- var videosWithVersions = videos.Where(i => i.MediaSourceCount > 1)
+ var videosWithVersions = items.Where(i => i.MediaSourceCount > 1)
.ToList();
if (videosWithVersions.Count > 1)
@@ -156,7 +150,7 @@ namespace MediaBrowser.Api
if (primaryVersion == null)
{
- primaryVersion = videos.OrderBy(i =>
+ primaryVersion = items.OrderBy(i =>
{
if (i.Video3DFormat.HasValue)
{
@@ -179,7 +173,7 @@ namespace MediaBrowser.Api
}).First();
}
- foreach (var item in videos.Where(i => i.Id != primaryVersion.Id))
+ foreach (var item in items.Where(i => i.Id != primaryVersion.Id))
{
item.PrimaryVersionId = primaryVersion.Id;