Merge branch 'master' into SSDP

10 files changed, 61 insertions, 17 deletions

diff --git a/MediaBrowser.Model/Providers/ExternalIdInfo.cs b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
index 2b481ad7ed..f2e6d8ef32 100644
--- a/MediaBrowser.Model/Providers/ExternalIdInfo.cs
+++ b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
@@ -1,3 +1,4 @@
+#nullable disable
 #pragma warning disable CS1591
 
 namespace MediaBrowser.Model.Providers
diff --git a/MediaBrowser.Model/Providers/ExternalUrl.cs b/MediaBrowser.Model/Providers/ExternalUrl.cs
index d4f4fa8403..9467a2b003 100644
--- a/MediaBrowser.Model/Providers/ExternalUrl.cs
+++ b/MediaBrowser.Model/Providers/ExternalUrl.cs
@@ -1,3 +1,4 @@
+#nullable disable
 #pragma warning disable CS1591
 
 namespace MediaBrowser.Model.Providers
diff --git a/MediaBrowser.Model/Providers/ImageProviderInfo.cs b/MediaBrowser.Model/Providers/ImageProviderInfo.cs
index a22ec3c079..19af81c857 100644
--- a/MediaBrowser.Model/Providers/ImageProviderInfo.cs
+++ b/MediaBrowser.Model/Providers/ImageProviderInfo.cs
@@ -1,6 +1,3 @@
-#pragma warning disable CS1591
-
-using System;
 using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.Providers
@@ -11,16 +8,25 @@ namespace MediaBrowser.Model.Providers
     public class ImageProviderInfo
     {
         /// <summary>
-        /// Gets or sets the name.
+        /// Initializes a new instance of the <see cref="ImageProviderInfo" /> class.
         /// </summary>
-        /// <value>The name.</value>
-        public string Name { get; set; }
-
-        public ImageType[] SupportedImages { get; set; }
-
-        public ImageProviderInfo()
+        /// <param name="name">The name of the image provider.</param>
+        /// <param name="supportedImages">The image types supported by the image provider.</param>
+        public ImageProviderInfo(string name, ImageType[] supportedImages)
         {
-            SupportedImages = Array.Empty<ImageType>();
+            Name = name;
+            SupportedImages = supportedImages;
         }
+
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name { get; }
+
+        /// <summary>
+        /// Gets the supported image types.
+        /// </summary>
+        public ImageType[] SupportedImages { get; }
     }
 }
