Merge branch 'master' into comparisons

6 files changed, 61 insertions, 201 deletions

diff --git a/MediaBrowser.Model/Entities/DisplayPreferencesDto.cs b/MediaBrowser.Model/Entities/DisplayPreferencesDto.cs
deleted file mode 100644
index 1f7fe3030..000000000
--- a/MediaBrowser.Model/Entities/DisplayPreferencesDto.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-#nullable disable
-using System.Collections.Generic;
-using Jellyfin.Data.Enums;
-
-namespace MediaBrowser.Model.Entities
-{
-    /// <summary>
-    /// Defines the display preferences for any item that supports them (usually Folders).
-    /// </summary>
-    public class DisplayPreferencesDto
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DisplayPreferencesDto" /> class.
-        /// </summary>
-        public DisplayPreferencesDto()
-        {
-            RememberIndexing = false;
-            PrimaryImageHeight = 250;
-            PrimaryImageWidth = 250;
-            ShowBackdrop = true;
-            CustomPrefs = new Dictionary<string, string>();
-        }
-
-        /// <summary>
-        /// Gets or sets the user id.
-        /// </summary>
-        /// <value>The user id.</value>
-        public string Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the type of the view.
-        /// </summary>
-        /// <value>The type of the view.</value>
-        public string ViewType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the sort by.
-        /// </summary>
-        /// <value>The sort by.</value>
-        public string SortBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the index by.
-        /// </summary>
-        /// <value>The index by.</value>
-        public string IndexBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether [remember indexing].
-        /// </summary>
-        /// <value><c>true</c> if [remember indexing]; otherwise, <c>false</c>.</value>
-        public bool RememberIndexing { get; set; }
-
-        /// <summary>
-        /// Gets or sets the height of the primary image.
-        /// </summary>
-        /// <value>The height of the primary image.</value>
-        public int PrimaryImageHeight { get; set; }
-
-        /// <summary>
-        /// Gets or sets the width of the primary image.
-        /// </summary>
-        /// <value>The width of the primary image.</value>
-        public int PrimaryImageWidth { get; set; }
-
-        /// <summary>
-        /// Gets or sets the custom prefs.
-        /// </summary>
-        /// <value>The custom prefs.</value>
-        public Dictionary<string, string> CustomPrefs { get; set; }
-
-        /// <summary>
-        /// Gets or sets the scroll direction.
-        /// </summary>
-        /// <value>The scroll direction.</value>
-        public ScrollDirection ScrollDirection { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to show backdrops on this item.
-        /// </summary>
-        /// <value><c>true</c> if showing backdrops; otherwise, <c>false</c>.</value>
-        public bool ShowBackdrop { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether [remember sorting].
-        /// </summary>
-        /// <value><c>true</c> if [remember sorting]; otherwise, <c>false</c>.</value>
-        public bool RememberSorting { get; set; }
-
-        /// <summary>
-        /// Gets or sets the sort order.
-        /// </summary>
-        /// <value>The sort order.</value>
-        public SortOrder SortOrder { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether [show sidebar].
-        /// </summary>
-        /// <value><c>true</c> if [show sidebar]; otherwise, <c>false</c>.</value>
-        public bool ShowSidebar { get; set; }
-
-        /// <summary>
-        /// Gets or sets the client.
-        /// </summary>
-        public string Client { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/Entities/ImageType.cs b/MediaBrowser.Model/Entities/ImageType.cs
index 6ea9ee419..1f7e03718 100644
--- a/MediaBrowser.Model/Entities/ImageType.cs
+++ b/MediaBrowser.Model/Entities/ImageType.cs
@@ -48,6 +48,10 @@ namespace MediaBrowser.Model.Entities
         /// <summary>
         /// The screenshot.
         /// </summary>
+        /// <remarks>
+        /// This enum value is obsolete.
+        /// XmlSerializer does not serialize/deserialize objects that are marked as [Obsolete].
+        /// </remarks>
         Screenshot = 8,
 
         /// <summary>
diff --git a/MediaBrowser.Model/Entities/JsonLowerCaseConverter.cs b/MediaBrowser.Model/Entities/JsonLowerCaseConverter.cs
deleted file mode 100644
index 7c627f0e3..000000000
--- a/MediaBrowser.Model/Entities/JsonLowerCaseConverter.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-#nullable disable
-// THIS IS A HACK
-// TODO: @bond Move to separate project
-
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace MediaBrowser.Model.Entities
-{
-    /// <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());
-        }
-    }
-}
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index c67f30d04..38ac44794 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -255,13 +255,18 @@ namespace MediaBrowser.Model.Entities
                             attributes.Add(string.IsNullOrEmpty(LocalizedForced) ? "Forced" : LocalizedForced);
                         }
 
+                        if (!string.IsNullOrEmpty(Codec))
+                        {
+                            attributes.Add(Codec.ToUpperInvariant());
+                        }
+
                         if (!string.IsNullOrEmpty(Title))
                         {
                             var result = new StringBuilder(Title);
                             foreach (var tag in attributes)
                             {
                                 // Keep Tags that are not already in Title.
-                                if (Title.IndexOf(tag, StringComparison.OrdinalIgnoreCase) == -1)
+                                if (!Title.Contains(tag, StringComparison.OrdinalIgnoreCase))
                                 {
                                     result.Append(" - ").Append(tag);
                                 }
@@ -469,64 +474,30 @@ namespace MediaBrowser.Model.Entities
         /// <value><c>true</c> if this instance is anamorphic; otherwise, <c>false</c>.</value>
         public bool? IsAnamorphic { get; set; }
 
-        private string GetResolutionText()
+        internal string GetResolutionText()
         {
-            var i = this;
-
-            if (i.Width.HasValue && i.Height.HasValue)
+            if (!Width.HasValue || !Height.HasValue)
             {
-                var width = i.Width.Value;
-                var height = i.Height.Value;
-
-                if (width >= 3800 || height >= 2000)
-                {
-                    return "4K";
-                }
-
-                if (width >= 2500)
-                {
-                    if (i.IsInterlaced)
-                    {
-                        return "1440i";
-                    }
-
-                    return "1440p";
-                }
-
-                if (width >= 1900 || height >= 1000)
-                {
-                    if (i.IsInterlaced)
-                    {
-                        return "1080i";
-                    }
-
-                    return "1080p";
-                }
-
-                if (width >= 1260 || height >= 700)
-                {
-                    if (i.IsInterlaced)
-                    {
-                        return "720i";
-                    }
-
-                    return "720p";
-                }
-
-                if (width >= 700 || height >= 440)
-                {
-                    if (i.IsInterlaced)
-                    {
-                        return "480i";
-                    }
-
-                    return "480p";
-                }
-
-                return "SD";
+                return null;
             }
 
-            return null;
+            return Width switch
+            {
+                <= 720 when Height <= 480 => IsInterlaced ? "480i" : "480p",
+                // 720x576 (PAL) (768 when rescaled for square pixels)
+                <= 768 when Height <= 576 => IsInterlaced ? "576i" : "576p",
+                // 960x540 (sometimes 544 which is multiple of 16)
+                <= 960 when Height <= 544 => IsInterlaced ? "540i" : "540p",
+                // 1280x720
+                <= 1280 when Height <= 962 => IsInterlaced ? "720i" : "720p",
+                // 1920x1080
+                <= 1920 when Height <= 1440 => IsInterlaced ? "1080i" : "1080p",
+                // 4K
+                <= 4096 when Height <= 3072 => "4K",
+                // 8K
+                <= 8192 when Height <= 6144 => "8K",
+                _ => null
+            };
         }
 
         public static bool IsTextFormat(string format)
diff --git a/MediaBrowser.Model/Entities/PersonType.cs b/MediaBrowser.Model/Entities/PersonType.cs
index 81db9c613..b985507f0 100644
--- a/MediaBrowser.Model/Entities/PersonType.cs
+++ b/MediaBrowser.Model/Entities/PersonType.cs
@@ -1,48 +1,68 @@
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
-    /// Struct PersonType.
+    /// Types of persons.
     /// </summary>
-    public class PersonType
+    public static class PersonType
     {
         /// <summary>
-        /// The actor.
+        /// A person whose profession is acting on the stage, in films, or on television.
         /// </summary>
         public const string Actor = "Actor";
 
         /// <summary>
-        /// The director.
+        /// A person who supervises the actors and other staff in a film, play, or similar production.
         /// </summary>
         public const string Director = "Director";
 
         /// <summary>
-        /// The composer.
+        /// A person who writes music, especially as a professional occupation.
         /// </summary>
         public const string Composer = "Composer";
 
         /// <summary>
-        /// The writer.
+        /// A writer of a book, article, or document. Can also be used as a generic term for music writer if there is a lack of specificity.
         /// </summary>
         public const string Writer = "Writer";
 
         /// <summary>
-        /// The guest star.
+        /// A well-known actor or other performer who appears in a work in which they do not have a regular role.
         /// </summary>
         public const string GuestStar = "GuestStar";
 
         /// <summary>
-        /// The producer.
+        /// A person responsible for the financial and managerial aspects of the making of a film or broadcast or for staging a play, opera, etc.
         /// </summary>
         public const string Producer = "Producer";
 
         /// <summary>
-        /// The conductor.
+        /// A person who directs the performance of an orchestra or choir.
         /// </summary>
         public const string Conductor = "Conductor";
 
         /// <summary>
-        /// The lyricist.
+        /// A person who writes the words to a song or musical.
         /// </summary>
         public const string Lyricist = "Lyricist";
+
+        /// <summary>
+        /// A person who adapts a musical composition for performance.
+        /// </summary>
+        public const string Arranger = "Arranger";
+
+        /// <summary>
+        /// An audio engineer who performed a general engineering role.
+        /// </summary>
+        public const string Engineer = "Engineer";
+
+        /// <summary>
+        /// An engineer responsible for using a mixing console to mix a recorded track into a single piece of music suitable for release.
+        /// </summary>
+        public const string Mixer = "Mixer";
+
+        /// <summary>
+        /// A person who remixed a recording by taking one or more other tracks, substantially altering them and mixing them together with other material.
+        /// </summary>
+        public const string Remixer = "Remixer";
     }
 }
diff --git a/MediaBrowser.Model/Entities/VirtualFolderInfo.cs b/MediaBrowser.Model/Entities/VirtualFolderInfo.cs
index 8fed392b9..2b2bda12c 100644
--- a/MediaBrowser.Model/Entities/VirtualFolderInfo.cs
+++ b/MediaBrowser.Model/Entities/VirtualFolderInfo.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Text.Json.Serialization;
+using Jellyfin.Extensions.Json.Converters;
 using MediaBrowser.Model.Configuration;
 
 namespace MediaBrowser.Model.Entities