aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/Library
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Api/Library')
-rw-r--r--MediaBrowser.Api/Library/LibraryHelpers.cs13
-rw-r--r--MediaBrowser.Api/Library/LibraryService.cs749
-rw-r--r--MediaBrowser.Api/Library/LibraryStructureService.cs96
3 files changed, 748 insertions, 110 deletions
diff --git a/MediaBrowser.Api/Library/LibraryHelpers.cs b/MediaBrowser.Api/Library/LibraryHelpers.cs
index 3836a0860..be9f00a61 100644
--- a/MediaBrowser.Api/Library/LibraryHelpers.cs
+++ b/MediaBrowser.Api/Library/LibraryHelpers.cs
@@ -1,6 +1,5 @@
using MediaBrowser.Common.IO;
using MediaBrowser.Controller;
-using MediaBrowser.Controller.Entities;
using System;
using System.IO;
using System.Linq;
@@ -27,12 +26,11 @@ namespace MediaBrowser.Api.Library
/// <param name="fileSystem">The file system.</param>
/// <param name="virtualFolderName">Name of the virtual folder.</param>
/// <param name="mediaPath">The media path.</param>
- /// <param name="user">The user.</param>
/// <param name="appPaths">The app paths.</param>
/// <exception cref="System.IO.DirectoryNotFoundException">The media folder does not exist</exception>
- public static void RemoveMediaPath(IFileSystem fileSystem, string virtualFolderName, string mediaPath, User user, IServerApplicationPaths appPaths)
+ public static void RemoveMediaPath(IFileSystem fileSystem, string virtualFolderName, string mediaPath, IServerApplicationPaths appPaths)
{
- var rootFolderPath = user != null ? user.RootFolderPath : appPaths.DefaultUserViewsPath;
+ var rootFolderPath = appPaths.DefaultUserViewsPath;
var path = Path.Combine(rootFolderPath, virtualFolderName);
if (!Directory.Exists(path))
@@ -54,18 +52,17 @@ namespace MediaBrowser.Api.Library
/// <param name="fileSystem">The file system.</param>
/// <param name="virtualFolderName">Name of the virtual folder.</param>
/// <param name="path">The path.</param>
- /// <param name="user">The user.</param>
/// <param name="appPaths">The app paths.</param>
- /// <exception cref="System.ArgumentException">The path is not valid.</exception>
/// <exception cref="System.IO.DirectoryNotFoundException">The path does not exist.</exception>
- public static void AddMediaPath(IFileSystem fileSystem, string virtualFolderName, string path, User user, IServerApplicationPaths appPaths)
+ /// <exception cref="System.ArgumentException">The path is not valid.</exception>
+ public static void AddMediaPath(IFileSystem fileSystem, string virtualFolderName, string path, IServerApplicationPaths appPaths)
{
if (!Directory.Exists(path))
{
throw new DirectoryNotFoundException("The path does not exist.");
}
- var rootFolderPath = user != null ? user.RootFolderPath : appPaths.DefaultUserViewsPath;
+ var rootFolderPath = appPaths.DefaultUserViewsPath;
var virtualFolderPath = Path.Combine(rootFolderPath, virtualFolderName);
var shortcutFilename = Path.GetFileNameWithoutExtension(path);
diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs
index 840a5b851..1a14646e1 100644
--- a/MediaBrowser.Api/Library/LibraryService.cs
+++ b/MediaBrowser.Api/Library/LibraryService.cs
@@ -1,12 +1,216 @@
-using MediaBrowser.Common;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
using ServiceStack;
using System;
+using System.Collections;
using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
namespace MediaBrowser.Api.Library
{
+ [Route("/Items/{Id}/File", "GET")]
+ [Api(Description = "Gets the original file of an item")]
+ public class GetFile
+ {
+ /// <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}/Subtitle/{Index}", "GET")]
+ [Api(Description = "Gets an external subtitle file")]
+ public class GetSubtitle
+ {
+ /// <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; }
+
+ [ApiMember(Name = "Index", Description = "The subtitle stream index", IsRequired = true, DataType = "int", ParameterType = "path", Verb = "GET")]
+ public int Index { get; set; }
+ }
+
+ /// <summary>
+ /// Class GetCriticReviews
+ /// </summary>
+ [Route("/Items/{Id}/CriticReviews", "GET")]
+ [Api(Description = "Gets critic reviews for an item")]
+ public class GetCriticReviews : IReturn<QueryResult<ItemReview>>
+ {
+ /// <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; }
+
+ /// <summary>
+ /// Skips over a given number of items within the results. Use for paging.
+ /// </summary>
+ /// <value>The start index.</value>
+ [ApiMember(Name = "StartIndex", Description = "Optional. The record index to start at. All items with a lower index will be dropped from the results.", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
+ public int? StartIndex { get; set; }
+
+ /// <summary>
+ /// The maximum number of items to return
+ /// </summary>
+ /// <value>The limit.</value>
+ [ApiMember(Name = "Limit", Description = "Optional. The maximum number of records to return", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
+ public int? Limit { get; set; }
+ }
+
+ /// <summary>
+ /// Class GetThemeSongs
+ /// </summary>
+ [Route("/Items/{Id}/ThemeSongs", "GET")]
+ [Api(Description = "Gets theme songs for an item")]
+ public class GetThemeSongs : IReturn<ThemeMediaResult>
+ {
+ /// <summary>
+ /// Gets or sets the user id.
+ /// </summary>
+ /// <value>The user id.</value>
+ [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; }
+
+ [ApiMember(Name = "InheritFromParent", Description = "Determines whether or not parent items should be searched for theme media.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
+ public bool InheritFromParent { get; set; }
+ }
+
+ /// <summary>
+ /// Class GetThemeVideos
+ /// </summary>
+ [Route("/Items/{Id}/ThemeVideos", "GET")]
+ [Api(Description = "Gets theme videos for an item")]
+ public class GetThemeVideos : IReturn<ThemeMediaResult>
+ {
+ /// <summary>
+ /// Gets or sets the user id.
+ /// </summary>
+ /// <value>The user id.</value>
+ [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; }
+
+ [ApiMember(Name = "InheritFromParent", Description = "Determines whether or not parent items should be searched for theme media.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
+ public bool InheritFromParent { get; set; }
+ }
+
+ /// <summary>
+ /// Class GetThemeVideos
+ /// </summary>
+ [Route("/Items/{Id}/ThemeMedia", "GET")]
+ [Api(Description = "Gets theme videos and songs for an item")]
+ public class GetThemeMedia : IReturn<AllThemeMediaResult>
+ {
+ /// <summary>
+ /// Gets or sets the user id.
+ /// </summary>
+ /// <value>The user id.</value>
+ [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; }
+
+ [ApiMember(Name = "InheritFromParent", Description = "Determines whether or not parent items should be searched for theme media.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
+ public bool InheritFromParent { get; set; }
+ }
+
+ [Route("/Library/Refresh", "POST")]
+ [Api(Description = "Starts a library scan")]
+ public class RefreshLibrary : IReturnVoid
+ {
+ }
+
+ [Route("/Items/{Id}", "DELETE")]
+ [Api(Description = "Deletes an item from the library and file system")]
+ public class DeleteItem : IReturnVoid
+ {
+ [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "DELETE")]
+ public string Id { get; set; }
+ }
+
+ [Route("/Items/Counts", "GET")]
+ [Api(Description = "Gets counts of various item types")]
+ public class GetItemCounts : IReturn<ItemCounts>
+ {
+ [ApiMember(Name = "UserId", Description = "Optional. Get counts from a specific user's library.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
+ public Guid? UserId { get; set; }
+
+ [ApiMember(Name = "IsFavorite", Description = "Optional. Get counts of favorite items", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
+ public bool? IsFavorite { get; set; }
+ }
+
+ [Route("/Items/{Id}/Ancestors", "GET")]
+ [Api(Description = "Gets all parents of an item")]
+ public class GetAncestors : IReturn<BaseItemDto[]>
+ {
+ /// <summary>
+ /// Gets or sets the user id.
+ /// </summary>
+ /// <value>The user id.</value>
+ [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("/Items/YearIndex", "GET")]
+ [Api(Description = "Gets a year index based on an item query.")]
+ public class GetYearIndex : IReturn<List<ItemIndex>>
+ {
+ /// <summary>
+ /// Gets or sets the user id.
+ /// </summary>
+ /// <value>The user id.</value>
+ [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; }
+
+ [ApiMember(Name = "IncludeItemTypes", Description = "Optional. If specified, results will be filtered based on item type. This allows multiple, comma delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
+ public string IncludeItemTypes { get; set; }
+ }
+
/// <summary>
/// Class GetPhyscialPaths
/// </summary>
@@ -16,32 +220,94 @@ namespace MediaBrowser.Api.Library
{
}
+ [Route("/Library/MediaFolders", "GET")]
+ [Api(Description = "Gets all user media folders.")]
+ public class GetMediaFolders : IReturn<ItemsResult>
+ {
+
+ }
+
/// <summary>
/// Class LibraryService
/// </summary>
public class LibraryService : BaseApiService
{
/// <summary>
- /// The _app host
+ /// The _item repo
/// </summary>
- private readonly IApplicationHost _appHost;
+ private readonly IItemRepository _itemRepo;
+
private readonly ILibraryManager _libraryManager;
+ private readonly IUserManager _userManager;
+ private readonly IUserDataManager _userDataManager;
+
+ private readonly IDtoService _dtoService;
/// <summary>
/// Initializes a new instance of the <see cref="LibraryService" /> class.
/// </summary>
- /// <param name="appHost">The app host.</param>
- /// <param name="libraryManager">The library manager.</param>
- /// <exception cref="System.ArgumentNullException">appHost</exception>
- public LibraryService(IApplicationHost appHost, ILibraryManager libraryManager)
+ public LibraryService(IItemRepository itemRepo, ILibraryManager libraryManager, IUserManager userManager,
+ IDtoService dtoService, IUserDataManager userDataManager)
{
- if (appHost == null)
+ _itemRepo = itemRepo;
+ _libraryManager = libraryManager;
+ _userManager = userManager;
+ _dtoService = dtoService;
+ _userDataManager = userDataManager;
+ }
+
+ public object Get(GetMediaFolders request)
+ {
+ var items = _libraryManager.GetUserRootFolder().Children.ToList();
+
+ // Get everything
+ var fields = Enum.GetNames(typeof(ItemFields))
+ .Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true))
+ .ToList();
+
+ var result = new ItemsResult
{
- throw new ArgumentNullException("appHost");
+ TotalRecordCount = items.Count,
+
+ Items = items.Select(i => _dtoService.GetBaseItemDto(i, fields)).ToArray()
+ };
+
+ return ToOptimizedResult(result);
+ }
+
+ public object Get(GetFile request)
+ {
+ var item = _dtoService.GetItemByDtoId(request.Id);
+ var locationType = item.LocationType;
+ if (locationType == LocationType.Remote || locationType == LocationType.Virtual)
+ {
+ throw new ArgumentException("This command cannot be used for remote or virtual items.");
+ }
+ if (Directory.Exists(item.Path))
+ {
+ throw new ArgumentException("This command cannot be used for directories.");
}
- _appHost = appHost;
- _libraryManager = libraryManager;
+ return ToStaticFileResult(item.Path);
+ }
+
+ public object Get(GetSubtitle request)
+ {
+ var subtitleStream = _itemRepo.GetMediaStreams(new MediaStreamQuery
+ {
+
+ Index = request.Index,
+ ItemId = new Guid(request.Id),
+ Type = MediaStreamType.Subtitle
+
+ }).FirstOrDefault();
+
+ if (subtitleStream == null)
+ {
+ throw new ResourceNotFoundException();
+ }
+
+ return ToStaticFileResult(subtitleStream.Path);
}
/// <summary>
@@ -57,5 +323,466 @@ namespace MediaBrowser.Api.Library
return ToOptimizedSerializedResultUsingCache(result);
}
+
+ /// <summary>
+ /// Gets the specified request.
+ /// </summary>
+ /// <param name="request">The request.</param>
+ /// <returns>System.Object.</returns>
+ public object Get(GetAncestors request)
+ {
+ var result = GetAncestors(request);
+
+ return ToOptimizedSerializedResultUsingCache(result);
+ }
+
+ /// <summary>
+ /// Gets the ancestors.
+ /// </summary>
+ /// <param name="request">The request.</param>
+ /// <returns>Task{BaseItemDto[]}.</returns>
+ public List<BaseItemDto> GetAncestors(GetAncestors request)
+ {
+ var item = _dtoService.GetItemByDtoId(request.Id);
+
+ var baseItemDtos = new List<BaseItemDto>();
+
+ var user = request.UserId.HasValue ? _userManager.GetUserById(request.UserId.Value) : null;
+
+ // Get everything
+ var fields = Enum.GetNames(typeof(ItemFields))
+ .Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true))
+ .ToList();
+
+ BaseItem parent = item.Parent;
+
+ while (parent != null)
+ {
+ if (user != null)
+ {
+ parent = TranslateParentItem(parent, user);
+ }
+
+ baseItemDtos.Add(_dtoService.GetBaseItemDto(parent, fields, user));
+
+ parent = parent.Parent;
+ }
+
+ return baseItemDtos.ToList();
+ }
+
+ private BaseItem TranslateParentItem(BaseItem item, User user)
+ {
+ if (item.Parent is AggregateFolder)
+ {
+ return user.RootFolder.GetChildren(user, true).FirstOrDefault(i => i.PhysicalLocations.Contains(item.Path));
+ }
+
+ return item;
+ }
+
+ /// <summary>
+ /// Gets the specified request.
+ /// </summary>
+ /// <param name="request">The request.</param>
+ /// <returns>System.Object.</returns>
+ public object Get(GetCriticReviews request)
+ {
+ var result = GetCriticReviews(request);
+
+ return ToOptimizedSerializedResultUsingCache(result);
+ }
+
+ /// <summary>
+ /// Gets the specified request.
+ /// </summary>
+ /// <param name="request">The request.</param>
+ /// <returns>System.Object.</returns>
+ public object Get(GetItemCounts request)
+ {
+ var items = GetAllLibraryItems(request.UserId, _userManager, _libraryManager)
+ .Where(i => i.LocationType != LocationType.Virtual)
+ .ToList();
+
+ var filteredItems = request.UserId.HasValue ? FilterItems(items, request, request.UserId.Value).ToList() : items;
+
+ var albums = filteredItems.OfType<MusicAlbum>().ToList();
+ var episodes = filteredItems.OfType<Episode>().ToList();
+ var games = filteredItems.OfType<Game>().ToList();
+ var movies = filteredItems.OfType<Movie>().ToList();
+ var musicVideos = filteredItems.OfType<MusicVideo>().ToList();
+ var adultVideos = filteredItems.OfType<AdultVideo>().ToList();
+ var boxsets = filteredItems.OfType<BoxSet>().ToList();
+ var books = filteredItems.OfType<Book>().ToList();
+ var songs = filteredItems.OfType<Audio>().ToList();
+ var series = filteredItems.OfType<Series>().ToList();
+
+ var counts = new ItemCounts
+ {
+ AlbumCount = albums.Count,
+ EpisodeCount = episodes.Count,
+ GameCount = games.Count,
+ GameSystemCount = filteredItems.OfType<GameSystem>().Count(),
+ MovieCount = movies.Count,
+ SeriesCount = series.Count,
+ SongCount = songs.Count,
+ TrailerCount = filteredItems.OfType<Trailer>().Count(),
+ MusicVideoCount = musicVideos.Count,
+ AdultVideoCount = adultVideos.Count,
+ BoxSetCount = boxsets.Count,
+ BookCount = books.Count,
+
+ UniqueTypes = items.Select(i => i.GetClientTypeName()).Distinct().ToList()
+ };
+
+ return ToOptimizedSerializedResultUsingCache(counts);
+ }
+
+ private IEnumerable<T> FilterItems<T>(IEnumerable<T> items, GetItemCounts request, Guid userId)
+ where T : BaseItem
+ {
+ if (request.IsFavorite.HasValue)
+ {
+ var val = request.IsFavorite.Value;
+
+ items = items.Where(i => _userDataManager.GetUserData(userId, i.GetUserDataKey()).IsFavorite == val);
+ }
+
+ return items;
+ }
+
+ /// <summary>
+ /// Posts the specified request.
+ /// </summary>
+ /// <param name="request">The request.</param>
+ public async void Post(RefreshLibrary request)
+ {
+ try
+ {
+ await _libraryManager.ValidateMediaLibrary(new Progress<double>(), CancellationToken.None)
+ .ConfigureAwait(false);
+ }
+ catch (Exception ex)
+ {
+ Logger.ErrorException("Error refreshing library", ex);
+ }
+ }
+
+ /// <summary>
+ /// Deletes the specified request.
+ /// </summary>
+ /// <param name="request">The request.</param>
+ public void Delete(DeleteItem request)
+ {
+ var task = DeleteItem(request);
+
+ Task.WaitAll(task);
+ }
+
+ private Task DeleteItem(DeleteItem request)
+ {
+ var item = _dtoService.GetItemByDtoId(request.Id);
+
+ return _libraryManager.DeleteItem(item);
+ }
+
+ /// <summary>
+ /// Gets the critic reviews async.
+ /// </summary>
+ /// <param name="request">The request.</param>
+ /// <returns>Task{ItemReviewsResult}.</returns>
+ private QueryResult<ItemReview> GetCriticReviews(GetCriticReviews request)
+ {
+ var reviews = _itemRepo.GetCriticReviews(new Guid(request.Id));
+
+ var reviewsArray = reviews.ToArray();
+
+ var result = new QueryResult<ItemReview>
+ {
+ TotalRecordCount = reviewsArray.Length
+ };
+
+ if (request.StartIndex.HasValue)
+ {
+ reviewsArray = reviewsArray.Skip(request.StartIndex.Value).ToArray();
+ }
+ if (request.Limit.HasValue)
+ {
+ reviewsArray = reviewsArray.Take(request.Limit.Value).ToArray();
+ }
+
+ result.Items = reviewsArray;
+
+ return result;
+ }
+
+ public object Get(GetThemeMedia request)
+ {
+ var themeSongs = GetThemeSongs(new GetThemeSongs
+ {
+ InheritFromParent = request.InheritFromParent,
+ Id = request.Id,
+ UserId = request.UserId
+
+ });
+
+ var themeVideos = GetThemeVideos(new GetThemeVideos
+ {
+ InheritFromParent = request.InheritFromParent,
+ Id = request.Id,
+ UserId = request.UserId
+
+ });
+
+ return ToOptimizedSerializedResultUsingCache(new AllThemeMediaResult
+ {
+ ThemeSongsResult = themeSongs,
+ ThemeVideosResult = themeVideos,
+
+ SoundtrackSongsResult = GetSoundtrackSongs(request.Id, request.UserId, request.InheritFromParent)
+ });
+ }
+
+ /// <summary>
+ /// Gets the specified request.
+ /// </summary>
+ /// <param name="request">The request.</param>
+ /// <returns>System.Object.</returns>
+ public object Get(GetThemeSongs request)
+ {
+ var result = GetThemeSongs(request);
+
+ return ToOptimizedSerializedResultUsingCache(result);
+ }
+
+ private ThemeMediaResult GetThemeSongs(GetThemeSongs request)
+ {
+ var user = request.UserId.HasValue ? _userManager.GetUserById(request.UserId.Value) : null;
+
+ var item = string.IsNullOrEmpty(request.Id)
+ ? (request.UserId.HasValue
+ ? user.RootFolder
+ : (Folder)_libraryManager.RootFolder)
+ : _dtoService.GetItemByDtoId(request.Id, request.UserId);
+
+ var originalItem = item;
+
+ while (GetThemeSongIds(item).Count == 0 && request.InheritFromParent && item.Parent != null)
+ {
+ item = item.Parent;
+ }
+
+ // Get everything
+ var fields = Enum.GetNames(typeof(ItemFields))
+ .Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true))
+ .ToList();
+
+ var themeSongIds = GetThemeSongIds(item);
+
+ if (themeSongIds.Count == 0 && request.InheritFromParent)
+ {
+ var album = originalItem as MusicAlbum;
+
+ if (album != null)
+ {
+ var linkedItemWithThemes = album.SoundtrackIds
+ .Select(i => _libraryManager.GetItemById(i))
+ .FirstOrDefault(i => GetThemeSongIds(i).Count > 0);
+
+ if (linkedItemWithThemes != null)
+ {
+ themeSongIds = GetThemeSongIds(linkedItemWithThemes);
+ item = linkedItemWithThemes;
+ }
+ }
+ }
+
+ var dtos = themeSongIds.Select(_libraryManager.GetItemById)
+ .OrderBy(i => i.SortName)
+ .Select(i => _dtoService.GetBaseItemDto(i, fields, user, item));
+
+ var items = dtos.ToArray();
+
+ return new ThemeMediaResult
+ {
+ Items = items,
+ TotalRecordCount = items.Length,
+ OwnerId = _dtoService.GetDtoId(item)
+ };
+ }
+
+ /// <summary>
+ /// Gets the specified request.
+ /// </summary>
+ /// <param name="request">The request.</param>
+ /// <returns>System.Object.</returns>
+ public object Get(GetThemeVideos request)
+ {
+ var result = GetThemeVideos(request);
+
+ return ToOptimizedSerializedResultUsingCache(result);
+ }
+
+ public ThemeMediaResult GetThemeVideos(GetThemeVideos request)
+ {
+ var user = request.UserId.HasValue ? _userManager.GetUserById(request.UserId.Value) : null;
+
+ var item = string.IsNullOrEmpty(request.Id)
+ ? (request.UserId.HasValue
+ ? user.RootFolder
+ : (Folder)_libraryManager.RootFolder)
+ : _dtoService.GetItemByDtoId(request.Id, request.UserId);
+
+ var originalItem = item;
+
+ while (GetThemeVideoIds(item).Count == 0 && request.InheritFromParent && item.Parent != null)
+ {
+ item = item.Parent;
+ }
+
+ // Get everything
+ var fields = Enum.GetNames(typeof(ItemFields))
+ .Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true))
+ .ToList();
+
+ var themeVideoIds = GetThemeVideoIds(item);
+
+ if (themeVideoIds.Count == 0 && request.InheritFromParent)
+ {
+ var album = originalItem as MusicAlbum;
+
+ if (album == null)
+ {
+ album = originalItem.Parents.OfType<MusicAlbum>().FirstOrDefault();
+ }
+
+ if (album != null)
+ {
+ var linkedItemWithThemes = album.SoundtrackIds
+ .Select(i => _libraryManager.GetItemById(i))
+ .FirstOrDefault(i => GetThemeVideoIds(i).Count > 0);
+
+ if (linkedItemWithThemes != null)
+ {
+ themeVideoIds = GetThemeVideoIds(linkedItemWithThemes);
+ item = linkedItemWithThemes;
+ }
+ }
+ }
+
+ var dtos = themeVideoIds.Select(_libraryManager.GetItemById)
+ .OrderBy(i => i.SortName)
+ .Select(i => _dtoService.GetBaseItemDto(i, fields, user, item));
+
+ var items = dtos.ToArray();
+
+ return new ThemeMediaResult
+ {
+ Items = items,
+ TotalRecordCount = items.Length,
+ OwnerId = _dtoService.GetDtoId(item)
+ };
+ }
+
+ private List<Guid> GetThemeVideoIds(BaseItem item)
+ {
+ var i = item as IHasThemeMedia;
+
+ if (i != null)
+ {
+ return i.ThemeVideoIds;
+ }
+
+ return new List<Guid>();
+ }
+
+ private List<Guid> GetThemeSongIds(BaseItem item)
+ {
+ var i = item as IHasThemeMedia;
+
+ if (i != null)
+ {
+ return i.ThemeSongIds;
+ }
+
+ return new List<Guid>();
+ }
+
+ private readonly CultureInfo _usCulture = new CultureInfo("en-US");
+
+ public object Get(GetYearIndex request)
+ {
+ IEnumerable<BaseItem> items = GetAllLibraryItems(request.UserId, _userManager, _libraryManager);
+
+ if (!string.IsNullOrEmpty(request.IncludeItemTypes))
+ {
+ var vals = request.IncludeItemTypes.Split(',');
+ items = items.Where(f => vals.Contains(f.GetType().Name, StringComparer.OrdinalIgnoreCase));
+ }
+
+ var lookup = items
+ .ToLookup(i => i.ProductionYear ?? -1)
+ .OrderBy(i => i.Key)
+ .Select(i => new ItemIndex
+ {
+ ItemCount = i.Count(),
+ Name = i.Key == -1 ? string.Empty : i.Key.ToString(_usCulture)
+ })
+ .ToList();
+
+ return ToOptimizedSerializedResultUsingCache(lookup);
+ }
+
+ public ThemeMediaResult GetSoundtrackSongs(string id, Guid? userId, bool inheritFromParent)
+ {
+ var user = userId.HasValue ? _userManager.GetUserById(userId.Value) : null;
+
+ var item = string.IsNullOrEmpty(id)
+ ? (userId.HasValue
+ ? user.RootFolder
+ : (Folder)_libraryManager.RootFolder)
+ : _dtoService.GetItemByDtoId(id, userId);
+
+ // Get everything
+ var fields = Enum.GetNames(typeof(ItemFields))
+ .Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true))
+ .ToList();
+
+ var dtos = GetSoundtrackSongIds(item, inheritFromParent)
+ .Select(_libraryManager.GetItemById)
+ .OfType<MusicAlbum>()
+ .SelectMany(i => i.RecursiveChildren)
+ .OfType<Audio>()
+ .OrderBy(i => i.SortName)
+ .Select(i => _dtoService.GetBaseItemDto(i, fields, user, item));
+
+ var items = dtos.ToArray();
+
+ return new ThemeMediaResult
+ {
+ Items = items,
+ TotalRecordCount = items.Length,
+ OwnerId = _dtoService.GetDtoId(item)
+ };
+ }
+
+ private IEnumerable<Guid> GetSoundtrackSongIds(BaseItem item, bool inherit)
+ {
+ var hasSoundtracks = item as IHasSoundtracks;
+
+ if (hasSoundtracks != null)
+ {
+ return hasSoundtracks.SoundtrackIds;
+ }
+
+ if (!inherit)
+ {
+ return null;
+ }
+
+ hasSoundtracks = item.Parents.OfType<IHasSoundtracks>().FirstOrDefault();
+
+ return hasSoundtracks != null ? hasSoundtracks.SoundtrackIds : new List<Guid>();
+ }
}
}
diff --git a/MediaBrowser.Api/Library/LibraryStructureService.cs b/MediaBrowser.Api/Library/LibraryStructureService.cs
index ff4f78c96..947da29fe 100644
--- a/MediaBrowser.Api/Library/LibraryStructureService.cs
+++ b/MediaBrowser.Api/Library/LibraryStructureService.cs
@@ -28,16 +28,9 @@ namespace MediaBrowser.Api.Library
}
[Route("/Library/VirtualFolders", "POST")]
- [Route("/Users/{UserId}/VirtualFolders", "POST")]
public class AddVirtualFolder : IReturnVoid
{
/// <summary>
- /// Gets or sets the user id.
- /// </summary>
- /// <value>The user id.</value>
- public string UserId { get; set; }
-
- /// <summary>
/// Gets or sets the name.
/// </summary>
/// <value>The name.</value>
@@ -57,16 +50,9 @@ namespace MediaBrowser.Api.Library
}
[Route("/Library/VirtualFolders", "DELETE")]
- [Route("/Users/{UserId}/VirtualFolders", "DELETE")]
public class RemoveVirtualFolder : IReturnVoid
{
/// <summary>
- /// Gets or sets the user id.
- /// </summary>
- /// <value>The user id.</value>
- public string UserId { get; set; }
-
- /// <summary>
/// Gets or sets the name.
/// </summary>
/// <value>The name.</value>
@@ -80,16 +66,9 @@ namespace MediaBrowser.Api.Library
}
[Route("/Library/VirtualFolders/Name", "POST")]
- [Route("/Users/{UserId}/VirtualFolders/Name", "POST")]
public class RenameVirtualFolder : IReturnVoid
{
/// <summary>
- /// Gets or sets the user id.
- /// </summary>
- /// <value>The user id.</value>
- public string UserId { get; set; }
-
- /// <summary>
/// Gets or sets the name.
/// </summary>
/// <value>The name.</value>
@@ -109,16 +88,9 @@ namespace MediaBrowser.Api.Library
}
[Route("/Library/VirtualFolders/Paths", "POST")]
- [Route("/Users/{UserId}/VirtualFolders/Paths", "POST")]
public class AddMediaPath : IReturnVoid
{
/// <summary>
- /// Gets or sets the user id.
- /// </summary>
- /// <value>The user id.</value>
- public string UserId { get; set; }
-
- /// <summary>
/// Gets or sets the name.
/// </summary>
/// <value>The name.</value>
@@ -138,16 +110,9 @@ namespace MediaBrowser.Api.Library
}
[Route("/Library/VirtualFolders/Paths", "DELETE")]
- [Route("/Users/{UserId}/VirtualFolders/Paths", "DELETE")]
public class RemoveMediaPath : IReturnVoid
{
/// <summary>
- /// Gets or sets the user id.
- /// </summary>
- /// <value>The user id.</value>
- public string UserId { get; set; }
-
- /// <summary>
/// Gets or sets the name.
/// </summary>
/// <value>The name.</value>
@@ -275,18 +240,7 @@ namespace MediaBrowser.Api.Library
var name = _fileSystem.GetValidFilename(request.Name);
- string rootFolderPath;
-
- if (string.IsNullOrEmpty(request.UserId))
- {
- rootFolderPath = _appPaths.DefaultUserViewsPath;
- }
- else
- {
- var user = _userManager.GetUserById(new Guid(request.UserId));
-
- rootFolderPath = user.RootFolderPath;
- }
+ var rootFolderPath = _appPaths.DefaultUserViewsPath;
var virtualFolderPath = Path.Combine(rootFolderPath, name);
@@ -344,18 +298,7 @@ namespace MediaBrowser.Api.Library
throw new ArgumentNullException("request");
}
- string rootFolderPath;
-
- if (string.IsNullOrEmpty(request.UserId))
- {
- rootFolderPath = _appPaths.DefaultUserViewsPath;
- }
- else
- {
- var user = _userManager.GetUserById(new Guid(request.UserId));
-
- rootFolderPath = user.RootFolderPath;
- }
+ var rootFolderPath = _appPaths.DefaultUserViewsPath;
var currentPath = Path.Combine(rootFolderPath, request.Name);
var newPath = Path.Combine(rootFolderPath, request.NewName);
@@ -417,18 +360,7 @@ namespace MediaBrowser.Api.Library
throw new ArgumentNullException("request");
}
- string rootFolderPath;
-
- if (string.IsNullOrEmpty(request.UserId))
- {
- rootFolderPath = _appPaths.DefaultUserViewsPath;
- }
- else
- {
- var user = _userManager.GetUserById(new Guid(request.UserId));
-
- rootFolderPath = user.RootFolderPath;
- }
+ var rootFolderPath = _appPaths.DefaultUserViewsPath;
var path = Path.Combine(rootFolderPath, request.Name);
@@ -478,16 +410,7 @@ namespace MediaBrowser.Api.Library
try
{
- if (string.IsNullOrEmpty(request.UserId))
- {
- LibraryHelpers.AddMediaPath(_fileSystem, request.Name, request.Path, null, _appPaths);
- }
- else
- {
- var user = _userManager.GetUserById(new Guid(request.UserId));
-
- LibraryHelpers.AddMediaPath(_fileSystem, request.Name, request.Path, user, _appPaths);
- }
+ LibraryHelpers.AddMediaPath(_fileSystem, request.Name, request.Path, _appPaths);
// Need to add a delay here or directory watchers may still pick up the changes
var task = Task.Delay(1000);
@@ -524,16 +447,7 @@ namespace MediaBrowser.Api.Library
try
{
- if (string.IsNullOrEmpty(request.UserId))
- {
- LibraryHelpers.RemoveMediaPath(_fileSystem, request.Name, request.Path, null, _appPaths);
- }
- else
- {
- var user = _userManager.GetUserById(new Guid(request.UserId));
-
- LibraryHelpers.RemoveMediaPath(_fileSystem, request.Name, request.Path, user, _appPaths);
- }
+ LibraryHelpers.RemoveMediaPath(_fileSystem, request.Name, request.Path, _appPaths);
// Need to add a delay here or directory watchers may still pick up the changes
var task = Task.Delay(1000);
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-07 08:04:47 +0000