cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-16 02:18:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix request parameters

Browse Source
This commit is contained in:
crobibero 2020-07-24 17:22:32 -06:00
parent 44acb9f7d9
commit d801621cfc
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Jellyfin.Api/Controllers/LibraryStructureController.cs
View File

@ -6,6 +6,7 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Jellyfin.Api.Constants;
using Jellyfin.Api.Models.LibraryStructureDto;
using MediaBrowser.Common.Progress;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Configuration;
@ -16,6 +17,7 @@ using MediaBrowser.Model.Entities;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.ModelBinding;
namespace Jellyfin.Api.Controllers
{
@ -74,7 +76,7 @@ namespace Jellyfin.Api.Controllers
[FromQuery] string? name,
[FromQuery] string? collectionType,
[FromQuery] string[] paths,
[FromQuery] LibraryOptions? libraryOptions,
[FromBody] LibraryOptions? libraryOptions,
[FromQuery] bool refreshLibrary = false)
{
libraryOptions ??= new LibraryOptions();
@ -194,9 +196,7 @@ namespace Jellyfin.Api.Controllers
/// <summary>
/// Add a media path to a library.
/// </summary>
/// <param name="name">The name of the library.</param>
/// <param name="path">The path to add.</param>
/// <param name="pathInfo">The path info.</param>
/// <param name="mediaPathDto">The media path dto.</param>
/// <param name="refreshLibrary">Whether to refresh the library.</param>
/// <returns>A <see cref="NoContentResult"/>.</returns>
/// <response code="204">Media path added.</response>
@ -204,23 +204,16 @@ namespace Jellyfin.Api.Controllers
[HttpPost("Paths")]
[ProducesResponseType(StatusCodes.Status204NoContent)]
public ActionResult AddMediaPath(
[FromQuery] string? name,
[FromQuery] string? path,
[FromQuery] MediaPathInfo? pathInfo,
[FromBody, BindRequired] MediaPathDto mediaPathDto,
[FromQuery] bool refreshLibrary = false)
{
if (string.IsNullOrWhiteSpace(name))
{
throw new ArgumentNullException(nameof(name));
}
_libraryMonitor.Stop();
try
{
var mediaPath = pathInfo ?? new MediaPathInfo { Path = path };
var mediaPath = mediaPathDto.PathInfo ?? new MediaPathInfo { Path = mediaPathDto.Path };
_libraryManager.AddMediaPath(name, mediaPath);
_libraryManager.AddMediaPath(mediaPathDto.Name, mediaPath);
}
finally
{

27
Jellyfin.Api/Models/LibraryStructureDto/MediaPathDto.cs Normal file
View File

@ -0,0 +1,27 @@
using System.ComponentModel.DataAnnotations;
using MediaBrowser.Model.Configuration;
namespace Jellyfin.Api.Models.LibraryStructureDto
{
/// <summary>
/// Media Path dto.
/// </summary>
public class MediaPathDto
{
/// <summary>
/// Gets or sets the name of the library.
/// </summary>
[Required]
public string? Name { get; set; }
/// <summary>
/// Gets or sets the path to add.
/// </summary>
public string? Path { get; set; }
/// <summary>
/// Gets or sets the path info.
/// </summary>
public MediaPathInfo? PathInfo { get; set; }
}
}