Lowercase CollectionTypeOptions to match legacy experience (#11272)

Emby.Server.Implementations/Collections/CollectionManager.cs

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

MediaBrowser.Model/Entities/CollectionTypeOptions.cs

@@ -1,16 +1,49 @@
-#pragma warning disable CS1591
+#pragma warning disable SA1300 // Lowercase required for backwards compat.
 
-namespace MediaBrowser.Model.Entities
+namespace MediaBrowser.Model.Entities;
+
+/// <summary>
+/// The collection type options.
+/// </summary>
+public enum CollectionTypeOptions
 {
-    public enum CollectionTypeOptions
+    /// <summary>
-    {
+    /// Movies.
-        Movies = 0,
+    /// </summary>
-        TvShows = 1,
+    movies = 0,
-        Music = 2,
+
-        MusicVideos = 3,
+    /// <summary>
-        HomeVideos = 4,
+    /// TV Shows.
-        BoxSets = 5,
+    /// </summary>
-        Books = 6,
+    tvshows = 1,
-        Mixed = 7
+
-    }
+    /// <summary>
+    /// Music.
+    /// </summary>
+    music = 2,
+
+    /// <summary>
+    /// Music Videos.
+    /// </summary>
+    musicvideos = 3,
+
+    /// <summary>
+    /// Home Videos (and Photos).
+    /// </summary>
+    homevideos = 4,
+
+    /// <summary>
+    /// Box Sets.
+    /// </summary>
+    boxsets = 5,
+
+    /// <summary>
+    /// Books.
+    /// </summary>
+    books = 6,
+
+    /// <summary>
+    /// Mixed Movies and TV Shows.
+    /// </summary>
+    mixed = 7
 }

MediaBrowser.Model/Entities/VirtualFolderInfo.cs

@@ -37,7 +37,6 @@ namespace MediaBrowser.Model.Entities
         /// Gets or sets the type of the collection.
         /// </summary>
         /// <value>The type of the collection.</value>
-        [JsonConverter(typeof(JsonLowerCaseConverter<CollectionTypeOptions?>))]
         public CollectionTypeOptions? CollectionType { get; set; }
 
         public LibraryOptions LibraryOptions { get; set; }

src/Jellyfin.Extensions/Json/Converters/JsonLowerCaseConverter.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace Jellyfin.Extensions.Json.Converters
-{
-    /// <summary>
-    /// Converts an object to a lowercase string.
-    /// </summary>
-    /// <typeparam name="T">The object type.</typeparam>
-    public class JsonLowerCaseConverter<T> : JsonConverter<T>
-    {
-        /// <inheritdoc />
-        public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            return JsonSerializer.Deserialize<T>(ref reader, options);
-        }
-
-        /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
-        {
-            writer.WriteStringValue(value?.ToString()?.ToLowerInvariant());
-        }
-    }
-}

src/Jellyfin.LiveTv/Recordings/RecordingsManager.cs

@@ -159,7 +159,7 @@ public sealed class RecordingsManager : IRecordingsManager, IDisposable
             {
                 Locations = [customPath],
                 Name = "Recorded Movies",
-                CollectionType = CollectionTypeOptions.Movies
+                CollectionType = CollectionTypeOptions.movies
             };
         }
 
@@ -172,7 +172,7 @@ public sealed class RecordingsManager : IRecordingsManager, IDisposable
             {
                 Locations = [customPath],
                 Name = "Recorded Shows",
-                CollectionType = CollectionTypeOptions.TvShows
+                CollectionType = CollectionTypeOptions.tvshows
             };
         }
     }

tests/Jellyfin.Extensions.Tests/Json/Converters/JsonLowerCaseConverterTests.cs

@@ -1,71 +0,0 @@
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using Jellyfin.Extensions.Json.Converters;
-using MediaBrowser.Model.Entities;
-using Xunit;
-
-namespace Jellyfin.Extensions.Tests.Json.Converters
-{
-    public class JsonLowerCaseConverterTests
-    {
-        private readonly JsonSerializerOptions _jsonOptions = new JsonSerializerOptions()
-        {
-            Converters =
-            {
-                new JsonStringEnumConverter()
-            }
-        };
-
-        [Theory]
-        [InlineData(null, "{\"CollectionType\":null}")]
-        [InlineData(CollectionTypeOptions.Movies, "{\"CollectionType\":\"movies\"}")]
-        [InlineData(CollectionTypeOptions.MusicVideos, "{\"CollectionType\":\"musicvideos\"}")]
-        public void Serialize_CollectionTypeOptions_Correct(CollectionTypeOptions? collectionType, string expected)
-        {
-            Assert.Equal(expected, JsonSerializer.Serialize(new TestContainer(collectionType), _jsonOptions));
-        }
-
-        [Theory]
-        [InlineData("{\"CollectionType\":null}", null)]
-        [InlineData("{\"CollectionType\":\"movies\"}", CollectionTypeOptions.Movies)]
-        [InlineData("{\"CollectionType\":\"musicvideos\"}", CollectionTypeOptions.MusicVideos)]
-        public void Deserialize_CollectionTypeOptions_Correct(string json, CollectionTypeOptions? result)
-        {
-            var res = JsonSerializer.Deserialize<TestContainer>(json, _jsonOptions);
-            Assert.NotNull(res);
-            Assert.Equal(result, res!.CollectionType);
-        }
-
-        [Theory]
-        [InlineData(null)]
-        [InlineData(CollectionTypeOptions.Movies)]
-        [InlineData(CollectionTypeOptions.MusicVideos)]
-        public void RoundTrip_CollectionTypeOptions_Correct(CollectionTypeOptions? value)
-        {
-            var res = JsonSerializer.Deserialize<TestContainer>(JsonSerializer.Serialize(new TestContainer(value), _jsonOptions), _jsonOptions);
-            Assert.NotNull(res);
-            Assert.Equal(value, res!.CollectionType);
-        }
-
-        [Theory]
-        [InlineData("{\"CollectionType\":null}")]
-        [InlineData("{\"CollectionType\":\"movies\"}")]
-        [InlineData("{\"CollectionType\":\"musicvideos\"}")]
-        public void RoundTrip_String_Correct(string json)
-        {
-            var res = JsonSerializer.Serialize(JsonSerializer.Deserialize<TestContainer>(json, _jsonOptions), _jsonOptions);
-            Assert.Equal(json, res);
-        }
-
-        private sealed class TestContainer
-        {
-            public TestContainer(CollectionTypeOptions? collectionType)
-            {
-                CollectionType = collectionType;
-            }
-
-            [JsonConverter(typeof(JsonLowerCaseConverter<CollectionTypeOptions?>))]
-            public CollectionTypeOptions? CollectionType { get; set; }
-        }
-    }
-}