diff --git a/MediaBrowser.Model/Providers/RemoteImageInfo.cs b/MediaBrowser.Model/Providers/RemoteImageInfo.cs
index ee2b9d8fd1..78ab6c706c 100644
--- a/MediaBrowser.Model/Providers/RemoteImageInfo.cs
+++ b/MediaBrowser.Model/Providers/RemoteImageInfo.cs
@@ -1,3 +1,4 @@
+#nullable disable
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 
diff --git a/MediaBrowser.Model/Providers/RemoteImageQuery.cs b/MediaBrowser.Model/Providers/RemoteImageQuery.cs
index 2873c10038..b7fad87aba 100644
--- a/MediaBrowser.Model/Providers/RemoteImageQuery.cs
+++ b/MediaBrowser.Model/Providers/RemoteImageQuery.cs
@@ -6,7 +6,12 @@ namespace MediaBrowser.Model.Providers
 {
     public class RemoteImageQuery
     {
-        public string ProviderName { get; set; }
+        public RemoteImageQuery(string providerName)
+        {
+            ProviderName = providerName;
+        }
+
+        public string ProviderName { get; }
 
         public ImageType? ImageType { get; set; }
 
diff --git a/MediaBrowser.Model/Providers/RemoteImageResult.cs b/MediaBrowser.Model/Providers/RemoteImageResult.cs
index 5ca00f7701..e6067ee6ef 100644
--- a/MediaBrowser.Model/Providers/RemoteImageResult.cs
+++ b/MediaBrowser.Model/Providers/RemoteImageResult.cs
@@ -1,3 +1,4 @@
+#nullable disable
 namespace MediaBrowser.Model.Providers
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Providers/RemoteSearchResult.cs b/MediaBrowser.Model/Providers/RemoteSearchResult.cs
index 161e048214..989741c01a 100644
--- a/MediaBrowser.Model/Providers/RemoteSearchResult.cs
+++ b/MediaBrowser.Model/Providers/RemoteSearchResult.cs
@@ -1,3 +1,4 @@
+#nullable disable
 #pragma warning disable CS1591
 
 using System;
@@ -8,23 +9,34 @@ namespace MediaBrowser.Model.Providers
 {
     public class RemoteSearchResult : IHasProviderIds
     {
+        public RemoteSearchResult()
+        {
+            ProviderIds = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            Artists = Array.Empty<RemoteSearchResult>();
+        }
+
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
         public string Name { get; set; }
+
         /// <summary>
         /// Gets or sets the provider ids.
         /// </summary>
         /// <value>The provider ids.</value>
         public Dictionary<string, string> ProviderIds { get; set; }
+
         /// <summary>
         /// Gets or sets the year.
         /// </summary>
         /// <value>The year.</value>
         public int? ProductionYear { get; set; }
+
         public int? IndexNumber { get; set; }
+
         public int? IndexNumberEnd { get; set; }
+
         public int? ParentIndexNumber { get; set; }
 
         public DateTime? PremiereDate { get; set; }
@@ -32,15 +44,12 @@ namespace MediaBrowser.Model.Providers
         public string ImageUrl { get; set; }
 
         public string SearchProviderName { get; set; }
+
         public string Overview { get; set; }
 
         public RemoteSearchResult AlbumArtist { get; set; }
+
         public RemoteSearchResult[] Artists { get; set; }
 
-        public RemoteSearchResult()
-        {
-            ProviderIds = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-            Artists = new RemoteSearchResult[] { };
-        }
     }
 }
diff --git a/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs b/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs
index 06f29df3f9..a8d88d8a1b 100644
--- a/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs
+++ b/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs
@@ -1,3 +1,4 @@
+#nullable disable
 #pragma warning disable CS1591
 
 using System;
@@ -7,15 +8,25 @@ namespace MediaBrowser.Model.Providers
     public class RemoteSubtitleInfo
     {
         public string ThreeLetterISOLanguageName { get; set; }
+
         public string Id { get; set; }
+
         public string ProviderName { get; set; }
+
         public string Name { get; set; }
+
         public string Format { get; set; }
+
         public string Author { get; set; }
+
         public string Comment { get; set; }
+
         public DateTime? DateCreated { get; set; }
+
         public float? CommunityRating { get; set; }
+
         public int? DownloadCount { get; set; }
+
         public bool? IsHashMatch { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Providers/SubtitleOptions.cs b/MediaBrowser.Model/Providers/SubtitleOptions.cs
index 9e60492463..5702c460b0 100644
--- a/MediaBrowser.Model/Providers/SubtitleOptions.cs
+++ b/MediaBrowser.Model/Providers/SubtitleOptions.cs
@@ -1,3 +1,4 @@
+#nullable disable
 #pragma warning disable CS1591
 
 using System;
@@ -7,13 +8,19 @@ namespace MediaBrowser.Model.Providers
     public class SubtitleOptions
     {
         public bool SkipIfEmbeddedSubtitlesPresent { get; set; }
+
         public bool SkipIfAudioTrackMatches { get; set; }
+
         public string[] DownloadLanguages { get; set; }
+
         public bool DownloadMovieSubtitles { get; set; }
+
         public bool DownloadEpisodeSubtitles { get; set; }
 
         public string OpenSubtitlesUsername { get; set; }
+
         public string OpenSubtitlesPasswordHash { get; set; }
+
         public bool IsOpenSubtitleVipAccount { get; set; }
 
         public bool RequirePerfectMatch { get; set; }
diff --git a/MediaBrowser.Model/Providers/SubtitleProviderInfo.cs b/MediaBrowser.Model/Providers/SubtitleProviderInfo.cs
index fca93d176e..7a7e7b9ec3 100644
--- a/MediaBrowser.Model/Providers/SubtitleProviderInfo.cs
+++ b/MediaBrowser.Model/Providers/SubtitleProviderInfo.cs
@@ -1,3 +1,4 @@
+#nullable disable
 #pragma warning disable CS1591
 
 namespace MediaBrowser.Model.Providers
@@ -5,6 +6,7 @@ namespace MediaBrowser.Model.Providers
     public class SubtitleProviderInfo
     {
         public string Name { get; set; }
+
         public string Id { get; set; }
     }
 }