lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix unchecked input

Browse Source
This commit is contained in:
Bond_009 2021-02-24 02:05:12 +01:00
parent 92e5a5c6e8
commit 914e891689
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Emby.Server.Implementations/Library/LibraryManager.cs
View File

@ -2956,7 +2956,7 @@ namespace Emby.Server.Implementations.Library
throw new InvalidOperationException();
}
public async Task AddVirtualFolder(string name, string collectionType, LibraryOptions options, bool refreshLibrary)
public async Task AddVirtualFolder(string name, CollectionTypeOptions? collectionType, LibraryOptions options, bool refreshLibrary)
{
if (string.IsNullOrWhiteSpace(name))
{
@ -2990,9 +2990,9 @@ namespace Emby.Server.Implementations.Library
{
Directory.CreateDirectory(virtualFolderPath);
if (!string.IsNullOrEmpty(collectionType))
if (collectionType != null)
{
var path = Path.Combine(virtualFolderPath, collectionType + ".collection");
var path = Path.Combine(virtualFolderPath, collectionType.ToString() + ".collection");
File.WriteAllBytes(path, Array.Empty<byte>());
}

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

@ -75,7 +75,7 @@ namespace Jellyfin.Api.Controllers
[ProducesResponseType(StatusCodes.Status204NoContent)]
public async Task<ActionResult> AddVirtualFolder(
[FromQuery] string? name,
[FromQuery] string? collectionType,
[FromQuery] CollectionTypeOptions? collectionType,
[FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] paths,
[FromBody] AddVirtualFolderDto? libraryOptionsDto,
[FromQuery] bool refreshLibrary = false)

2
MediaBrowser.Controller/Library/ILibraryManager.cs
View File

@ -542,7 +542,7 @@ namespace MediaBrowser.Controller.Library
Guid GetMusicGenreId(string name);
Task AddVirtualFolder(string name, string collectionType, LibraryOptions options, bool refreshLibrary);
Task AddVirtualFolder(string name, CollectionTypeOptions? collectionType, LibraryOptions options, bool refreshLibrary);
Task RemoveVirtualFolder(string name, bool refreshLibrary);

15
MediaBrowser.Model/Entities/CollectionTypeOptions.cs Normal file
View File

@ -0,0 +1,15 @@
#pragma warning disable CS1591
namespace MediaBrowser.Model.Entities
{
public enum CollectionTypeOptions
{
Movies,
Music,
TvShows,
Books,
HomeVideos,
MusicVideos,
Mixed
}
}