diff options
| author | Cody Robibero <cody@robibe.ro> | 2023-11-09 14:00:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-09 14:00:29 -0700 |
| commit | 906f701fa81c7cde1a9a01b066f3f29ff98552a5 (patch) | |
| tree | efc92ef0ecf4e535a519de4f8e950a77bb2ad5c3 /Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs | |
| parent | c7a94d48ae019f41d5f06340bca7efe0788ad5ad (diff) | |
Convert CollectionType, SpecialFolderType to enum (#9764)
* Convert CollectionType, SpecialFolderType to enum
* Hide internal enum CollectionType values
* Apply suggestions from code review
Co-authored-by: Shadowghost <Shadowghost@users.noreply.github.com>
* Fix recent change
* Update Jellyfin.Data/Attributes/OpenApiIgnoreEnumAttribute.cs
Co-authored-by: Patrick Barron <barronpm@gmail.com>
---------
Co-authored-by: Shadowghost <Shadowghost@users.noreply.github.com>
Co-authored-by: Patrick Barron <barronpm@gmail.com>
Diffstat (limited to 'Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs')
| -rw-r--r-- | Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs b/Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs index 6bb999641..3d91ed242 100644 --- a/Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs +++ b/Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs @@ -5,6 +5,7 @@ using System; using System.IO; using System.Linq; +using Jellyfin.Data.Enums; using MediaBrowser.Controller; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; @@ -62,7 +63,7 @@ namespace Emby.Server.Implementations.Library.Resolvers return null; } - private string GetCollectionType(ItemResolveArgs args) + private CollectionType? GetCollectionType(ItemResolveArgs args) { return args.FileSystemChildren .Where(i => @@ -78,7 +79,8 @@ namespace Emby.Server.Implementations.Library.Resolvers } }) .Select(i => _fileSystem.GetFileNameWithoutExtension(i)) - .FirstOrDefault(); + .Select(i => Enum.TryParse<CollectionType>(i, out var collectionType) ? collectionType : (CollectionType?)null) + .FirstOrDefault(i => i is not null); } } } |
