alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-26 03:55:01 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #5301 from Bond-009/validinput

Browse Source 
(cherry picked from commit 5860979500)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
Bond-009
2021-02-24 22:02:47 +01:00
committed by Joshua M. Boniface
parent ab054d6239
commit ef864e24b9
7 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/Collections/CollectionManager.cs
View File

@@ -107,7 +107,7 @@ namespace Emby.Server.Implementations.Collections
var name = _localizationManager.GetLocalizedString("Collections");
await _libraryManager.AddVirtualFolder(name, CollectionType.BoxSets, libraryOptions, true).ConfigureAwait(false);
await _libraryManager.AddVirtualFolder(name, CollectionTypeOptions.BoxSets, libraryOptions, true).ConfigureAwait(false);
return FindFolders(path).First();
}

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

@@ -1240,11 +1240,20 @@ namespace Emby.Server.Implementations.Library
return info;
}
private string GetCollectionType(string path)
private CollectionTypeOptions? GetCollectionType(string path)
{
return _fileSystem.GetFilePaths(path, new[] { ".collection" }, true, false)
.Select(Path.GetFileNameWithoutExtension)
.FirstOrDefault(i => !string.IsNullOrEmpty(i));
var files = _fileSystem.GetFilePaths(path, new[] { ".collection" }, true, false);
foreach (var file in files)
{
// TODO: @bond use a ReadOnlySpan<char> here when Enum.TryParse supports it
// https://github.com/dotnet/runtime/issues/20008
if (Enum.TryParse<CollectionTypeOptions>(Path.GetExtension(file), true, out var res))
{
return res;
}
}
return null;
}
/// <summary>
@@ -2956,7 +2965,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 +2999,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>());
}

4
Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
View File

@@ -2608,7 +2608,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
{
Locations = new string[] { customPath },
Name = "Recorded Movies",
CollectionType = CollectionType.Movies
CollectionType = CollectionTypeOptions.Movies
};
}
@@ -2619,7 +2619,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
{
Locations = new string[] { customPath },
Name = "Recorded Shows",
CollectionType = CollectionType.TvShows
CollectionType = CollectionTypeOptions.TvShows
};
}
}