Merge branch 'master' into bug/authorization-header-issue

3 files changed, 27 insertions, 12 deletions

diff --git a/MediaBrowser.Model/Providers/ExternalIdInfo.cs b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
index 01784554f..0ea3e96ca 100644
--- a/MediaBrowser.Model/Providers/ExternalIdInfo.cs
+++ b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
@@ -6,16 +6,31 @@ namespace MediaBrowser.Model.Providers
     public class ExternalIdInfo
     {
         /// <summary>
+        /// Initializes a new instance of the <see cref="ExternalIdInfo"/> class.
+        /// </summary>
+        /// <param name="name">Name of the external id provider (IE: IMDB, MusicBrainz, etc).</param>
+        /// <param name="key">Key for this id. This key should be unique across all providers.</param>
+        /// <param name="type">Specific media type for this id.</param>
+        /// <param name="urlFormatString">URL format string.</param>
+        public ExternalIdInfo(string name, string key, ExternalIdMediaType? type, string urlFormatString)
+        {
+            Name = name;
+            Key = key;
+            Type = type;
+            UrlFormatString = urlFormatString;
+        }
+
+        /// <summary>
         /// Gets or sets the display name of the external id provider (IE: IMDB, MusicBrainz, etc).
         /// </summary>
         // TODO: This should be renamed to ProviderName
-        public string? Name { get; set; }
+        public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the unique key for this id. This key should be unique across all providers.
         /// </summary>
         // TODO: This property is not actually unique across the concrete types at the moment. It should be updated to be unique.
-        public string? Key { get; set; }
+        public string Key { get; set; }
 
         /// <summary>
         /// Gets or sets the specific media type for this id. This is used to distinguish between the different
@@ -31,6 +46,6 @@ namespace MediaBrowser.Model.Providers
         /// <summary>
         /// Gets or sets the URL format string.
         /// </summary>
-        public string? UrlFormatString { get; set; }
+        public string UrlFormatString { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Providers/RemoteImageInfo.cs b/MediaBrowser.Model/Providers/RemoteImageInfo.cs
index fb25999e0..48207d2d4 100644
--- a/MediaBrowser.Model/Providers/RemoteImageInfo.cs
+++ b/MediaBrowser.Model/Providers/RemoteImageInfo.cs
@@ -22,7 +22,7 @@ namespace MediaBrowser.Model.Providers
         public string Url { get; set; }
 
         /// <summary>
-        /// Gets a url used for previewing a smaller version.
+        /// Gets or sets a url used for previewing a smaller version.
         /// </summary>
         public string ThumbnailUrl { get; set; }
 
diff --git a/MediaBrowser.Model/Providers/SubtitleOptions.cs b/MediaBrowser.Model/Providers/SubtitleOptions.cs
index 5702c460b..6ea1e1486 100644
--- a/MediaBrowser.Model/Providers/SubtitleOptions.cs
+++ b/MediaBrowser.Model/Providers/SubtitleOptions.cs
@@ -7,6 +7,14 @@ namespace MediaBrowser.Model.Providers
 {
     public class SubtitleOptions
     {
+        public SubtitleOptions()
+        {
+            DownloadLanguages = Array.Empty<string>();
+
+            SkipIfAudioTrackMatches = true;
+            RequirePerfectMatch = true;
+        }
+
         public bool SkipIfEmbeddedSubtitlesPresent { get; set; }
 
         public bool SkipIfAudioTrackMatches { get; set; }
@@ -24,13 +32,5 @@ namespace MediaBrowser.Model.Providers
         public bool IsOpenSubtitleVipAccount { get; set; }
 
         public bool RequirePerfectMatch { get; set; }
-
-        public SubtitleOptions()
-        {
-            DownloadLanguages = Array.Empty<string>();
-
-            SkipIfAudioTrackMatches = true;
-            RequirePerfectMatch = true;
-        }
     }
 }