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/Hls/DynamicHlsService.cs5
-rw-r--r--MediaBrowser.Api/Playback/Hls/VideoHlsService.cs8
-rw-r--r--MediaBrowser.Api/SuggestionsService.cs104
-rw-r--r--MediaBrowser.Api/TvShowsService.cs36
5 files changed, 145 insertions, 9 deletions
diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index c2c8d1102..0785b904a 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -134,6 +134,7 @@
<Compile Include="SearchService.cs" />
<Compile Include="Session\SessionsService.cs" />
<Compile Include="SimilarItemsHelper.cs" />
+ <Compile Include="SuggestionsService.cs" />
<Compile Include="System\ActivityLogService.cs" />
<Compile Include="System\ActivityLogWebSocketListener.cs" />
<Compile Include="System\SystemService.cs" />
diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
index 43f25145e..038d76245 100644
--- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
@@ -826,6 +826,11 @@ namespace MediaBrowser.Api.Playback.Hls
args += " -ab " + bitrate.Value.ToString(UsCulture);
}
+ if (state.OutputAudioSampleRate.HasValue)
+ {
+ args += " -ar " + state.OutputAudioSampleRate.Value.ToString(UsCulture);
+ }
+
args += " " + EncodingHelper.GetAudioFilterParam(state, ApiEntryPoint.Instance.GetEncodingOptions(), true);
return args;
diff --git a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
index 71b1dc1b1..a813d7a87 100644
--- a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
@@ -6,10 +6,7 @@ using MediaBrowser.Controller.MediaEncoding;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Serialization;
using System;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Controller.IO;
using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.IO;
using MediaBrowser.Model.Dlna;
using MediaBrowser.Model.Services;
@@ -60,6 +57,11 @@ namespace MediaBrowser.Api.Playback.Hls
args += " -ab " + bitrate.Value.ToString(UsCulture);
}
+ if (state.OutputAudioSampleRate.HasValue)
+ {
+ args += " -ar " + state.OutputAudioSampleRate.Value.ToString(UsCulture);
+ }
+
args += " " + EncodingHelper.GetAudioFilterParam(state, ApiEntryPoint.Instance.GetEncodingOptions(), true);
return args;
diff --git a/MediaBrowser.Api/SuggestionsService.cs b/MediaBrowser.Api/SuggestionsService.cs
new file mode 100644
index 000000000..7196c0f39
--- /dev/null
+++ b/MediaBrowser.Api/SuggestionsService.cs
@@ -0,0 +1,104 @@
+using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Querying;
+using MediaBrowser.Model.Services;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using MediaBrowser.Controller.Library;
+
+namespace MediaBrowser.Api
+{
+ [Route("/Users/{UserId}/Suggestions", "GET", Summary = "Gets items based on a query.")]
+ public class GetSuggestedItems : IReturn<QueryResult<BaseItem>>
+ {
+ public string MediaType { get; set; }
+ public string Type { get; set; }
+ public string UserId { get; set; }
+ public bool EnableTotalRecordCount { get; set; }
+ public int? StartIndex { get; set; }
+ public int? Limit { get; set; }
+
+ public string[] GetMediaTypes()
+ {
+ return (MediaType ?? string.Empty).Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+ }
+
+ public string[] GetIncludeItemTypes()
+ {
+ return (Type ?? string.Empty).Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+ }
+ }
+
+ public class SuggestionsService : BaseApiService
+ {
+ private readonly IDtoService _dtoService;
+ private readonly IAuthorizationContext _authContext;
+ private readonly IUserManager _userManager;
+ private readonly ILibraryManager _libraryManager;
+
+ public SuggestionsService(IDtoService dtoService, IAuthorizationContext authContext, IUserManager userManager, ILibraryManager libraryManager)
+ {
+ _dtoService = dtoService;
+ _authContext = authContext;
+ _userManager = userManager;
+ _libraryManager = libraryManager;
+ }
+
+ public async Task<object> Get(GetSuggestedItems request)
+ {
+ var result = await GetResultItems(request).ConfigureAwait(false);
+
+ return ToOptimizedResult(result);
+ }
+
+ private async Task<QueryResult<BaseItemDto>> GetResultItems(GetSuggestedItems request)
+ {
+ var user = !string.IsNullOrWhiteSpace(request.UserId) ? _userManager.GetUserById(request.UserId) : null;
+
+ var dtoOptions = GetDtoOptions(_authContext, request);
+ var result = GetItems(request, user, dtoOptions);
+
+ var dtoList = await _dtoService.GetBaseItemDtos(result.Items, dtoOptions, user).ConfigureAwait(false);
+
+ if (dtoList == null)
+ {
+ throw new InvalidOperationException("GetBaseItemDtos returned null");
+ }
+
+ return new QueryResult<BaseItemDto>
+ {
+ TotalRecordCount = result.TotalRecordCount,
+ Items = dtoList.ToArray()
+ };
+ }
+
+ private QueryResult<BaseItem> GetItems(GetSuggestedItems request, User user, DtoOptions dtoOptions)
+ {
+ var query = new InternalItemsQuery(user)
+ {
+ SortBy = new string[] { ItemSortBy.Random },
+ MediaTypes = request.GetMediaTypes(),
+ IncludeItemTypes = request.GetIncludeItemTypes(),
+ IsVirtualItem = false,
+ StartIndex = request.StartIndex,
+ Limit = request.Limit,
+ DtoOptions = dtoOptions
+ };
+
+ if (request.EnableTotalRecordCount)
+ {
+ return _libraryManager.GetItemsResult(query);
+ }
+
+ var items = _libraryManager.GetItemList(query).ToArray();
+
+ return new QueryResult<BaseItem>
+ {
+ Items = items
+ };
+ }
+ }
+}
diff --git a/MediaBrowser.Api/TvShowsService.cs b/MediaBrowser.Api/TvShowsService.cs
index 43fe74d5f..d7f017e1d 100644
--- a/MediaBrowser.Api/TvShowsService.cs
+++ b/MediaBrowser.Api/TvShowsService.cs
@@ -137,6 +137,7 @@ namespace MediaBrowser.Api
}
[Route("/Shows/{Id}/Episodes", "GET", Summary = "Gets episodes for a tv season")]
+ [Route("/Shows/Episodes", "GET", Summary = "Gets episodes for a tv season")]
public class GetEpisodes : IReturn<ItemsResult>, IHasItemFields, IHasDtoOptions
{
/// <summary>
@@ -200,9 +201,11 @@ namespace MediaBrowser.Api
[ApiMember(Name = "EnableUserData", Description = "Optional, include user data", IsRequired = false, DataType = "boolean", ParameterType = "query", Verb = "GET")]
public bool? EnableUserData { get; set; }
+ public string SeriesName { get; set; }
}
[Route("/Shows/{Id}/Seasons", "GET", Summary = "Gets seasons for a tv series")]
+ [Route("/Shows/Seasons", "GET", Summary = "Gets seasons for a tv series")]
public class GetSeasons : IReturn<ItemsResult>, IHasItemFields, IHasDtoOptions
{
/// <summary>
@@ -246,6 +249,7 @@ namespace MediaBrowser.Api
[ApiMember(Name = "EnableUserData", Description = "Optional, include user data", IsRequired = false, DataType = "boolean", ParameterType = "query", Verb = "GET")]
public bool? EnableUserData { get; set; }
+ public string SeriesName { get; set; }
}
/// <summary>
@@ -427,11 +431,11 @@ namespace MediaBrowser.Api
{
var user = _userManager.GetUserById(request.UserId);
- var series = _libraryManager.GetItemById(request.Id) as Series;
+ var series = GetSeries(request.Id, request.SeriesName, user);
if (series == null)
{
- throw new ResourceNotFoundException("No series exists with Id " + request.Id);
+ throw new ResourceNotFoundException("Series not found");
}
var seasons = (await series.GetItems(new InternalItemsQuery(user)
@@ -455,6 +459,26 @@ namespace MediaBrowser.Api
};
}
+ private Series GetSeries(string seriesId, string seriesName, User user)
+ {
+ if (!string.IsNullOrWhiteSpace(seriesId))
+ {
+ return _libraryManager.GetItemById(seriesId) as Series;
+ }
+
+ if (!string.IsNullOrWhiteSpace(seriesName))
+ {
+ return _libraryManager.GetItemList(new InternalItemsQuery(user)
+ {
+ Name = seriesName,
+ IncludeItemTypes = new string[] { typeof(Series).Name }
+
+ }).OfType<Series>().FirstOrDefault();
+ }
+
+ return null;
+ }
+
public async Task<object> Get(GetEpisodes request)
{
var user = _userManager.GetUserById(request.UserId);
@@ -474,11 +498,11 @@ namespace MediaBrowser.Api
}
else if (request.Season.HasValue)
{
- var series = _libraryManager.GetItemById(request.Id) as Series;
+ var series = GetSeries(request.Id, request.SeriesName, user);
if (series == null)
{
- throw new ResourceNotFoundException("No series exists with Id " + request.Id);
+ throw new ResourceNotFoundException("Series not found");
}
var season = series.GetSeasons(user).FirstOrDefault(i => i.IndexNumber == request.Season.Value);
@@ -494,11 +518,11 @@ namespace MediaBrowser.Api
}
else
{
- var series = _libraryManager.GetItemById(request.Id) as Series;
+ var series = GetSeries(request.Id, request.SeriesName, user);
if (series == null)
{
- throw new ResourceNotFoundException("No series exists with Id " + request.Id);
+ throw new ResourceNotFoundException("Series not found");
}
episodes = series.GetEpisodes(user);
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-07 21:50:39 +0000