commit
b4a773fde8
@ -1,44 +0,0 @@
|
|||||||
using MediaBrowser.Common.Configuration;
|
|
||||||
using MediaBrowser.Controller.Configuration;
|
|
||||||
using MediaBrowser.Controller.Net;
|
|
||||||
using MediaBrowser.Model.Branding;
|
|
||||||
using MediaBrowser.Model.Services;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
|
|
||||||
namespace MediaBrowser.Api
|
|
||||||
{
|
|
||||||
[Route("/Branding/Configuration", "GET", Summary = "Gets branding configuration")]
|
|
||||||
public class GetBrandingOptions : IReturn<BrandingOptions>
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
[Route("/Branding/Css", "GET", Summary = "Gets custom css")]
|
|
||||||
[Route("/Branding/Css.css", "GET", Summary = "Gets custom css")]
|
|
||||||
public class GetBrandingCss
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public class BrandingService : BaseApiService
|
|
||||||
{
|
|
||||||
public BrandingService(
|
|
||||||
ILogger<BrandingService> logger,
|
|
||||||
IServerConfigurationManager serverConfigurationManager,
|
|
||||||
IHttpResultFactory httpResultFactory)
|
|
||||||
: base(logger, serverConfigurationManager, httpResultFactory)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public object Get(GetBrandingOptions request)
|
|
||||||
{
|
|
||||||
return ServerConfigurationManager.GetConfiguration<BrandingOptions>("branding");
|
|
||||||
}
|
|
||||||
|
|
||||||
public object Get(GetBrandingCss request)
|
|
||||||
{
|
|
||||||
var result = ServerConfigurationManager.GetConfiguration<BrandingOptions>("branding");
|
|
||||||
|
|
||||||
// When null this throws a 405 error under Mono OSX, so default to empty string
|
|
||||||
return ResultFactory.GetResult(Request, result.CustomCss ?? string.Empty, "text/css");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,217 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using MediaBrowser.Controller.Configuration;
|
|
||||||
using MediaBrowser.Controller.Dto;
|
|
||||||
using MediaBrowser.Controller.Library;
|
|
||||||
using MediaBrowser.Controller.Net;
|
|
||||||
using MediaBrowser.Controller.Playlists;
|
|
||||||
using MediaBrowser.Model.Dto;
|
|
||||||
using MediaBrowser.Model.Playlists;
|
|
||||||
using MediaBrowser.Model.Querying;
|
|
||||||
using MediaBrowser.Model.Services;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
|
|
||||||
namespace MediaBrowser.Api
|
|
||||||
{
|
|
||||||
[Route("/Playlists", "POST", Summary = "Creates a new playlist")]
|
|
||||||
public class CreatePlaylist : IReturn<PlaylistCreationResult>
|
|
||||||
{
|
|
||||||
[ApiMember(Name = "Name", Description = "The name of the new playlist.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
|
|
||||||
public string Name { get; set; }
|
|
||||||
|
|
||||||
[ApiMember(Name = "Ids", Description = "Item Ids to add to the playlist", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST", AllowMultiple = true)]
|
|
||||||
public string Ids { get; set; }
|
|
||||||
|
|
||||||
[ApiMember(Name = "UserId", Description = "User Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
|
|
||||||
public Guid UserId { get; set; }
|
|
||||||
|
|
||||||
[ApiMember(Name = "MediaType", Description = "The playlist media type", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
|
|
||||||
public string MediaType { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
[Route("/Playlists/{Id}/Items", "POST", Summary = "Adds items to a playlist")]
|
|
||||||
public class AddToPlaylist : IReturnVoid
|
|
||||||
{
|
|
||||||
[ApiMember(Name = "Ids", Description = "Item id, comma delimited", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
|
|
||||||
public string Ids { get; set; }
|
|
||||||
|
|
||||||
[ApiMember(Name = "Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
|
|
||||||
public string Id { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the user id.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The user id.</value>
|
|
||||||
[ApiMember(Name = "UserId", Description = "User Id", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
|
|
||||||
public Guid UserId { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
[Route("/Playlists/{Id}/Items/{ItemId}/Move/{NewIndex}", "POST", Summary = "Moves a playlist item")]
|
|
||||||
public class MoveItem : IReturnVoid
|
|
||||||
{
|
|
||||||
[ApiMember(Name = "ItemId", Description = "ItemId", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
|
|
||||||
public string ItemId { get; set; }
|
|
||||||
|
|
||||||
[ApiMember(Name = "Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
|
|
||||||
public string Id { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the user id.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The user id.</value>
|
|
||||||
[ApiMember(Name = "NewIndex", Description = "NewIndex", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
|
|
||||||
public int NewIndex { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
[Route("/Playlists/{Id}/Items", "DELETE", Summary = "Removes items from a playlist")]
|
|
||||||
public class RemoveFromPlaylist : IReturnVoid
|
|
||||||
{
|
|
||||||
[ApiMember(Name = "Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "DELETE")]
|
|
||||||
public string Id { get; set; }
|
|
||||||
|
|
||||||
[ApiMember(Name = "EntryIds", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "DELETE")]
|
|
||||||
public string EntryIds { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
[Route("/Playlists/{Id}/Items", "GET", Summary = "Gets the original items of a playlist")]
|
|
||||||
public class GetPlaylistItems : IReturn<QueryResult<BaseItemDto>>, IHasDtoOptions
|
|
||||||
{
|
|
||||||
[ApiMember(Name = "Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "DELETE")]
|
|
||||||
public Guid Id { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the user id.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The user id.</value>
|
|
||||||
[ApiMember(Name = "UserId", Description = "User Id", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
|
|
||||||
public Guid UserId { 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>
|
|
||||||
/// Fields to return within the items, in addition to basic information
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The fields.</value>
|
|
||||||
[ApiMember(Name = "Fields", Description = "Optional. Specify additional fields of information to return in the output. This allows multiple, comma delimeted. Options: Budget, Chapters, DateCreated, Genres, HomePageUrl, IndexOptions, MediaStreams, Overview, ParentId, Path, People, ProviderIds, PrimaryImageAspectRatio, Revenue, SortName, Studios, Taglines", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
|
|
||||||
public string Fields { get; set; }
|
|
||||||
|
|
||||||
[ApiMember(Name = "EnableImages", Description = "Optional, include image information in output", IsRequired = false, DataType = "boolean", ParameterType = "query", Verb = "GET")]
|
|
||||||
public bool? EnableImages { get; set; }
|
|
||||||
|
|
||||||
[ApiMember(Name = "EnableUserData", Description = "Optional, include user data", IsRequired = false, DataType = "boolean", ParameterType = "query", Verb = "GET")]
|
|
||||||
public bool? EnableUserData { get; set; }
|
|
||||||
|
|
||||||
[ApiMember(Name = "ImageTypeLimit", Description = "Optional, the max number of images to return, per image type", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
|
|
||||||
public int? ImageTypeLimit { get; set; }
|
|
||||||
|
|
||||||
[ApiMember(Name = "EnableImageTypes", Description = "Optional. The image types to include in the output.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
|
|
||||||
public string EnableImageTypes { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
[Authenticated]
|
|
||||||
public class PlaylistService : BaseApiService
|
|
||||||
{
|
|
||||||
private readonly IPlaylistManager _playlistManager;
|
|
||||||
private readonly IDtoService _dtoService;
|
|
||||||
private readonly IUserManager _userManager;
|
|
||||||
private readonly ILibraryManager _libraryManager;
|
|
||||||
private readonly IAuthorizationContext _authContext;
|
|
||||||
|
|
||||||
public PlaylistService(
|
|
||||||
ILogger<PlaylistService> logger,
|
|
||||||
IServerConfigurationManager serverConfigurationManager,
|
|
||||||
IHttpResultFactory httpResultFactory,
|
|
||||||
IDtoService dtoService,
|
|
||||||
IPlaylistManager playlistManager,
|
|
||||||
IUserManager userManager,
|
|
||||||
ILibraryManager libraryManager,
|
|
||||||
IAuthorizationContext authContext)
|
|
||||||
: base(logger, serverConfigurationManager, httpResultFactory)
|
|
||||||
{
|
|
||||||
_dtoService = dtoService;
|
|
||||||
_playlistManager = playlistManager;
|
|
||||||
_userManager = userManager;
|
|
||||||
_libraryManager = libraryManager;
|
|
||||||
_authContext = authContext;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Post(MoveItem request)
|
|
||||||
{
|
|
||||||
_playlistManager.MoveItem(request.Id, request.ItemId, request.NewIndex);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<object> Post(CreatePlaylist request)
|
|
||||||
{
|
|
||||||
var result = await _playlistManager.CreatePlaylist(new PlaylistCreationRequest
|
|
||||||
{
|
|
||||||
Name = request.Name,
|
|
||||||
ItemIdList = GetGuids(request.Ids),
|
|
||||||
UserId = request.UserId,
|
|
||||||
MediaType = request.MediaType
|
|
||||||
|
|
||||||
}).ConfigureAwait(false);
|
|
||||||
|
|
||||||
return ToOptimizedResult(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Post(AddToPlaylist request)
|
|
||||||
{
|
|
||||||
_playlistManager.AddToPlaylist(request.Id, GetGuids(request.Ids), request.UserId);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Delete(RemoveFromPlaylist request)
|
|
||||||
{
|
|
||||||
_playlistManager.RemoveFromPlaylist(request.Id, request.EntryIds.Split(','));
|
|
||||||
}
|
|
||||||
|
|
||||||
public object Get(GetPlaylistItems request)
|
|
||||||
{
|
|
||||||
var playlist = (Playlist)_libraryManager.GetItemById(request.Id);
|
|
||||||
var user = !request.UserId.Equals(Guid.Empty) ? _userManager.GetUserById(request.UserId) : null;
|
|
||||||
|
|
||||||
var items = playlist.GetManageableItems().ToArray();
|
|
||||||
|
|
||||||
var count = items.Length;
|
|
||||||
|
|
||||||
if (request.StartIndex.HasValue)
|
|
||||||
{
|
|
||||||
items = items.Skip(request.StartIndex.Value).ToArray();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (request.Limit.HasValue)
|
|
||||||
{
|
|
||||||
items = items.Take(request.Limit.Value).ToArray();
|
|
||||||
}
|
|
||||||
|
|
||||||
var dtoOptions = GetDtoOptions(_authContext, request);
|
|
||||||
|
|
||||||
var dtos = _dtoService.GetBaseItemDtos(items.Select(i => i.Item2).ToList(), dtoOptions, user);
|
|
||||||
|
|
||||||
for (int index = 0; index < dtos.Count; index++)
|
|
||||||
{
|
|
||||||
dtos[index].PlaylistItemId = items[index].Item1.Id;
|
|
||||||
}
|
|
||||||
|
|
||||||
var result = new QueryResult<BaseItemDto>
|
|
||||||
{
|
|
||||||
Items = dtos,
|
|
||||||
TotalRecordCount = count
|
|
||||||
};
|
|
||||||
|
|
||||||
return ToOptimizedResult(result);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,193 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Globalization;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Threading;
|
|
||||||
using MediaBrowser.Controller.Configuration;
|
|
||||||
using MediaBrowser.Controller.Dto;
|
|
||||||
using MediaBrowser.Controller.Entities;
|
|
||||||
using MediaBrowser.Controller.Library;
|
|
||||||
using MediaBrowser.Controller.Net;
|
|
||||||
using MediaBrowser.Model.Dto;
|
|
||||||
using MediaBrowser.Model.Querying;
|
|
||||||
using MediaBrowser.Model.Services;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
|
|
||||||
namespace MediaBrowser.Api
|
|
||||||
{
|
|
||||||
[Route("/Videos/{Id}/AdditionalParts", "GET", Summary = "Gets additional parts for a video.")]
|
|
||||||
[Authenticated]
|
|
||||||
public class GetAdditionalParts : IReturn<QueryResult<BaseItemDto>>
|
|
||||||
{
|
|
||||||
[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}/AlternateSources", "DELETE", Summary = "Removes alternate video sources.")]
|
|
||||||
[Authenticated(Roles = "Admin")]
|
|
||||||
public class DeleteAlternateSources : IReturnVoid
|
|
||||||
{
|
|
||||||
[ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "DELETE")]
|
|
||||||
public string Id { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
[Route("/Videos/MergeVersions", "POST", Summary = "Merges videos into a single record")]
|
|
||||||
[Authenticated(Roles = "Admin")]
|
|
||||||
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
|
|
||||||
{
|
|
||||||
private readonly ILibraryManager _libraryManager;
|
|
||||||
private readonly IUserManager _userManager;
|
|
||||||
private readonly IDtoService _dtoService;
|
|
||||||
private readonly IAuthorizationContext _authContext;
|
|
||||||
|
|
||||||
public VideosService(
|
|
||||||
ILogger<VideosService> logger,
|
|
||||||
IServerConfigurationManager serverConfigurationManager,
|
|
||||||
IHttpResultFactory httpResultFactory,
|
|
||||||
ILibraryManager libraryManager,
|
|
||||||
IUserManager userManager,
|
|
||||||
IDtoService dtoService,
|
|
||||||
IAuthorizationContext authContext)
|
|
||||||
: base(logger, serverConfigurationManager, httpResultFactory)
|
|
||||||
{
|
|
||||||
_libraryManager = libraryManager;
|
|
||||||
_userManager = userManager;
|
|
||||||
_dtoService = dtoService;
|
|
||||||
_authContext = authContext;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the specified request.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="request">The request.</param>
|
|
||||||
/// <returns>System.Object.</returns>
|
|
||||||
public object Get(GetAdditionalParts request)
|
|
||||||
{
|
|
||||||
var user = !request.UserId.Equals(Guid.Empty) ? _userManager.GetUserById(request.UserId) : null;
|
|
||||||
|
|
||||||
var item = string.IsNullOrEmpty(request.Id)
|
|
||||||
? (!request.UserId.Equals(Guid.Empty)
|
|
||||||
? _libraryManager.GetUserRootFolder()
|
|
||||||
: _libraryManager.RootFolder)
|
|
||||||
: _libraryManager.GetItemById(request.Id);
|
|
||||||
|
|
||||||
var dtoOptions = GetDtoOptions(_authContext, request);
|
|
||||||
|
|
||||||
BaseItemDto[] items;
|
|
||||||
if (item is Video video)
|
|
||||||
{
|
|
||||||
items = video.GetAdditionalParts()
|
|
||||||
.Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user, video))
|
|
||||||
.ToArray();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
items = Array.Empty<BaseItemDto>();
|
|
||||||
}
|
|
||||||
|
|
||||||
var result = new QueryResult<BaseItemDto>
|
|
||||||
{
|
|
||||||
Items = items,
|
|
||||||
TotalRecordCount = items.Length
|
|
||||||
};
|
|
||||||
|
|
||||||
return ToOptimizedResult(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Delete(DeleteAlternateSources request)
|
|
||||||
{
|
|
||||||
var video = (Video)_libraryManager.GetItemById(request.Id);
|
|
||||||
|
|
||||||
foreach (var link in video.GetLinkedAlternateVersions())
|
|
||||||
{
|
|
||||||
link.SetPrimaryVersionId(null);
|
|
||||||
link.LinkedAlternateVersions = Array.Empty<LinkedChild>();
|
|
||||||
|
|
||||||
link.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None);
|
|
||||||
}
|
|
||||||
|
|
||||||
video.LinkedAlternateVersions = Array.Empty<LinkedChild>();
|
|
||||||
video.SetPrimaryVersionId(null);
|
|
||||||
video.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Post(MergeVersions request)
|
|
||||||
{
|
|
||||||
var items = request.Ids.Split(',')
|
|
||||||
.Select(i => _libraryManager.GetItemById(i))
|
|
||||||
.OfType<Video>()
|
|
||||||
.OrderBy(i => i.Id)
|
|
||||||
.ToList();
|
|
||||||
|
|
||||||
if (items.Count < 2)
|
|
||||||
{
|
|
||||||
throw new ArgumentException("Please supply at least two videos to merge.");
|
|
||||||
}
|
|
||||||
|
|
||||||
var videosWithVersions = items.Where(i => i.MediaSourceCount > 1)
|
|
||||||
.ToList();
|
|
||||||
|
|
||||||
var primaryVersion = videosWithVersions.FirstOrDefault();
|
|
||||||
if (primaryVersion == null)
|
|
||||||
{
|
|
||||||
primaryVersion = items.OrderBy(i =>
|
|
||||||
{
|
|
||||||
if (i.Video3DFormat.HasValue || i.VideoType != Model.Entities.VideoType.VideoFile)
|
|
||||||
{
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
})
|
|
||||||
.ThenByDescending(i =>
|
|
||||||
{
|
|
||||||
return i.GetDefaultVideoStream()?.Width ?? 0;
|
|
||||||
}).First();
|
|
||||||
}
|
|
||||||
|
|
||||||
var list = primaryVersion.LinkedAlternateVersions.ToList();
|
|
||||||
|
|
||||||
foreach (var item in items.Where(i => i.Id != primaryVersion.Id))
|
|
||||||
{
|
|
||||||
item.SetPrimaryVersionId(primaryVersion.Id.ToString("N", CultureInfo.InvariantCulture));
|
|
||||||
|
|
||||||
item.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None);
|
|
||||||
|
|
||||||
list.Add(new LinkedChild
|
|
||||||
{
|
|
||||||
Path = item.Path,
|
|
||||||
ItemId = item.Id
|
|
||||||
});
|
|
||||||
|
|
||||||
foreach (var linkedItem in item.LinkedAlternateVersions)
|
|
||||||
{
|
|
||||||
if (!list.Any(i => string.Equals(i.Path, linkedItem.Path, StringComparison.OrdinalIgnoreCase)))
|
|
||||||
{
|
|
||||||
list.Add(linkedItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (item.LinkedAlternateVersions.Length > 0)
|
|
||||||
{
|
|
||||||
item.LinkedAlternateVersions = Array.Empty<LinkedChild>();
|
|
||||||
item.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
primaryVersion.LinkedAlternateVersions = list.ToArray();
|
|
||||||
primaryVersion.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,340 +0,0 @@
|
|||||||
#pragma warning disable CS1591
|
|
||||||
#pragma warning disable SA1402
|
|
||||||
#pragma warning disable SA1649
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Diagnostics.CodeAnalysis;
|
|
||||||
using System.IO;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using MediaBrowser.Common.Extensions;
|
|
||||||
using MediaBrowser.Common.Plugins;
|
|
||||||
using MediaBrowser.Controller;
|
|
||||||
using MediaBrowser.Controller.Configuration;
|
|
||||||
using MediaBrowser.Controller.Extensions;
|
|
||||||
using MediaBrowser.Controller.Net;
|
|
||||||
using MediaBrowser.Controller.Plugins;
|
|
||||||
using MediaBrowser.Model.IO;
|
|
||||||
using MediaBrowser.Model.Net;
|
|
||||||
using MediaBrowser.Model.Plugins;
|
|
||||||
using MediaBrowser.Model.Services;
|
|
||||||
using Microsoft.Extensions.Configuration;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
|
|
||||||
namespace MediaBrowser.WebDashboard.Api
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Class GetDashboardConfigurationPages.
|
|
||||||
/// </summary>
|
|
||||||
[Route("/web/ConfigurationPages", "GET")]
|
|
||||||
public class GetDashboardConfigurationPages : IReturn<List<ConfigurationPageInfo>>
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the type of the page.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The type of the page.</value>
|
|
||||||
public ConfigurationPageType? PageType { get; set; }
|
|
||||||
|
|
||||||
public bool? EnableInMainMenu { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Class GetDashboardConfigurationPage.
|
|
||||||
/// </summary>
|
|
||||||
[Route("/web/ConfigurationPage", "GET")]
|
|
||||||
public class GetDashboardConfigurationPage
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the name.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The name.</value>
|
|
||||||
public string Name { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
[Route("/robots.txt", "GET", IsHidden = true)]
|
|
||||||
public class GetRobotsTxt
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Class GetDashboardResource.
|
|
||||||
/// </summary>
|
|
||||||
[Route("/web/{ResourceName*}", "GET", IsHidden = true)]
|
|
||||||
public class GetDashboardResource
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the name.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The name.</value>
|
|
||||||
public string ResourceName { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the V.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The V.</value>
|
|
||||||
public string V { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
[Route("/favicon.ico", "GET", IsHidden = true)]
|
|
||||||
public class GetFavIcon
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Class DashboardService.
|
|
||||||
/// </summary>
|
|
||||||
public class DashboardService : IService, IRequiresRequest
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the logger.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The logger.</value>
|
|
||||||
private readonly ILogger<DashboardService> _logger;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the HTTP result factory.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The HTTP result factory.</value>
|
|
||||||
private readonly IHttpResultFactory _resultFactory;
|
|
||||||
private readonly IServerApplicationHost _appHost;
|
|
||||||
private readonly IConfiguration _appConfig;
|
|
||||||
private readonly IServerConfigurationManager _serverConfigurationManager;
|
|
||||||
private readonly IFileSystem _fileSystem;
|
|
||||||
private readonly IResourceFileManager _resourceFileManager;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Initializes a new instance of the <see cref="DashboardService" /> class.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="logger">The logger.</param>
|
|
||||||
/// <param name="appHost">The application host.</param>
|
|
||||||
/// <param name="appConfig">The application configuration.</param>
|
|
||||||
/// <param name="resourceFileManager">The resource file manager.</param>
|
|
||||||
/// <param name="serverConfigurationManager">The server configuration manager.</param>
|
|
||||||
/// <param name="fileSystem">The file system.</param>
|
|
||||||
/// <param name="resultFactory">The result factory.</param>
|
|
||||||
public DashboardService(
|
|
||||||
ILogger<DashboardService> logger,
|
|
||||||
IServerApplicationHost appHost,
|
|
||||||
IConfiguration appConfig,
|
|
||||||
IResourceFileManager resourceFileManager,
|
|
||||||
IServerConfigurationManager serverConfigurationManager,
|
|
||||||
IFileSystem fileSystem,
|
|
||||||
IHttpResultFactory resultFactory)
|
|
||||||
{
|
|
||||||
_logger = logger;
|
|
||||||
_appHost = appHost;
|
|
||||||
_appConfig = appConfig;
|
|
||||||
_resourceFileManager = resourceFileManager;
|
|
||||||
_serverConfigurationManager = serverConfigurationManager;
|
|
||||||
_fileSystem = fileSystem;
|
|
||||||
_resultFactory = resultFactory;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the request context.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The request context.</value>
|
|
||||||
public IRequest Request { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the path of the directory containing the static web interface content, or null if the server is not
|
|
||||||
/// hosting the web client.
|
|
||||||
/// </summary>
|
|
||||||
public string DashboardUIPath => GetDashboardUIPath(_appConfig, _serverConfigurationManager);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the path of the directory containing the static web interface content.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="appConfig">The app configuration.</param>
|
|
||||||
/// <param name="serverConfigManager">The server configuration manager.</param>
|
|
||||||
/// <returns>The directory path, or null if the server is not hosting the web client.</returns>
|
|
||||||
public static string GetDashboardUIPath(IConfiguration appConfig, IServerConfigurationManager serverConfigManager)
|
|
||||||
{
|
|
||||||
if (!appConfig.HostWebClient())
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(serverConfigManager.Configuration.DashboardSourcePath))
|
|
||||||
{
|
|
||||||
return serverConfigManager.Configuration.DashboardSourcePath;
|
|
||||||
}
|
|
||||||
|
|
||||||
return serverConfigManager.ApplicationPaths.WebPath;
|
|
||||||
}
|
|
||||||
|
|
||||||
[SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
|
|
||||||
public object Get(GetFavIcon request)
|
|
||||||
{
|
|
||||||
return Get(new GetDashboardResource
|
|
||||||
{
|
|
||||||
ResourceName = "favicon.ico"
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the specified request.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="request">The request.</param>
|
|
||||||
/// <returns>System.Object.</returns>
|
|
||||||
[SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
|
|
||||||
public Task<object> Get(GetDashboardConfigurationPage request)
|
|
||||||
{
|
|
||||||
IPlugin plugin = null;
|
|
||||||
Stream stream = null;
|
|
||||||
|
|
||||||
var isJs = false;
|
|
||||||
var isTemplate = false;
|
|
||||||
|
|
||||||
var page = ServerEntryPoint.Instance.PluginConfigurationPages.FirstOrDefault(p => string.Equals(p.Name, request.Name, StringComparison.OrdinalIgnoreCase));
|
|
||||||
if (page != null)
|
|
||||||
{
|
|
||||||
plugin = page.Plugin;
|
|
||||||
stream = page.GetHtmlStream();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (plugin == null)
|
|
||||||
{
|
|
||||||
var altPage = GetPluginPages().FirstOrDefault(p => string.Equals(p.Item1.Name, request.Name, StringComparison.OrdinalIgnoreCase));
|
|
||||||
if (altPage != null)
|
|
||||||
{
|
|
||||||
plugin = altPage.Item2;
|
|
||||||
stream = plugin.GetType().Assembly.GetManifestResourceStream(altPage.Item1.EmbeddedResourcePath);
|
|
||||||
|
|
||||||
isJs = string.Equals(Path.GetExtension(altPage.Item1.EmbeddedResourcePath), ".js", StringComparison.OrdinalIgnoreCase);
|
|
||||||
isTemplate = altPage.Item1.EmbeddedResourcePath.EndsWith(".template.html", StringComparison.Ordinal);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (plugin != null && stream != null)
|
|
||||||
{
|
|
||||||
if (isJs)
|
|
||||||
{
|
|
||||||
return _resultFactory.GetStaticResult(Request, plugin.Version.ToString().GetMD5(), null, null, MimeTypes.GetMimeType("page.js"), () => Task.FromResult(stream));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isTemplate)
|
|
||||||
{
|
|
||||||
return _resultFactory.GetStaticResult(Request, plugin.Version.ToString().GetMD5(), null, null, MimeTypes.GetMimeType("page.html"), () => Task.FromResult(stream));
|
|
||||||
}
|
|
||||||
|
|
||||||
return _resultFactory.GetStaticResult(Request, plugin.Version.ToString().GetMD5(), null, null, MimeTypes.GetMimeType("page.html"), () => Task.FromResult(stream));
|
|
||||||
}
|
|
||||||
|
|
||||||
throw new ResourceNotFoundException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the specified request.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="request">The request.</param>
|
|
||||||
/// <returns>System.Object.</returns>
|
|
||||||
public object Get(GetDashboardConfigurationPages request)
|
|
||||||
{
|
|
||||||
const string unavailableMessage = "The server is still loading. Please try again momentarily.";
|
|
||||||
|
|
||||||
var instance = ServerEntryPoint.Instance;
|
|
||||||
|
|
||||||
if (instance == null)
|
|
||||||
{
|
|
||||||
throw new InvalidOperationException(unavailableMessage);
|
|
||||||
}
|
|
||||||
|
|
||||||
var pages = instance.PluginConfigurationPages;
|
|
||||||
|
|
||||||
if (pages == null)
|
|
||||||
{
|
|
||||||
throw new InvalidOperationException(unavailableMessage);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Don't allow a failing plugin to fail them all
|
|
||||||
var configPages = pages.Select(p =>
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return new ConfigurationPageInfo(p);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
_logger.LogError(ex, "Error getting plugin information from {Plugin}", p.GetType().Name);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.Where(i => i != null)
|
|
||||||
.ToList();
|
|
||||||
|
|
||||||
configPages.AddRange(_appHost.Plugins.SelectMany(GetConfigPages));
|
|
||||||
|
|
||||||
if (request.PageType.HasValue)
|
|
||||||
{
|
|
||||||
configPages = configPages.Where(p => p.ConfigurationPageType == request.PageType.Value).ToList();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (request.EnableInMainMenu.HasValue)
|
|
||||||
{
|
|
||||||
configPages = configPages.Where(p => p.EnableInMainMenu == request.EnableInMainMenu.Value).ToList();
|
|
||||||
}
|
|
||||||
|
|
||||||
return configPages;
|
|
||||||
}
|
|
||||||
|
|
||||||
private IEnumerable<Tuple<PluginPageInfo, IPlugin>> GetPluginPages()
|
|
||||||
{
|
|
||||||
return _appHost.Plugins.SelectMany(GetPluginPages);
|
|
||||||
}
|
|
||||||
|
|
||||||
private IEnumerable<Tuple<PluginPageInfo, IPlugin>> GetPluginPages(IPlugin plugin)
|
|
||||||
{
|
|
||||||
var hasConfig = plugin as IHasWebPages;
|
|
||||||
|
|
||||||
if (hasConfig == null)
|
|
||||||
{
|
|
||||||
return new List<Tuple<PluginPageInfo, IPlugin>>();
|
|
||||||
}
|
|
||||||
|
|
||||||
return hasConfig.GetPages().Select(i => new Tuple<PluginPageInfo, IPlugin>(i, plugin));
|
|
||||||
}
|
|
||||||
|
|
||||||
private IEnumerable<ConfigurationPageInfo> GetConfigPages(IPlugin plugin)
|
|
||||||
{
|
|
||||||
return GetPluginPages(plugin).Select(i => new ConfigurationPageInfo(plugin, i.Item1));
|
|
||||||
}
|
|
||||||
|
|
||||||
[SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
|
|
||||||
public object Get(GetRobotsTxt request)
|
|
||||||
{
|
|
||||||
return Get(new GetDashboardResource
|
|
||||||
{
|
|
||||||
ResourceName = "robots.txt"
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the specified request.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="request">The request.</param>
|
|
||||||
/// <returns>System.Object.</returns>
|
|
||||||
public async Task<object> Get(GetDashboardResource request)
|
|
||||||
{
|
|
||||||
if (!_appConfig.HostWebClient() || DashboardUIPath == null)
|
|
||||||
{
|
|
||||||
throw new ResourceNotFoundException();
|
|
||||||
}
|
|
||||||
|
|
||||||
var path = request?.ResourceName;
|
|
||||||
var basePath = DashboardUIPath;
|
|
||||||
|
|
||||||
// Bounce them to the startup wizard if it hasn't been completed yet
|
|
||||||
if (!_serverConfigurationManager.Configuration.IsStartupWizardCompleted
|
|
||||||
&& !Request.RawUrl.Contains("wizard", StringComparison.OrdinalIgnoreCase)
|
|
||||||
&& Request.RawUrl.Contains("index", StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
Request.Response.Redirect("index.html?start=wizard#!/wizardstart.html");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return await _resultFactory.GetStaticFileResult(Request, _resourceFileManager.GetResourcePath(basePath, path)).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,42 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
|
||||||
|
|
||||||
<!-- ProjectGuid is only included as a requirement for SonarQube analysis -->
|
|
||||||
<PropertyGroup>
|
|
||||||
<ProjectGuid>{5624B7B5-B5A7-41D8-9F10-CC5611109619}</ProjectGuid>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
|
|
||||||
<ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<Compile Include="..\SharedVersion.cs" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="jellyfin-web\**\*.*">
|
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
||||||
</None>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<TargetFramework>netstandard2.1</TargetFramework>
|
|
||||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
|
||||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
|
||||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<!-- Code Analyzers-->
|
|
||||||
<ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
|
|
||||||
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" />
|
|
||||||
<PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" />
|
|
||||||
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
|
|
||||||
<PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
|
||||||
<CodeAnalysisRuleSet>../jellyfin.ruleset</CodeAnalysisRuleSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
</Project>
|
|
@ -1,21 +0,0 @@
|
|||||||
using System.Reflection;
|
|
||||||
using System.Resources;
|
|
||||||
using System.Runtime.InteropServices;
|
|
||||||
|
|
||||||
// General Information about an assembly is controlled through the following
|
|
||||||
// set of attributes. Change these attribute values to modify the information
|
|
||||||
// associated with an assembly.
|
|
||||||
[assembly: AssemblyTitle("MediaBrowser.WebDashboard")]
|
|
||||||
[assembly: AssemblyDescription("")]
|
|
||||||
[assembly: AssemblyConfiguration("")]
|
|
||||||
[assembly: AssemblyCompany("Jellyfin Project")]
|
|
||||||
[assembly: AssemblyProduct("Jellyfin Server")]
|
|
||||||
[assembly: AssemblyCopyright("Copyright © 2019 Jellyfin Contributors. Code released under the GNU General Public License")]
|
|
||||||
[assembly: AssemblyTrademark("")]
|
|
||||||
[assembly: AssemblyCulture("")]
|
|
||||||
[assembly: NeutralResourcesLanguage("en")]
|
|
||||||
|
|
||||||
// Setting ComVisible to false makes the types in this assembly not visible
|
|
||||||
// to COM components. If you need to access a type in this assembly from
|
|
||||||
// COM, set the ComVisible attribute to true on that type.
|
|
||||||
[assembly: ComVisible(false)]
|
|
@ -1,42 +0,0 @@
|
|||||||
#pragma warning disable CS1591
|
|
||||||
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using MediaBrowser.Common;
|
|
||||||
using MediaBrowser.Controller.Plugins;
|
|
||||||
|
|
||||||
namespace MediaBrowser.WebDashboard
|
|
||||||
{
|
|
||||||
public sealed class ServerEntryPoint : IServerEntryPoint
|
|
||||||
{
|
|
||||||
private readonly IApplicationHost _appHost;
|
|
||||||
|
|
||||||
public ServerEntryPoint(IApplicationHost appHost)
|
|
||||||
{
|
|
||||||
_appHost = appHost;
|
|
||||||
Instance = this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ServerEntryPoint Instance { get; private set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the list of plugin configuration pages.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The configuration pages.</value>
|
|
||||||
public List<IPluginConfigurationPage> PluginConfigurationPages { get; private set; }
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public Task RunAsync()
|
|
||||||
{
|
|
||||||
PluginConfigurationPages = _appHost.GetExports<IPluginConfigurationPage>().ToList();
|
|
||||||
|
|
||||||
return Task.CompletedTask;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public void Dispose()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in new issue