aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Api')
-rw-r--r--MediaBrowser.Api/MediaBrowser.Api.csproj1
-rw-r--r--MediaBrowser.Api/Playback/BaseStreamingService.cs20
-rw-r--r--MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs3
-rw-r--r--MediaBrowser.Api/Playback/MediaInfoService.cs11
-rw-r--r--MediaBrowser.Api/Playback/Progressive/AudioService.cs2
-rw-r--r--MediaBrowser.Api/Playback/StreamRequest.cs3
-rw-r--r--MediaBrowser.Api/Playback/UniversalAudioService.cs248
-rw-r--r--MediaBrowser.Api/Reports/ReportsService.cs6
-rw-r--r--MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs68
-rw-r--r--MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs2
-rw-r--r--MediaBrowser.Api/UserLibrary/ItemsService.cs20
-rw-r--r--MediaBrowser.Api/UserLibrary/UserLibraryService.cs3
12 files changed, 296 insertions, 91 deletions
diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index 7be04d8926..db5914f81d 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -59,6 +59,7 @@
<Compile Include="IHasDtoOptions.cs" />
<Compile Include="Playback\MediaInfoService.cs" />
<Compile Include="Playback\TranscodingThrottler.cs" />
+ <Compile Include="Playback\UniversalAudioService.cs" />
<Compile Include="PlaylistService.cs" />
<Compile Include="Reports\Activities\ReportActivitiesBuilder.cs" />
<Compile Include="Reports\Common\HeaderActivitiesMetadata.cs" />
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index d1c3de427d..e561b3f467 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -126,14 +126,10 @@ namespace MediaBrowser.Api.Playback
/// <summary>
/// Gets the output file path.
/// </summary>
- /// <param name="state">The state.</param>
- /// <returns>System.String.</returns>
- private string GetOutputFilePath(StreamState state)
+ private string GetOutputFilePath(StreamState state, string outputFileExtension)
{
var folder = ServerConfigurationManager.ApplicationPaths.TranscodingTempPath;
- var outputFileExtension = GetOutputFileExtension(state);
-
var data = GetCommandLineArguments("dummy\\dummy", state, false);
data += "-" + (state.Request.DeviceId ?? string.Empty);
@@ -802,7 +798,7 @@ namespace MediaBrowser.Api.Playback
{
state.User = UserManager.GetUserById(auth.UserId);
}
-
+
//if ((Request.UserAgent ?? string.Empty).IndexOf("iphone", StringComparison.OrdinalIgnoreCase) != -1 ||
// (Request.UserAgent ?? string.Empty).IndexOf("ipad", StringComparison.OrdinalIgnoreCase) != -1 ||
// (Request.UserAgent ?? string.Empty).IndexOf("ipod", StringComparison.OrdinalIgnoreCase) != -1)
@@ -878,9 +874,14 @@ namespace MediaBrowser.Api.Playback
if (string.IsNullOrEmpty(container))
{
+ container = request.Container;
+ }
+
+ if (string.IsNullOrEmpty(container))
+ {
container = request.Static ?
state.InputContainer :
- (Path.GetExtension(GetOutputFilePath(state)) ?? string.Empty).TrimStart('.');
+ GetOutputFileExtension(state);
}
state.OutputContainer = (container ?? string.Empty).TrimStart('.');
@@ -923,7 +924,10 @@ namespace MediaBrowser.Api.Playback
ApplyDeviceProfileSettings(state);
}
- state.OutputFilePath = GetOutputFilePath(state);
+ var ext = string.IsNullOrWhiteSpace(state.OutputContainer)
+ ? GetOutputFileExtension(state)
+ : ("." + state.OutputContainer);
+ state.OutputFilePath = GetOutputFilePath(state, ext);
return state;
}
diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
index cfd7471c4f..1074a8bc18 100644
--- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
@@ -18,9 +18,6 @@ using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Controller.IO;
-using MediaBrowser.Model.IO;
using MediaBrowser.Model.Services;
using MimeTypes = MediaBrowser.Model.Net.MimeTypes;
diff --git a/MediaBrowser.Api/Playback/MediaInfoService.cs b/MediaBrowser.Api/Playback/MediaInfoService.cs
index fcb8c34f3e..80885271c2 100644
--- a/MediaBrowser.Api/Playback/MediaInfoService.cs
+++ b/MediaBrowser.Api/Playback/MediaInfoService.cs
@@ -146,7 +146,7 @@ namespace MediaBrowser.Api.Playback
Task.WaitAll(task);
}
- public async Task<object> Post(GetPostedPlaybackInfo request)
+ public async Task<PlaybackInfoResponse> GetPlaybackInfo(GetPostedPlaybackInfo request)
{
var authInfo = _authContext.GetAuthorizationInfo(Request);
@@ -172,7 +172,14 @@ namespace MediaBrowser.Api.Playback
SetDeviceSpecificData(request.Id, info, profile, authInfo, request.MaxStreamingBitrate ?? profile.MaxStreamingBitrate, request.StartTimeTicks ?? 0, mediaSourceId, request.AudioStreamIndex, request.SubtitleStreamIndex, request.MaxAudioChannels, request.UserId);
}
- return ToOptimizedResult(info);
+ return info;
+ }
+
+ public async Task<object> Post(GetPostedPlaybackInfo request)
+ {
+ var result = await GetPlaybackInfo(request).ConfigureAwait(false);
+
+ return ToOptimizedResult(result);
}
private T Clone<T>(T obj)
diff --git a/MediaBrowser.Api/Playback/Progressive/AudioService.cs b/MediaBrowser.Api/Playback/Progressive/AudioService.cs
index a0ab906646..04825c7a57 100644
--- a/MediaBrowser.Api/Playback/Progressive/AudioService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/AudioService.cs
@@ -26,8 +26,6 @@ namespace MediaBrowser.Api.Playback.Progressive
[Route("/Audio/{Id}/stream", "HEAD", Summary = "Gets an audio stream")]
public class GetAudioStream : StreamRequest
{
- [ApiMember(Name = "Container", Description = "Container", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
- public string Container { get; set; }
}
/// <summary>
diff --git a/MediaBrowser.Api/Playback/StreamRequest.cs b/MediaBrowser.Api/Playback/StreamRequest.cs
index 6bdb30890e..f223c99efa 100644
--- a/MediaBrowser.Api/Playback/StreamRequest.cs
+++ b/MediaBrowser.Api/Playback/StreamRequest.cs
@@ -22,6 +22,9 @@ namespace MediaBrowser.Api.Playback
[ApiMember(Name = "DeviceId", Description = "The device id of the client requesting. Used to stop encoding processes when needed.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
public string DeviceId { get; set; }
+ [ApiMember(Name = "Container", Description = "Container", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
+ public string Container { get; set; }
+
/// <summary>
/// Gets or sets the audio codec.
/// </summary>
diff --git a/MediaBrowser.Api/Playback/UniversalAudioService.cs b/MediaBrowser.Api/Playback/UniversalAudioService.cs
new file mode 100644
index 0000000000..a52ae1df4c
--- /dev/null
+++ b/MediaBrowser.Api/Playback/UniversalAudioService.cs
@@ -0,0 +1,248 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using MediaBrowser.Api.Playback.Hls;
+using MediaBrowser.Api.Playback.Progressive;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Devices;
+using MediaBrowser.Controller.Dlna;
+using MediaBrowser.Controller.Drawing;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.MediaInfo;
+using MediaBrowser.Model.Serialization;
+using MediaBrowser.Model.Services;
+
+namespace MediaBrowser.Api.Playback
+{
+ public class BaseUniversalRequest
+ {
+ /// <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 = "MediaSourceId", Description = "The media version id, if playing an alternate version", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
+ public string MediaSourceId { get; set; }
+
+ [ApiMember(Name = "DeviceId", Description = "The device id of the client requesting. Used to stop encoding processes when needed.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
+ public string DeviceId { get; set; }
+
+ public string Token { get; set; }
+
+ public string UserId { get; set; }
+ public string AudioCodec { get; set; }
+ public string Container { get; set; }
+
+ public int? MaxAudioChannels { get; set; }
+
+ public long? MaxStreamingBitrate { get; set; }
+
+ [ApiMember(Name = "StartTimeTicks", Description = "Optional. Specify a starting offset, in ticks. 1 tick = 10000 ms", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
+ public long? StartTimeTicks { get; set; }
+ }
+
+ [Route("/Audio/{Id}/universal.{Container}", "GET", Summary = "Gets an audio stream")]
+ [Route("/Audio/{Id}/universal", "GET", Summary = "Gets an audio stream")]
+ [Route("/Audio/{Id}/universal.{Container}", "HEAD", Summary = "Gets an audio stream")]
+ [Route("/Audio/{Id}/universal", "HEAD", Summary = "Gets an audio stream")]
+ public class GetUniversalAudioStream : BaseUniversalRequest
+ {
+ }
+
+ //[Authenticated]
+ public class UniversalAudioService : BaseApiService
+ {
+ public UniversalAudioService(IServerConfigurationManager serverConfigurationManager, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IDlnaManager dlnaManager, IDeviceManager deviceManager, ISubtitleEncoder subtitleEncoder, IMediaSourceManager mediaSourceManager, IZipClient zipClient, IJsonSerializer jsonSerializer, IAuthorizationContext authorizationContext, IImageProcessor imageProcessor, INetworkManager networkManager)
+ {
+ ServerConfigurationManager = serverConfigurationManager;
+ UserManager = userManager;
+ LibraryManager = libraryManager;
+ IsoManager = isoManager;
+ MediaEncoder = mediaEncoder;
+ FileSystem = fileSystem;
+ DlnaManager = dlnaManager;
+ DeviceManager = deviceManager;
+ SubtitleEncoder = subtitleEncoder;
+ MediaSourceManager = mediaSourceManager;
+ ZipClient = zipClient;
+ JsonSerializer = jsonSerializer;
+ AuthorizationContext = authorizationContext;
+ ImageProcessor = imageProcessor;
+ NetworkManager = networkManager;
+ }
+
+ protected IServerConfigurationManager ServerConfigurationManager { get; private set; }
+ protected IUserManager UserManager { get; private set; }
+ protected ILibraryManager LibraryManager { get; private set; }
+ protected IIsoManager IsoManager { get; private set; }
+ protected IMediaEncoder MediaEncoder { get; private set; }
+ protected IFileSystem FileSystem { get; private set; }
+ protected IDlnaManager DlnaManager { get; private set; }
+ protected IDeviceManager DeviceManager { get; private set; }
+ protected ISubtitleEncoder SubtitleEncoder { get; private set; }
+ protected IMediaSourceManager MediaSourceManager { get; private set; }
+ protected IZipClient ZipClient { get; private set; }
+ protected IJsonSerializer JsonSerializer { get; private set; }
+ protected IAuthorizationContext AuthorizationContext { get; private set; }
+ protected IImageProcessor ImageProcessor { get; private set; }
+ protected INetworkManager NetworkManager { get; private set; }
+
+ public Task<object> Get(GetUniversalAudioStream request)
+ {
+ return GetUniversalStream(request, false);
+ }
+
+ public Task<object> Head(GetUniversalAudioStream request)
+ {
+ return GetUniversalStream(request, true);
+ }
+
+ private DeviceProfile GetDeviceProfile(GetUniversalAudioStream request)
+ {
+ var deviceProfile = new DeviceProfile();
+
+ var directPlayProfiles = new List<DirectPlayProfile>();
+
+ directPlayProfiles.Add(new DirectPlayProfile
+ {
+ Type = DlnaProfileType.Audio,
+ Container = request.Container
+ });
+
+ deviceProfile.DirectPlayProfiles = directPlayProfiles.ToArray();
+
+ deviceProfile.TranscodingProfiles = new[]
+ {
+ new TranscodingProfile
+ {
+ Type = DlnaProfileType.Audio,
+ Context = EncodingContext.Streaming,
+ Container = "ts",
+ AudioCodec = "aac",
+ Protocol = "hls"
+ }
+ };
+
+ return deviceProfile;
+ }
+
+ private async Task<object> GetUniversalStream(GetUniversalAudioStream request, bool isHeadRequest)
+ {
+ var deviceProfile = GetDeviceProfile(request);
+
+ AuthorizationContext.GetAuthorizationInfo(Request).DeviceId = request.DeviceId;
+
+ var mediaInfoService = new MediaInfoService(MediaSourceManager, DeviceManager, LibraryManager, ServerConfigurationManager, NetworkManager, MediaEncoder, UserManager, JsonSerializer, AuthorizationContext)
+ {
+ Request = Request
+ };
+
+ var playbackInfoResult = await mediaInfoService.GetPlaybackInfo(new GetPostedPlaybackInfo
+ {
+ Id = request.Id,
+ MaxAudioChannels = request.MaxAudioChannels,
+ MaxStreamingBitrate = request.MaxStreamingBitrate,
+ StartTimeTicks = request.StartTimeTicks,
+ UserId = request.UserId,
+ DeviceProfile = deviceProfile,
+ MediaSourceId = request.MediaSourceId
+
+ }).ConfigureAwait(false);
+
+ var mediaSource = playbackInfoResult.MediaSources[0];
+
+ var isStatic = mediaSource.SupportsDirectStream;
+
+ if (!isStatic && string.Equals(mediaSource.TranscodingSubProtocol, "hls", StringComparison.OrdinalIgnoreCase))
+ {
+ var service = new DynamicHlsService(ServerConfigurationManager,
+ UserManager,
+ LibraryManager,
+ IsoManager,
+ MediaEncoder,
+ FileSystem,
+ DlnaManager,
+ SubtitleEncoder,
+ DeviceManager,
+ MediaSourceManager,
+ ZipClient,
+ JsonSerializer,
+ AuthorizationContext,
+ NetworkManager)
+ {
+ Request = Request
+ };
+
+ var transcodingProfile = deviceProfile.TranscodingProfiles[0];
+
+ var newRequest = new GetMasterHlsAudioPlaylist
+ {
+ AudioBitRate = isStatic ? (int?)null : Convert.ToInt32(Math.Min(request.MaxStreamingBitrate ?? 192000, int.MaxValue)),
+ AudioCodec = transcodingProfile.AudioCodec,
+ Container = ".m3u8",
+ DeviceId = request.DeviceId,
+ Id = request.Id,
+ MaxAudioChannels = request.MaxAudioChannels,
+ MediaSourceId = mediaSource.Id,
+ PlaySessionId = playbackInfoResult.PlaySessionId,
+ StartTimeTicks = request.StartTimeTicks,
+ Static = isStatic
+ };
+
+ if (isHeadRequest)
+ {
+ return service.Head(newRequest);
+ }
+ return service.Get(newRequest);
+ }
+ else
+ {
+ var service = new AudioService(ServerConfigurationManager,
+ UserManager,
+ LibraryManager,
+ IsoManager,
+ MediaEncoder,
+ FileSystem,
+ DlnaManager,
+ SubtitleEncoder,
+ DeviceManager,
+ MediaSourceManager,
+ ZipClient,
+ JsonSerializer,
+ AuthorizationContext,
+ ImageProcessor)
+ {
+ Request = Request
+ };
+
+ var newRequest = new GetAudioStream
+ {
+ AudioBitRate = isStatic ? (int?)null : Convert.ToInt32(Math.Min(request.MaxStreamingBitrate ?? 192000, int.MaxValue)),
+ //AudioCodec = request.AudioCodec,
+ Container = isStatic ? null : ("." + mediaSource.TranscodingContainer),
+ DeviceId = request.DeviceId,
+ Id = request.Id,
+ MaxAudioChannels = request.MaxAudioChannels,
+ MediaSourceId = mediaSource.Id,
+ PlaySessionId = playbackInfoResult.PlaySessionId,
+ StartTimeTicks = request.StartTimeTicks,
+ Static = isStatic
+ };
+
+ if (isHeadRequest)
+ {
+ return service.Head(newRequest);
+ }
+ return service.Get(newRequest);
+ }
+ }
+ }
+}
diff --git a/MediaBrowser.Api/Reports/ReportsService.cs b/MediaBrowser.Api/Reports/ReportsService.cs
index cb275fa294..5e13c16539 100644
--- a/MediaBrowser.Api/Reports/ReportsService.cs
+++ b/MediaBrowser.Api/Reports/ReportsService.cs
@@ -317,12 +317,6 @@ namespace MediaBrowser.Api.Reports
query.MaxParentalRating = _localization.GetRatingLevel(request.MaxOfficialRating);
}
- // Albums
- if (!string.IsNullOrEmpty(request.Albums))
- {
- query.AlbumNames = request.Albums.Split('|');
- }
-
return query;
}
diff --git a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
index 5b939244e1..c1cc1555de 100644
--- a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
+++ b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
@@ -245,25 +245,15 @@ namespace MediaBrowser.Api.UserLibrary
User user = null;
BaseItem parentItem;
- List<BaseItem> libraryItems = null;
if (!string.IsNullOrWhiteSpace(request.UserId))
{
user = UserManager.GetUserById(request.UserId);
parentItem = string.IsNullOrEmpty(request.ParentId) ? user.RootFolder : LibraryManager.GetItemById(request.ParentId);
-
- if (RequiresLibraryItems(request, dtoOptions))
- {
- libraryItems = user.RootFolder.GetRecursiveChildren(user).ToList();
- }
}
else
{
parentItem = string.IsNullOrEmpty(request.ParentId) ? LibraryManager.RootFolder : LibraryManager.GetItemById(request.ParentId);
- if (RequiresLibraryItems(request, dtoOptions))
- {
- libraryItems = LibraryManager.RootFolder.GetRecursiveChildren().ToList();
- }
}
IEnumerable<BaseItem> items;
@@ -307,8 +297,6 @@ namespace MediaBrowser.Api.UserLibrary
var filteredItems = FilterItems(request, extractedItems, user);
- filteredItems = FilterByLibraryItems(request, filteredItems.Cast<IItemByName>(), user, libraryItems).Cast<BaseItem>();
-
filteredItems = LibraryManager.Sort(filteredItems, user, request.GetOrderBy(), request.SortOrder ?? SortOrder.Ascending);
var ibnItemsArray = filteredItems.ToList();
@@ -334,15 +322,7 @@ namespace MediaBrowser.Api.UserLibrary
}
- IEnumerable<Tuple<BaseItem, List<BaseItem>>> tuples;
- if (dtoOptions.Fields.Contains(ItemFields.ItemCounts))
- {
- tuples = ibnItems.Select(i => new Tuple<BaseItem, List<BaseItem>>(i, ((IItemByName)i).GetTaggedItems(libraryItems).ToList()));
- }
- else
- {
- tuples = ibnItems.Select(i => new Tuple<BaseItem, List<BaseItem>>(i, new List<BaseItem>()));
- }
+ var tuples = ibnItems.Select(i => new Tuple<BaseItem, List<BaseItem>>(i, new List<BaseItem>()));
var syncProgess = DtoService.GetSyncedItemProgress(dtoOptions);
var dtos = tuples.Select(i => DtoService.GetItemByNameDto(i.Item1, dtoOptions, i.Item2, syncProgess, user));
@@ -352,52 +332,6 @@ namespace MediaBrowser.Api.UserLibrary
return result;
}
- private bool RequiresLibraryItems(GetItemsByName request, DtoOptions options)
- {
- var filters = request.GetFilters().ToList();
-
- if (filters.Contains(ItemFilter.IsPlayed))
- {
- return true;
- }
-
- if (filters.Contains(ItemFilter.IsUnplayed))
- {
- return true;
- }
-
- if (request.IsPlayed.HasValue)
- {
- return true;
- }
-
- return options.Fields.Contains(ItemFields.ItemCounts);
- }
-
- private IEnumerable<IItemByName> FilterByLibraryItems(GetItemsByName request, IEnumerable<IItemByName> items, User user, IEnumerable<BaseItem> libraryItems)
- {
- var filters = request.GetFilters().ToList();
-
- if (filters.Contains(ItemFilter.IsPlayed))
- {
- items = items.Where(i => i.GetTaggedItems(libraryItems).All(l => l.IsPlayed(user)));
- }
-
- if (filters.Contains(ItemFilter.IsUnplayed))
- {
- items = items.Where(i => i.GetTaggedItems(libraryItems).All(l => l.IsUnplayed(user)));
- }
-
- if (request.IsPlayed.HasValue)
- {
- var val = request.IsPlayed.Value;
-
- items = items.Where(i => i.GetTaggedItems(libraryItems).All(l => l.IsPlayed(user)) == val);
- }
-
- return items;
- }
-
/// <summary>
/// Filters the items.
/// </summary>
diff --git a/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs b/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs
index 0594691a2d..1acbce6dbd 100644
--- a/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs
+++ b/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs
@@ -277,6 +277,8 @@ namespace MediaBrowser.Api.UserLibrary
[ApiMember(Name = "Albums", Description = "Optional. If specified, results will be filtered based on album. This allows multiple, pipe delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
public string Albums { get; set; }
+ public string AlbumIds { get; set; }
+
/// <summary>
/// Gets or sets the item ids.
/// </summary>
diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs
index 8300beac3b..5d267d0598 100644
--- a/MediaBrowser.Api/UserLibrary/ItemsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs
@@ -9,6 +9,7 @@ using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Threading.Tasks;
+using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Model.Globalization;
using MediaBrowser.Model.Services;
@@ -359,15 +360,30 @@ namespace MediaBrowser.Api.UserLibrary
}
// ExcludeArtistIds
- if (!string.IsNullOrEmpty(request.ExcludeArtistIds))
+ if (!string.IsNullOrWhiteSpace(request.ExcludeArtistIds))
{
query.ExcludeArtistIds = request.ExcludeArtistIds.Split('|');
}
+ if (!string.IsNullOrWhiteSpace(request.AlbumIds))
+ {
+ query.AlbumIds = request.AlbumIds.Split('|');
+ }
+
// Albums
if (!string.IsNullOrEmpty(request.Albums))
{
- query.AlbumNames = request.Albums.Split('|');
+ query.AlbumIds = request.Albums.Split('|').Select(i =>
+ {
+ return _libraryManager.GetItemList(new InternalItemsQuery
+ {
+ IncludeItemTypes = new[] { typeof(MusicAlbum).Name },
+ Name = i,
+ Limit = 1
+
+ }).Select(album => album.Id.ToString("N")).FirstOrDefault();
+
+ }).ToArray();
}
// Studios
diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
index 08aba90d2c..32f3a1f003 100644
--- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
@@ -360,7 +360,8 @@ namespace MediaBrowser.Api.UserLibrary
var currentUser = user;
var dtos = series
- .GetRecursiveChildren(i => i is Episode && i.ParentIndexNumber.HasValue && i.ParentIndexNumber.Value == 0)
+ .GetEpisodes(user)
+ .Where(i => i.ParentIndexNumber.HasValue && i.ParentIndexNumber.Value == 0)
.OrderBy(i =>
{
if (i.PremiereDate.HasValue)
generated by cgit v1.2.3 (git 2.46.0) at 2026-05-01 13:03:13 +0000