mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-09 07:10:34 +02:00
Merge upstream/master
This commit is contained in:
commit
436d10bef9
|
@ -106,7 +106,10 @@ namespace MediaBrowser.Api.Movies
|
||||||
_userDataRepository,
|
_userDataRepository,
|
||||||
_dtoService,
|
_dtoService,
|
||||||
Logger,
|
Logger,
|
||||||
request, item => item is Movie || (item is Trailer && request.IncludeTrailers),
|
|
||||||
|
// Strip out secondary versions
|
||||||
|
request, item => (item is Movie || (item is Trailer && request.IncludeTrailers)) && !((Video)item).PrimaryVersionId.HasValue,
|
||||||
|
|
||||||
SimilarItemsHelper.GetSimiliarityScore);
|
SimilarItemsHelper.GetSimiliarityScore);
|
||||||
|
|
||||||
return ToOptimizedSerializedResultUsingCache(result);
|
return ToOptimizedSerializedResultUsingCache(result);
|
||||||
|
|
|
@ -66,7 +66,10 @@ namespace MediaBrowser.Api.Movies
|
||||||
_userDataRepository,
|
_userDataRepository,
|
||||||
_dtoService,
|
_dtoService,
|
||||||
Logger,
|
Logger,
|
||||||
request, item => item is Movie || item is Trailer,
|
|
||||||
|
// Strip out secondary versions
|
||||||
|
request, item => (item is Movie || item is Trailer) && !((Video)item).PrimaryVersionId.HasValue,
|
||||||
|
|
||||||
SimilarItemsHelper.GetSimiliarityScore);
|
SimilarItemsHelper.GetSimiliarityScore);
|
||||||
|
|
||||||
return ToOptimizedSerializedResultUsingCache(result);
|
return ToOptimizedSerializedResultUsingCache(result);
|
||||||
|
|
|
@ -532,6 +532,8 @@ namespace MediaBrowser.Api
|
||||||
|
|
||||||
var fields = request.GetItemFields().ToList();
|
var fields = request.GetItemFields().ToList();
|
||||||
|
|
||||||
|
episodes = _libraryManager.ReplaceVideosWithPrimaryVersions(episodes).Cast<Episode>();
|
||||||
|
|
||||||
var returnItems = episodes.Select(i => _dtoService.GetBaseItemDto(i, fields, user))
|
var returnItems = episodes.Select(i => _dtoService.GetBaseItemDto(i, fields, user))
|
||||||
.ToArray();
|
.ToArray();
|
||||||
|
|
||||||
|
|
|
@ -392,12 +392,16 @@ namespace MediaBrowser.Api.UserLibrary
|
||||||
items = user == null ?
|
items = user == null ?
|
||||||
((Folder)item).RecursiveChildren :
|
((Folder)item).RecursiveChildren :
|
||||||
((Folder)item).GetRecursiveChildren(user);
|
((Folder)item).GetRecursiveChildren(user);
|
||||||
|
|
||||||
|
items = _libraryManager.ReplaceVideosWithPrimaryVersions(items);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
items = user == null ?
|
items = user == null ?
|
||||||
((Folder)item).Children :
|
((Folder)item).Children :
|
||||||
((Folder)item).GetChildren(user, true);
|
((Folder)item).GetChildren(user, true);
|
||||||
|
|
||||||
|
items = _libraryManager.ReplaceVideosWithPrimaryVersions(items);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (request.IncludeIndexContainers)
|
if (request.IncludeIndexContainers)
|
||||||
|
|
|
@ -1,13 +1,18 @@
|
||||||
using System.Collections.Generic;
|
using MediaBrowser.Common.IO;
|
||||||
using System.Threading;
|
using MediaBrowser.Controller.Configuration;
|
||||||
using System.Threading.Tasks;
|
|
||||||
using MediaBrowser.Controller.Dto;
|
using MediaBrowser.Controller.Dto;
|
||||||
using MediaBrowser.Controller.Entities;
|
using MediaBrowser.Controller.Entities;
|
||||||
using MediaBrowser.Controller.Library;
|
using MediaBrowser.Controller.Library;
|
||||||
|
using MediaBrowser.Controller.Persistence;
|
||||||
|
using MediaBrowser.Model.Dto;
|
||||||
|
using MediaBrowser.Model.Entities;
|
||||||
using MediaBrowser.Model.Querying;
|
using MediaBrowser.Model.Querying;
|
||||||
using ServiceStack;
|
using ServiceStack;
|
||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace MediaBrowser.Api
|
namespace MediaBrowser.Api
|
||||||
{
|
{
|
||||||
|
@ -26,28 +31,10 @@ namespace MediaBrowser.Api
|
||||||
public string Id { get; set; }
|
public string Id { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
[Route("/Videos/{Id}/AlternateVersions", "GET")]
|
[Route("/Videos/{Id}/Versions", "GET")]
|
||||||
[Api(Description = "Gets alternate versions of a video.")]
|
[Api(Description = "Gets all versions of a video.")]
|
||||||
public class GetAlternateVersions : IReturn<ItemsResult>
|
public class GetMediaVersions : IReturn<List<MediaVersionInfo>>
|
||||||
{
|
{
|
||||||
[ApiMember(Name = "UserId", Description = "Optional. Filter by user id, and attach user data", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
|
|
||||||
public Guid? UserId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the id.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The id.</value>
|
|
||||||
[ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
|
|
||||||
public string Id { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
[Route("/Videos/{Id}/AlternateVersions", "POST")]
|
|
||||||
[Api(Description = "Assigns videos as alternates of antoher.")]
|
|
||||||
public class PostAlternateVersions : IReturnVoid
|
|
||||||
{
|
|
||||||
[ApiMember(Name = "AlternateVersionIds", Description = "Item id, comma delimited", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
|
|
||||||
public string AlternateVersionIds { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the id.
|
/// Gets or sets the id.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -60,18 +47,16 @@ namespace MediaBrowser.Api
|
||||||
[Api(Description = "Assigns videos as alternates of antoher.")]
|
[Api(Description = "Assigns videos as alternates of antoher.")]
|
||||||
public class DeleteAlternateVersions : IReturnVoid
|
public class DeleteAlternateVersions : IReturnVoid
|
||||||
{
|
{
|
||||||
[ApiMember(Name = "AlternateVersionIds", Description = "Item id, comma delimited", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "DELETE")]
|
[ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "DELETE")]
|
||||||
public string AlternateVersionIds { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the id.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The id.</value>
|
|
||||||
[ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
|
|
||||||
public string Id { get; set; }
|
public string Id { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
[ApiMember(Name = "IsAlternateEncoding", Description = "Filter by versions that are considered alternate encodings of the original.", IsRequired = true, DataType = "bool", ParameterType = "path", Verb = "GET")]
|
[Route("/Videos/MergeVersions", "POST")]
|
||||||
public bool? IsAlternateEncoding { get; set; }
|
[Api(Description = "Merges videos into a single record")]
|
||||||
|
public class MergeVersions : IReturnVoid
|
||||||
|
{
|
||||||
|
[ApiMember(Name = "Ids", Description = "Item id list. This allows multiple, comma delimited.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST", AllowMultiple = true)]
|
||||||
|
public string Ids { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class VideosService : BaseApiService
|
public class VideosService : BaseApiService
|
||||||
|
@ -79,12 +64,18 @@ namespace MediaBrowser.Api
|
||||||
private readonly ILibraryManager _libraryManager;
|
private readonly ILibraryManager _libraryManager;
|
||||||
private readonly IUserManager _userManager;
|
private readonly IUserManager _userManager;
|
||||||
private readonly IDtoService _dtoService;
|
private readonly IDtoService _dtoService;
|
||||||
|
private readonly IFileSystem _fileSystem;
|
||||||
|
private readonly IItemRepository _itemRepo;
|
||||||
|
private readonly IServerConfigurationManager _config;
|
||||||
|
|
||||||
public VideosService(ILibraryManager libraryManager, IUserManager userManager, IDtoService dtoService)
|
public VideosService(ILibraryManager libraryManager, IUserManager userManager, IDtoService dtoService, IItemRepository itemRepo, IFileSystem fileSystem, IServerConfigurationManager config)
|
||||||
{
|
{
|
||||||
_libraryManager = libraryManager;
|
_libraryManager = libraryManager;
|
||||||
_userManager = userManager;
|
_userManager = userManager;
|
||||||
_dtoService = dtoService;
|
_dtoService = dtoService;
|
||||||
|
_itemRepo = itemRepo;
|
||||||
|
_fileSystem = fileSystem;
|
||||||
|
_config = config;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -122,41 +113,163 @@ namespace MediaBrowser.Api
|
||||||
return ToOptimizedSerializedResultUsingCache(result);
|
return ToOptimizedSerializedResultUsingCache(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
public object Get(GetAlternateVersions request)
|
public object Get(GetMediaVersions request)
|
||||||
{
|
{
|
||||||
var user = request.UserId.HasValue ? _userManager.GetUserById(request.UserId.Value) : null;
|
var item = _libraryManager.GetItemById(new Guid(request.Id));
|
||||||
|
|
||||||
var item = string.IsNullOrEmpty(request.Id)
|
|
||||||
? (request.UserId.HasValue
|
|
||||||
? user.RootFolder
|
|
||||||
: _libraryManager.RootFolder)
|
|
||||||
: _dtoService.GetItemByDtoId(request.Id, request.UserId);
|
|
||||||
|
|
||||||
// Get everything
|
|
||||||
var fields = Enum.GetNames(typeof(ItemFields))
|
|
||||||
.Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true))
|
|
||||||
.ToList();
|
|
||||||
|
|
||||||
var video = (Video)item;
|
var video = (Video)item;
|
||||||
|
|
||||||
var items = video.GetAlternateVersions()
|
var result = video.GetAlternateVersions().Select(GetVersionInfo).ToList();
|
||||||
.Select(i => _dtoService.GetBaseItemDto(i, fields, user, video))
|
|
||||||
.ToArray();
|
|
||||||
|
|
||||||
var result = new ItemsResult
|
result.Add(GetVersionInfo(video));
|
||||||
|
|
||||||
|
result = result.OrderBy(i =>
|
||||||
{
|
{
|
||||||
Items = items,
|
if (video.VideoType == VideoType.VideoFile)
|
||||||
TotalRecordCount = items.Length
|
{
|
||||||
};
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
}).ThenBy(i => i.Video3DFormat.HasValue ? 1 : 0)
|
||||||
|
.ThenByDescending(i =>
|
||||||
|
{
|
||||||
|
var stream = i.MediaStreams.FirstOrDefault(m => m.Type == MediaStreamType.Video);
|
||||||
|
|
||||||
|
return stream == null || stream.Width == null ? 0 : stream.Width.Value;
|
||||||
|
})
|
||||||
|
.ToList();
|
||||||
|
|
||||||
return ToOptimizedSerializedResultUsingCache(result);
|
return ToOptimizedSerializedResultUsingCache(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Post(PostAlternateVersions request)
|
private MediaVersionInfo GetVersionInfo(Video i)
|
||||||
{
|
{
|
||||||
var task = AddAlternateVersions(request);
|
return new MediaVersionInfo
|
||||||
|
{
|
||||||
|
Chapters = _itemRepo.GetChapters(i.Id).Select(c => _dtoService.GetChapterInfoDto(c, i)).ToList(),
|
||||||
|
|
||||||
Task.WaitAll(task);
|
Id = i.Id.ToString("N"),
|
||||||
|
IsoType = i.IsoType,
|
||||||
|
LocationType = i.LocationType,
|
||||||
|
MediaStreams = _itemRepo.GetMediaStreams(new MediaStreamQuery {ItemId = i.Id}).ToList(),
|
||||||
|
Name = GetAlternateVersionName(i),
|
||||||
|
Path = GetMappedPath(i),
|
||||||
|
RunTimeTicks = i.RunTimeTicks,
|
||||||
|
Video3DFormat = i.Video3DFormat,
|
||||||
|
VideoType = i.VideoType,
|
||||||
|
IsHD = i.IsHD
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private string GetMappedPath(Video video)
|
||||||
|
{
|
||||||
|
var path = video.Path;
|
||||||
|
|
||||||
|
var locationType = video.LocationType;
|
||||||
|
|
||||||
|
if (locationType != LocationType.FileSystem && locationType != LocationType.Offline)
|
||||||
|
{
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var map in _config.Configuration.PathSubstitutions)
|
||||||
|
{
|
||||||
|
path = _fileSystem.SubstitutePath(path, map.From, map.To);
|
||||||
|
}
|
||||||
|
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
|
private string GetAlternateVersionName(Video video)
|
||||||
|
{
|
||||||
|
var name = "";
|
||||||
|
|
||||||
|
var stream = video.GetDefaultVideoStream();
|
||||||
|
|
||||||
|
if (video.Video3DFormat.HasValue)
|
||||||
|
{
|
||||||
|
name = "3D " + name;
|
||||||
|
name = name.Trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (video.VideoType == VideoType.BluRay)
|
||||||
|
{
|
||||||
|
name = name + " " + "Bluray";
|
||||||
|
name = name.Trim();
|
||||||
|
}
|
||||||
|
else if (video.VideoType == VideoType.Dvd)
|
||||||
|
{
|
||||||
|
name = name + " " + "DVD";
|
||||||
|
name = name.Trim();
|
||||||
|
}
|
||||||
|
else if (video.VideoType == VideoType.HdDvd)
|
||||||
|
{
|
||||||
|
name = name + " " + "HD-DVD";
|
||||||
|
name = name.Trim();
|
||||||
|
}
|
||||||
|
else if (video.VideoType == VideoType.Iso)
|
||||||
|
{
|
||||||
|
if (video.IsoType.HasValue)
|
||||||
|
{
|
||||||
|
if (video.IsoType.Value == IsoType.BluRay)
|
||||||
|
{
|
||||||
|
name = name + " " + "Bluray";
|
||||||
|
}
|
||||||
|
else if (video.IsoType.Value == IsoType.Dvd)
|
||||||
|
{
|
||||||
|
name = name + " " + "DVD";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
name = name + " " + "ISO";
|
||||||
|
}
|
||||||
|
name = name.Trim();
|
||||||
|
}
|
||||||
|
else if (video.VideoType == VideoType.VideoFile)
|
||||||
|
{
|
||||||
|
if (stream != null)
|
||||||
|
{
|
||||||
|
if (stream.Width.HasValue)
|
||||||
|
{
|
||||||
|
if (stream.Width.Value >= 1900)
|
||||||
|
{
|
||||||
|
name = name + " " + "1080P";
|
||||||
|
name = name.Trim();
|
||||||
|
}
|
||||||
|
else if (stream.Width.Value >= 1270)
|
||||||
|
{
|
||||||
|
name = name + " " + "720P";
|
||||||
|
name = name.Trim();
|
||||||
|
}
|
||||||
|
else if (stream.Width.Value >= 700)
|
||||||
|
{
|
||||||
|
name = name + " " + "480p";
|
||||||
|
name = name.Trim();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
name = name + " " + "SD";
|
||||||
|
name = name.Trim();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (stream != null && !string.IsNullOrWhiteSpace(stream.Codec))
|
||||||
|
{
|
||||||
|
name = name + " " + stream.Codec.ToUpper();
|
||||||
|
name = name.Trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (string.IsNullOrWhiteSpace(name))
|
||||||
|
{
|
||||||
|
return video.Name;
|
||||||
|
}
|
||||||
|
|
||||||
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Delete(DeleteAlternateVersions request)
|
public void Delete(DeleteAlternateVersions request)
|
||||||
|
@ -166,46 +279,83 @@ namespace MediaBrowser.Api
|
||||||
Task.WaitAll(task);
|
Task.WaitAll(task);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task AddAlternateVersions(PostAlternateVersions request)
|
|
||||||
{
|
|
||||||
var video = (Video)_dtoService.GetItemByDtoId(request.Id);
|
|
||||||
|
|
||||||
var list = new List<LinkedChild>();
|
|
||||||
var currentAlternateVersions = video.GetAlternateVersions().ToList();
|
|
||||||
|
|
||||||
foreach (var itemId in request.AlternateVersionIds.Split(',').Select(i => new Guid(i)))
|
|
||||||
{
|
|
||||||
var item = _libraryManager.GetItemById(itemId) as Video;
|
|
||||||
|
|
||||||
if (item == null)
|
|
||||||
{
|
|
||||||
throw new ArgumentException("No item exists with the supplied Id");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (currentAlternateVersions.Any(i => i.Id == itemId))
|
|
||||||
{
|
|
||||||
throw new ArgumentException("Item already exists.");
|
|
||||||
}
|
|
||||||
|
|
||||||
list.Add(new LinkedChild
|
|
||||||
{
|
|
||||||
Path = item.Path,
|
|
||||||
Type = LinkedChildType.Manual
|
|
||||||
});
|
|
||||||
|
|
||||||
item.PrimaryVersionId = video.Id;
|
|
||||||
}
|
|
||||||
|
|
||||||
video.LinkedAlternateVersions.AddRange(list);
|
|
||||||
|
|
||||||
await video.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
|
|
||||||
|
|
||||||
await video.RefreshMetadata(CancellationToken.None).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task RemoveAlternateVersions(DeleteAlternateVersions request)
|
private async Task RemoveAlternateVersions(DeleteAlternateVersions request)
|
||||||
{
|
{
|
||||||
var video = (Video)_dtoService.GetItemByDtoId(request.Id);
|
var video = (Video)_dtoService.GetItemByDtoId(request.Id);
|
||||||
|
|
||||||
|
foreach (var link in video.GetLinkedAlternateVersions())
|
||||||
|
{
|
||||||
|
link.PrimaryVersionId = null;
|
||||||
|
|
||||||
|
await link.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
video.LinkedAlternateVersions.Clear();
|
||||||
|
await video.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Post(MergeVersions request)
|
||||||
|
{
|
||||||
|
var task = MergeVersions(request);
|
||||||
|
|
||||||
|
Task.WaitAll(task);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task MergeVersions(MergeVersions request)
|
||||||
|
{
|
||||||
|
var items = request.Ids.Split(',')
|
||||||
|
.Select(i => new Guid(i))
|
||||||
|
.Select(i => _libraryManager.GetItemById(i))
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
if (items.Count < 2)
|
||||||
|
{
|
||||||
|
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.AlternateVersionCount > 0)
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
if (videosWithVersions.Count > 1)
|
||||||
|
{
|
||||||
|
throw new ArgumentException("Videos with sub-versions cannot be merged.");
|
||||||
|
}
|
||||||
|
|
||||||
|
var primaryVersion = videosWithVersions.FirstOrDefault();
|
||||||
|
|
||||||
|
if (primaryVersion == null)
|
||||||
|
{
|
||||||
|
primaryVersion = videos.OrderByDescending(i =>
|
||||||
|
{
|
||||||
|
var stream = i.GetDefaultVideoStream();
|
||||||
|
|
||||||
|
return stream == null || stream.Width == null ? 0 : stream.Width.Value;
|
||||||
|
|
||||||
|
}).ThenBy(i => i.Name.Length)
|
||||||
|
.First();
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var item in videos.Where(i => i.Id != primaryVersion.Id))
|
||||||
|
{
|
||||||
|
item.PrimaryVersionId = primaryVersion.Id;
|
||||||
|
|
||||||
|
await item.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
|
||||||
|
|
||||||
|
primaryVersion.LinkedAlternateVersions.Add(new LinkedChild
|
||||||
|
{
|
||||||
|
Path = item.Path,
|
||||||
|
ItemId = item.Id
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
await primaryVersion.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
namespace MediaBrowser.Controller.Channels
|
namespace MediaBrowser.Controller.Channels
|
||||||
{
|
{
|
||||||
public class ChannelAudioItem : Audio, IChannelItem
|
public class ChannelAudioItem : Audio, IChannelMediaItem
|
||||||
{
|
{
|
||||||
public string ExternalId { get; set; }
|
public string ExternalId { get; set; }
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,12 @@
|
||||||
|
|
||||||
namespace MediaBrowser.Controller.Channels
|
namespace MediaBrowser.Controller.Channels
|
||||||
{
|
{
|
||||||
public class ChannelCategoryItem : Folder
|
public class ChannelCategoryItem : Folder, IChannelItem
|
||||||
{
|
{
|
||||||
|
public string ExternalId { get; set; }
|
||||||
|
|
||||||
|
public ChannelItemType ChannelItemType { get; set; }
|
||||||
|
|
||||||
|
public string OriginalImageUrl { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
namespace MediaBrowser.Controller.Channels
|
namespace MediaBrowser.Controller.Channels
|
||||||
{
|
{
|
||||||
public class ChannelVideoItem : Video, IChannelItem
|
public class ChannelVideoItem : Video, IChannelMediaItem
|
||||||
{
|
{
|
||||||
public string ExternalId { get; set; }
|
public string ExternalId { get; set; }
|
||||||
|
|
||||||
|
|
|
@ -8,10 +8,13 @@ namespace MediaBrowser.Controller.Channels
|
||||||
|
|
||||||
ChannelItemType ChannelItemType { get; set; }
|
ChannelItemType ChannelItemType { get; set; }
|
||||||
|
|
||||||
|
string OriginalImageUrl { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public interface IChannelMediaItem : IChannelItem
|
||||||
|
{
|
||||||
bool IsInfiniteStream { get; set; }
|
bool IsInfiniteStream { get; set; }
|
||||||
|
|
||||||
ChannelMediaContentType ContentType { get; set; }
|
ChannelMediaContentType ContentType { get; set; }
|
||||||
|
|
||||||
string OriginalImageUrl { get; set; }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -84,6 +84,14 @@ namespace MediaBrowser.Controller.Dto
|
||||||
BaseItemDto GetItemByNameDto<T>(T item, List<ItemFields> fields, User user = null)
|
BaseItemDto GetItemByNameDto<T>(T item, List<ItemFields> fields, User user = null)
|
||||||
where T : BaseItem, IItemByName;
|
where T : BaseItem, IItemByName;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the chapter information dto.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="chapterInfo">The chapter information.</param>
|
||||||
|
/// <param name="item">The item.</param>
|
||||||
|
/// <returns>ChapterInfoDto.</returns>
|
||||||
|
ChapterInfoDto GetChapterInfoDto(ChapterInfo chapterInfo, BaseItem item);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the item by name dto.
|
/// Gets the item by name dto.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -51,19 +51,25 @@ namespace MediaBrowser.Controller.Entities
|
||||||
/// Gets the linked children.
|
/// Gets the linked children.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>IEnumerable{BaseItem}.</returns>
|
/// <returns>IEnumerable{BaseItem}.</returns>
|
||||||
public IEnumerable<BaseItem> GetAlternateVersions()
|
public IEnumerable<Video> GetAlternateVersions()
|
||||||
{
|
{
|
||||||
var filesWithinSameDirectory = LocalAlternateVersionIds
|
var filesWithinSameDirectory = LocalAlternateVersionIds
|
||||||
.Select(i => LibraryManager.GetItemById(i))
|
.Select(i => LibraryManager.GetItemById(i))
|
||||||
.Where(i => i != null)
|
.Where(i => i != null)
|
||||||
.OfType<Video>();
|
.OfType<Video>();
|
||||||
|
|
||||||
|
return filesWithinSameDirectory.Concat(GetLinkedAlternateVersions())
|
||||||
|
.OrderBy(i => i.SortName);
|
||||||
|
}
|
||||||
|
|
||||||
|
public IEnumerable<Video> GetLinkedAlternateVersions()
|
||||||
|
{
|
||||||
var linkedVersions = LinkedAlternateVersions
|
var linkedVersions = LinkedAlternateVersions
|
||||||
.Select(GetLinkedChild)
|
.Select(GetLinkedChild)
|
||||||
.Where(i => i != null)
|
.Where(i => i != null)
|
||||||
.OfType<Video>();
|
.OfType<Video>();
|
||||||
|
|
||||||
return filesWithinSameDirectory.Concat(linkedVersions)
|
return linkedVersions
|
||||||
.OrderBy(i => i.SortName);
|
.OrderBy(i => i.SortName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -324,6 +324,13 @@ namespace MediaBrowser.Controller.Library
|
||||||
/// <param name="options">The options.</param>
|
/// <param name="options">The options.</param>
|
||||||
/// <returns>Task.</returns>
|
/// <returns>Task.</returns>
|
||||||
Task DeleteItem(BaseItem item, DeleteOptions options);
|
Task DeleteItem(BaseItem item, DeleteOptions options);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces the videos with primary versions.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="items">The items.</param>
|
||||||
|
/// <returns>IEnumerable{BaseItem}.</returns>
|
||||||
|
IEnumerable<BaseItem> ReplaceVideosWithPrimaryVersions(IEnumerable<BaseItem> items);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class LibraryManagerExtensions
|
public static class LibraryManagerExtensions
|
||||||
|
|
|
@ -137,6 +137,9 @@
|
||||||
<Compile Include="..\MediaBrowser.Model\Dto\ItemIndex.cs">
|
<Compile Include="..\MediaBrowser.Model\Dto\ItemIndex.cs">
|
||||||
<Link>Dto\ItemIndex.cs</Link>
|
<Link>Dto\ItemIndex.cs</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="..\MediaBrowser.Model\Dto\MediaVersionInfo.cs">
|
||||||
|
<Link>Dto\MediaVersionInfo.cs</Link>
|
||||||
|
</Compile>
|
||||||
<Compile Include="..\MediaBrowser.Model\Dto\RecommendationDto.cs">
|
<Compile Include="..\MediaBrowser.Model\Dto\RecommendationDto.cs">
|
||||||
<Link>Dto\RecommendationDto.cs</Link>
|
<Link>Dto\RecommendationDto.cs</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
|
|
@ -124,6 +124,9 @@
|
||||||
<Compile Include="..\MediaBrowser.Model\Dto\ItemIndex.cs">
|
<Compile Include="..\MediaBrowser.Model\Dto\ItemIndex.cs">
|
||||||
<Link>Dto\ItemIndex.cs</Link>
|
<Link>Dto\ItemIndex.cs</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="..\MediaBrowser.Model\Dto\MediaVersionInfo.cs">
|
||||||
|
<Link>Dto\MediaVersionInfo.cs</Link>
|
||||||
|
</Compile>
|
||||||
<Compile Include="..\MediaBrowser.Model\Dto\RecommendationDto.cs">
|
<Compile Include="..\MediaBrowser.Model\Dto\RecommendationDto.cs">
|
||||||
<Link>Dto\RecommendationDto.cs</Link>
|
<Link>Dto\RecommendationDto.cs</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
|
|
@ -495,7 +495,6 @@ namespace MediaBrowser.Model.Dto
|
||||||
/// <value>The part count.</value>
|
/// <value>The part count.</value>
|
||||||
public int? PartCount { get; set; }
|
public int? PartCount { get; set; }
|
||||||
public int? AlternateVersionCount { get; set; }
|
public int? AlternateVersionCount { get; set; }
|
||||||
public string PrimaryVersionId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Determines whether the specified type is type.
|
/// Determines whether the specified type is type.
|
||||||
|
|
30
MediaBrowser.Model/Dto/MediaVersionInfo.cs
Normal file
30
MediaBrowser.Model/Dto/MediaVersionInfo.cs
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
using MediaBrowser.Model.Entities;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
namespace MediaBrowser.Model.Dto
|
||||||
|
{
|
||||||
|
public class MediaVersionInfo
|
||||||
|
{
|
||||||
|
public string Id { get; set; }
|
||||||
|
|
||||||
|
public string Path { get; set; }
|
||||||
|
|
||||||
|
public LocationType LocationType { get; set; }
|
||||||
|
|
||||||
|
public string Name { get; set; }
|
||||||
|
|
||||||
|
public long? RunTimeTicks { get; set; }
|
||||||
|
|
||||||
|
public VideoType? VideoType { get; set; }
|
||||||
|
|
||||||
|
public IsoType? IsoType { get; set; }
|
||||||
|
|
||||||
|
public Video3DFormat? Video3DFormat { get; set; }
|
||||||
|
|
||||||
|
public List<MediaStream> MediaStreams { get; set; }
|
||||||
|
|
||||||
|
public List<ChapterInfoDto> Chapters { get; set; }
|
||||||
|
|
||||||
|
public bool? IsHD { get; set; }
|
||||||
|
}
|
||||||
|
}
|
|
@ -76,6 +76,7 @@
|
||||||
<Compile Include="Dto\ItemCounts.cs" />
|
<Compile Include="Dto\ItemCounts.cs" />
|
||||||
<Compile Include="Dto\ItemIndex.cs" />
|
<Compile Include="Dto\ItemIndex.cs" />
|
||||||
<Compile Include="Dto\RecommendationDto.cs" />
|
<Compile Include="Dto\RecommendationDto.cs" />
|
||||||
|
<Compile Include="Dto\MediaVersionInfo.cs" />
|
||||||
<Compile Include="Entities\PackageReviewInfo.cs" />
|
<Compile Include="Entities\PackageReviewInfo.cs" />
|
||||||
<Compile Include="FileOrganization\FileOrganizationResult.cs" />
|
<Compile Include="FileOrganization\FileOrganizationResult.cs" />
|
||||||
<Compile Include="FileOrganization\FileOrganizationQuery.cs" />
|
<Compile Include="FileOrganization\FileOrganizationQuery.cs" />
|
||||||
|
|
|
@ -208,8 +208,8 @@ namespace MediaBrowser.Server.Implementations.Channels
|
||||||
|
|
||||||
var query = new InternalChannelItemQuery
|
var query = new InternalChannelItemQuery
|
||||||
{
|
{
|
||||||
User = user,
|
User = user,
|
||||||
CategoryId = categoryId
|
CategoryId = categoryId
|
||||||
};
|
};
|
||||||
|
|
||||||
var result = await channel.GetChannelItems(query, cancellationToken).ConfigureAwait(false);
|
var result = await channel.GetChannelItems(query, cancellationToken).ConfigureAwait(false);
|
||||||
|
@ -236,7 +236,7 @@ namespace MediaBrowser.Server.Implementations.Channels
|
||||||
var tasks = items.Select(GetChannelItemEntity);
|
var tasks = items.Select(GetChannelItemEntity);
|
||||||
|
|
||||||
var returnItems = await Task.WhenAll(tasks).ConfigureAwait(false);
|
var returnItems = await Task.WhenAll(tasks).ConfigureAwait(false);
|
||||||
|
returnItems = new BaseItem[] {};
|
||||||
var returnItemArray = returnItems.Select(i => _dtoService.GetBaseItemDto(i, fields, user))
|
var returnItemArray = returnItems.Select(i => _dtoService.GetBaseItemDto(i, fields, user))
|
||||||
.ToArray();
|
.ToArray();
|
||||||
|
|
||||||
|
@ -251,19 +251,25 @@ namespace MediaBrowser.Server.Implementations.Channels
|
||||||
{
|
{
|
||||||
BaseItem item;
|
BaseItem item;
|
||||||
|
|
||||||
|
Guid id;
|
||||||
|
|
||||||
if (info.Type == ChannelItemType.Category)
|
if (info.Type == ChannelItemType.Category)
|
||||||
{
|
{
|
||||||
|
id = info.Id.GetMBId(typeof(ChannelCategoryItem));
|
||||||
item = new ChannelCategoryItem();
|
item = new ChannelCategoryItem();
|
||||||
}
|
}
|
||||||
else if (info.MediaType == ChannelMediaType.Audio)
|
else if (info.MediaType == ChannelMediaType.Audio)
|
||||||
{
|
{
|
||||||
|
id = info.Id.GetMBId(typeof(ChannelCategoryItem));
|
||||||
item = new ChannelAudioItem();
|
item = new ChannelAudioItem();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
id = info.Id.GetMBId(typeof(ChannelVideoItem));
|
||||||
item = new ChannelVideoItem();
|
item = new ChannelVideoItem();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
item.Id = id;
|
||||||
item.Name = info.Name;
|
item.Name = info.Name;
|
||||||
item.Genres = info.Genres;
|
item.Genres = info.Genres;
|
||||||
item.CommunityRating = info.CommunityRating;
|
item.CommunityRating = info.CommunityRating;
|
||||||
|
|
|
@ -651,7 +651,7 @@ namespace MediaBrowser.Server.Implementations.Dto
|
||||||
/// <param name="chapterInfo">The chapter info.</param>
|
/// <param name="chapterInfo">The chapter info.</param>
|
||||||
/// <param name="item">The item.</param>
|
/// <param name="item">The item.</param>
|
||||||
/// <returns>ChapterInfoDto.</returns>
|
/// <returns>ChapterInfoDto.</returns>
|
||||||
private ChapterInfoDto GetChapterInfoDto(ChapterInfo chapterInfo, BaseItem item)
|
public ChapterInfoDto GetChapterInfoDto(ChapterInfo chapterInfo, BaseItem item)
|
||||||
{
|
{
|
||||||
var dto = new ChapterInfoDto
|
var dto = new ChapterInfoDto
|
||||||
{
|
{
|
||||||
|
@ -1084,11 +1084,6 @@ namespace MediaBrowser.Server.Implementations.Dto
|
||||||
dto.PartCount = video.AdditionalPartIds.Count + 1;
|
dto.PartCount = video.AdditionalPartIds.Count + 1;
|
||||||
dto.AlternateVersionCount = video.AlternateVersionCount;
|
dto.AlternateVersionCount = video.AlternateVersionCount;
|
||||||
|
|
||||||
if (video.PrimaryVersionId.HasValue)
|
|
||||||
{
|
|
||||||
dto.PrimaryVersionId = video.PrimaryVersionId.Value.ToString("N");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fields.Contains(ItemFields.Chapters))
|
if (fields.Contains(ItemFields.Chapters))
|
||||||
{
|
{
|
||||||
dto.Chapters = _itemRepo.GetChapters(video.Id).Select(c => GetChapterInfoDto(c, item)).ToList();
|
dto.Chapters = _itemRepo.GetChapters(video.Id).Select(c => GetChapterInfoDto(c, item)).ToList();
|
||||||
|
|
|
@ -26,6 +26,7 @@ using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using MoreLinq;
|
||||||
using SortOrder = MediaBrowser.Model.Entities.SortOrder;
|
using SortOrder = MediaBrowser.Model.Entities.SortOrder;
|
||||||
|
|
||||||
namespace MediaBrowser.Server.Implementations.Library
|
namespace MediaBrowser.Server.Implementations.Library
|
||||||
|
@ -540,6 +541,29 @@ namespace MediaBrowser.Server.Implementations.Library
|
||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public IEnumerable<BaseItem> ReplaceVideosWithPrimaryVersions(IEnumerable<BaseItem> items)
|
||||||
|
{
|
||||||
|
return items.Select(i =>
|
||||||
|
{
|
||||||
|
var video = i as Video;
|
||||||
|
|
||||||
|
if (video != null)
|
||||||
|
{
|
||||||
|
if (video.PrimaryVersionId.HasValue)
|
||||||
|
{
|
||||||
|
var primary = GetItemById(video.PrimaryVersionId.Value) as Video;
|
||||||
|
|
||||||
|
if (primary != null)
|
||||||
|
{
|
||||||
|
return primary;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return i;
|
||||||
|
|
||||||
|
}).DistinctBy(i => i.Id);
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Ensure supplied item has only one instance throughout
|
/// Ensure supplied item has only one instance throughout
|
||||||
|
|
|
@ -35,6 +35,8 @@ namespace MediaBrowser.Server.Implementations.Library
|
||||||
|
|
||||||
var inputItems = user.RootFolder.GetRecursiveChildren(user, null).Where(i => !(i is ICollectionFolder));
|
var inputItems = user.RootFolder.GetRecursiveChildren(user, null).Where(i => !(i is ICollectionFolder));
|
||||||
|
|
||||||
|
inputItems = _libraryManager.ReplaceVideosWithPrimaryVersions(inputItems);
|
||||||
|
|
||||||
var results = await GetSearchHints(inputItems, query).ConfigureAwait(false);
|
var results = await GetSearchHints(inputItems, query).ConfigureAwait(false);
|
||||||
|
|
||||||
// Include item types
|
// Include item types
|
||||||
|
|
|
@ -119,11 +119,9 @@ namespace MediaBrowser.ServerApplication
|
||||||
var subFolder = item as Folder;
|
var subFolder = item as Folder;
|
||||||
if (subFolder != null)
|
if (subFolder != null)
|
||||||
{
|
{
|
||||||
var prefs = _displayPreferencesManager.GetDisplayPreferences(subFolder.DisplayPreferencesId, user.Id, "LibraryExplorer");
|
|
||||||
|
|
||||||
var subChildren = isPhysical ? subFolder.Children : subFolder.GetChildren(_currentUser, true);
|
var subChildren = isPhysical ? subFolder.Children : subFolder.GetChildren(_currentUser, true);
|
||||||
|
|
||||||
AddChildren(node, OrderBy(subChildren, user, prefs.SortBy), user, isPhysical);
|
AddChildren(node, OrderBy(subChildren, user, ItemSortBy.SortName), user, isPhysical);
|
||||||
node.Text = item.Name + " (" + node.Nodes.Count + ")";
|
node.Text = item.Name + " (" + node.Nodes.Count + ")";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue