Merge remote-tracking branch 'upstream/master' into quickconnect

9 files changed, 36 insertions, 18 deletions

diff --git a/MediaBrowser.Model/Entities/DisplayPreferences.cs b/MediaBrowser.Model/Entities/DisplayPreferences.cs
index 0e5db01dd..7e5c5be3b 100644
--- a/MediaBrowser.Model/Entities/DisplayPreferences.cs
+++ b/MediaBrowser.Model/Entities/DisplayPreferences.cs
@@ -104,7 +104,7 @@ namespace MediaBrowser.Model.Entities
         public bool ShowSidebar { get; set; }
 
         /// <summary>
-        /// Gets or sets the client
+        /// 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 d89a4b3ad..6ea9ee419 100644
--- a/MediaBrowser.Model/Entities/ImageType.cs
+++ b/MediaBrowser.Model/Entities/ImageType.cs
@@ -63,6 +63,11 @@ namespace MediaBrowser.Model.Entities
         /// <summary>
         /// The box rear.
         /// </summary>
-        BoxRear = 11
+        BoxRear = 11,
+
+        /// <summary>
+        /// The user profile image.
+        /// </summary>
+        Profile = 12
     }
 }
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index fa09cc513..d8ee79d0d 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -13,7 +13,7 @@ using MediaBrowser.Model.MediaInfo;
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
-    /// Class MediaStream
+    /// Class MediaStream.
     /// </summary>
     public class MediaStream
     {
@@ -114,7 +114,7 @@ namespace MediaBrowser.Model.Entities
             {
                 if (Type == MediaStreamType.Audio)
                 {
-                    //if (!string.IsNullOrEmpty(Title))
+                    // if (!string.IsNullOrEmpty(Title))
                     //{
                     //    return AddLanguageIfNeeded(Title);
                     //}
@@ -125,6 +125,7 @@ namespace MediaBrowser.Model.Entities
                     {
                         attributes.Add(StringHelper.FirstToUpper(Language));
                     }
+
                     if (!string.IsNullOrEmpty(Codec) && !string.Equals(Codec, "dca", StringComparison.OrdinalIgnoreCase))
                     {
                         attributes.Add(AudioCodec.GetFriendlyName(Codec));
@@ -142,6 +143,7 @@ namespace MediaBrowser.Model.Entities
                     {
                         attributes.Add(Channels.Value.ToString(CultureInfo.InvariantCulture) + " ch");
                     }
+
                     if (IsDefault)
                     {
                         attributes.Add("Default");
@@ -208,7 +210,6 @@ namespace MediaBrowser.Model.Entities
 
                 if (Type == MediaStreamType.Video)
                 {
-
                 }
 
                 return null;
@@ -228,30 +229,37 @@ namespace MediaBrowser.Model.Entities
                 {
                     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)
                 {
 
@@ -259,11 +267,13 @@ namespace MediaBrowser.Model.Entities
                     {
                         return "480i";
                     }
+
                     return "480p";
                 }
 
                 return "SD";
             }
+
             return null;
         }
 
@@ -449,6 +459,7 @@ namespace MediaBrowser.Model.Entities
             {
                 return false;
             }
+
             if (string.Equals(fromCodec, "ssa", StringComparison.OrdinalIgnoreCase))
             {
                 return false;
@@ -459,6 +470,7 @@ namespace MediaBrowser.Model.Entities
             {
                 return false;
             }
+
             if (string.Equals(toCodec, "ssa", StringComparison.OrdinalIgnoreCase))
             {
                 return false;
diff --git a/MediaBrowser.Model/Entities/MediaUrl.cs b/MediaBrowser.Model/Entities/MediaUrl.cs
index 74f982437..80ceaa765 100644
--- a/MediaBrowser.Model/Entities/MediaUrl.cs
+++ b/MediaBrowser.Model/Entities/MediaUrl.cs
@@ -6,6 +6,7 @@ namespace MediaBrowser.Model.Entities
     public class MediaUrl
     {
         public string Url { get; set; }
+
         public string Name { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Entities/MetadataFields.cs b/MediaBrowser.Model/Entities/MetadataFields.cs
index d64d4f4da..2cc6c8e33 100644
--- a/MediaBrowser.Model/Entities/MetadataFields.cs
+++ b/MediaBrowser.Model/Entities/MetadataFields.cs
@@ -3,7 +3,7 @@ namespace MediaBrowser.Model.Entities
     /// <summary>
     /// Enum MetadataFields.
     /// </summary>
-    public enum MetadataFields
+    public enum MetadataField
     {
         /// <summary>
         /// The cast.
diff --git a/MediaBrowser.Model/Entities/MetadataProviders.cs b/MediaBrowser.Model/Entities/MetadataProvider.cs
index 1a44a1661..7fecf67b8 100644
--- a/MediaBrowser.Model/Entities/MetadataProviders.cs
+++ b/MediaBrowser.Model/Entities/MetadataProvider.cs
@@ -3,28 +3,28 @@
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
-    /// Enum MetadataProviders
+    /// Enum MetadataProviders.
     /// </summary>
-    public enum MetadataProviders
+    public enum MetadataProvider
     {
         /// <summary>
-        /// The imdb
+        /// The imdb.
         /// </summary>
         Imdb = 2,
         /// <summary>
-        /// The TMDB
+        /// The TMDB.
         /// </summary>
         Tmdb = 3,
         /// <summary>
-        /// The TVDB
+        /// The TVDB.
         /// </summary>
         Tvdb = 4,
         /// <summary>
-        /// The tvcom
+        /// The tvcom.
         /// </summary>
         Tvcom = 5,
         /// <summary>
-        /// Tmdb Collection Id
+        /// Tmdb Collection Id.
         /// </summary>
         TmdbCollection = 7,
         MusicBrainzAlbum = 8,
diff --git a/MediaBrowser.Model/Entities/PackageReviewInfo.cs b/MediaBrowser.Model/Entities/PackageReviewInfo.cs
index 1ebbc3323..5b22b34ac 100644
--- a/MediaBrowser.Model/Entities/PackageReviewInfo.cs
+++ b/MediaBrowser.Model/Entities/PackageReviewInfo.cs
@@ -36,6 +36,5 @@ namespace MediaBrowser.Model.Entities
         /// Gets or sets the time of review.
         /// </summary>
         public DateTime timestamp { get; set; }
-
     }
 }
diff --git a/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs b/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs
index e089dd1e5..9c11fe0ad 100644
--- a/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs
+++ b/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs
@@ -14,7 +14,7 @@ namespace MediaBrowser.Model.Entities
         /// <param name="instance">The instance.</param>
         /// <param name="provider">The provider.</param>
         /// <returns><c>true</c> if [has provider identifier] [the specified instance]; otherwise, <c>false</c>.</returns>
-        public static bool HasProviderId(this IHasProviderIds instance, MetadataProviders provider)
+        public static bool HasProviderId(this IHasProviderIds instance, MetadataProvider provider)
         {
             return !string.IsNullOrEmpty(instance.GetProviderId(provider.ToString()));
         }
@@ -25,7 +25,7 @@ namespace MediaBrowser.Model.Entities
         /// <param name="instance">The instance.</param>
         /// <param name="provider">The provider.</param>
         /// <returns>System.String.</returns>
-        public static string? GetProviderId(this IHasProviderIds instance, MetadataProviders provider)
+        public static string? GetProviderId(this IHasProviderIds instance, MetadataProvider provider)
         {
             return instance.GetProviderId(provider.ToString());
         }
@@ -94,7 +94,7 @@ namespace MediaBrowser.Model.Entities
         /// <param name="instance">The instance.</param>
         /// <param name="provider">The provider.</param>
         /// <param name="value">The value.</param>
-        public static void SetProviderId(this IHasProviderIds instance, MetadataProviders provider, string value)
+        public static void SetProviderId(this IHasProviderIds instance, MetadataProvider provider, string value)
         {
             instance.SetProviderId(provider.ToString(), value);
         }
diff --git a/MediaBrowser.Model/Entities/VirtualFolderInfo.cs b/MediaBrowser.Model/Entities/VirtualFolderInfo.cs
index 2de02e403..f2bc6f25e 100644
--- a/MediaBrowser.Model/Entities/VirtualFolderInfo.cs
+++ b/MediaBrowser.Model/Entities/VirtualFolderInfo.cs
@@ -7,7 +7,7 @@ using MediaBrowser.Model.Configuration;
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
-    /// Used to hold information about a user's list of configured virtual folders
+    /// Used to hold information about a user's list of configured virtual folders.
     /// </summary>
     public class VirtualFolderInfo
     {
@@ -52,6 +52,7 @@ namespace MediaBrowser.Model.Entities
         public string PrimaryImageItemId { get; set; }
 
         public double? RefreshProgress { get; set; }
+
         public string RefreshStatus { get; set; }
     }
 }