Merge branch 'master' into buffer

6 files changed, 94 insertions, 17 deletions

diff --git a/MediaBrowser.Providers/Plugins/AudioDb/AlbumImageProvider.cs b/MediaBrowser.Providers/Plugins/AudioDb/AlbumImageProvider.cs
index dee2d59f0f..3c314acb38 100644
--- a/MediaBrowser.Providers/Plugins/AudioDb/AlbumImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/AudioDb/AlbumImageProvider.cs
@@ -45,7 +45,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
         /// <inheritdoc />
         public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, CancellationToken cancellationToken)
         {
-            var id = item.GetProviderId(MetadataProviders.MusicBrainzReleaseGroup);
+            var id = item.GetProviderId(MetadataProvider.MusicBrainzReleaseGroup);
 
             if (!string.IsNullOrWhiteSpace(id))
             {
diff --git a/MediaBrowser.Providers/Plugins/AudioDb/AlbumProvider.cs b/MediaBrowser.Providers/Plugins/AudioDb/AlbumProvider.cs
index 1a0e878719..96224b366e 100644
--- a/MediaBrowser.Providers/Plugins/AudioDb/AlbumProvider.cs
+++ b/MediaBrowser.Providers/Plugins/AudioDb/AlbumProvider.cs
@@ -104,11 +104,11 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
                 item.Genres = new[] { result.strGenre };
             }
 
-            item.SetProviderId(MetadataProviders.AudioDbArtist, result.idArtist);
-            item.SetProviderId(MetadataProviders.AudioDbAlbum, result.idAlbum);
+            item.SetProviderId(MetadataProvider.AudioDbArtist, result.idArtist);
+            item.SetProviderId(MetadataProvider.AudioDbAlbum, result.idAlbum);
 
-            item.SetProviderId(MetadataProviders.MusicBrainzAlbumArtist, result.strMusicBrainzArtistID);
-            item.SetProviderId(MetadataProviders.MusicBrainzReleaseGroup, result.strMusicBrainzID);
+            item.SetProviderId(MetadataProvider.MusicBrainzAlbumArtist, result.strMusicBrainzArtistID);
+            item.SetProviderId(MetadataProvider.MusicBrainzReleaseGroup, result.strMusicBrainzID);
 
             string overview = null;
 
@@ -210,42 +210,79 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
         public class Album
         {
             public string idAlbum { get; set; }
+
             public string idArtist { get; set; }
+
             public string strAlbum { get; set; }
+
             public string strArtist { get; set; }
+
             public string intYearReleased { get; set; }
+
             public string strGenre { get; set; }
+
             public string strSubGenre { get; set; }
+
             public string strReleaseFormat { get; set; }
+
             public string intSales { get; set; }
+
             public string strAlbumThumb { get; set; }
+
             public string strAlbumCDart { get; set; }
+
             public string strDescriptionEN { get; set; }
+
             public string strDescriptionDE { get; set; }
+
             public string strDescriptionFR { get; set; }
+
             public string strDescriptionCN { get; set; }
+
             public string strDescriptionIT { get; set; }
+
             public string strDescriptionJP { get; set; }
+
             public string strDescriptionRU { get; set; }
+
             public string strDescriptionES { get; set; }
+
             public string strDescriptionPT { get; set; }
+
             public string strDescriptionSE { get; set; }
+
             public string strDescriptionNL { get; set; }
+
             public string strDescriptionHU { get; set; }
+
             public string strDescriptionNO { get; set; }
+
             public string strDescriptionIL { get; set; }
+
             public string strDescriptionPL { get; set; }
+
             public object intLoved { get; set; }
+
             public object intScore { get; set; }
+
             public string strReview { get; set; }
+
             public object strMood { get; set; }
+
             public object strTheme { get; set; }
+
             public object strSpeed { get; set; }
+
             public object strLocation { get; set; }
+
             public string strMusicBrainzID { get; set; }
+
             public string strMusicBrainzArtistID { get; set; }
+
             public object strItunesID { get; set; }
+
             public object strAmazonID { get; set; }
+
             public string strLocked { get; set; }
         }
 
diff --git a/MediaBrowser.Providers/Plugins/AudioDb/ArtistImageProvider.cs b/MediaBrowser.Providers/Plugins/AudioDb/ArtistImageProvider.cs
index 18afd5dd5c..04cdab66a6 100644
--- a/MediaBrowser.Providers/Plugins/AudioDb/ArtistImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/AudioDb/ArtistImageProvider.cs
@@ -47,7 +47,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
         /// <inheritdoc />
         public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, CancellationToken cancellationToken)
         {
-            var id = item.GetProviderId(MetadataProviders.MusicBrainzArtist);
+            var id = item.GetProviderId(MetadataProvider.MusicBrainzArtist);
 
             if (!string.IsNullOrWhiteSpace(id))
             {
diff --git a/MediaBrowser.Providers/Plugins/AudioDb/ArtistProvider.cs b/MediaBrowser.Providers/Plugins/AudioDb/ArtistProvider.cs
index df0f3df8fa..14bbcddcea 100644
--- a/MediaBrowser.Providers/Plugins/AudioDb/ArtistProvider.cs
+++ b/MediaBrowser.Providers/Plugins/AudioDb/ArtistProvider.cs
@@ -85,15 +85,15 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
 
         private void ProcessResult(MusicArtist item, Artist result, string preferredLanguage)
         {
-            //item.HomePageUrl = result.strWebsite;
+            // item.HomePageUrl = result.strWebsite;
 
             if (!string.IsNullOrEmpty(result.strGenre))
             {
                 item.Genres = new[] { result.strGenre };
             }
 
-            item.SetProviderId(MetadataProviders.AudioDbArtist, result.idArtist);
-            item.SetProviderId(MetadataProviders.MusicBrainzArtist, result.strMusicBrainzID);
+            item.SetProviderId(MetadataProvider.AudioDbArtist, result.idArtist);
+            item.SetProviderId(MetadataProvider.MusicBrainzArtist, result.strMusicBrainzID);
 
             string overview = null;
 
@@ -199,45 +199,85 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
         public class Artist
         {
             public string idArtist { get; set; }
+
             public string strArtist { get; set; }
+
             public string strArtistAlternate { get; set; }
+
             public object idLabel { get; set; }
+
             public string intFormedYear { get; set; }
+
             public string intBornYear { get; set; }
+
             public object intDiedYear { get; set; }
+
             public object strDisbanded { get; set; }
+
             public string strGenre { get; set; }
+
             public string strSubGenre { get; set; }
+
             public string strWebsite { get; set; }
+
             public string strFacebook { get; set; }
+
             public string strTwitter { get; set; }
+
             public string strBiographyEN { get; set; }
+
             public string strBiographyDE { get; set; }
+
             public string strBiographyFR { get; set; }
+
             public string strBiographyCN { get; set; }
+
             public string strBiographyIT { get; set; }
+
             public string strBiographyJP { get; set; }
+
             public string strBiographyRU { get; set; }
+
             public string strBiographyES { get; set; }
+
             public string strBiographyPT { get; set; }
+
             public string strBiographySE { get; set; }
+
             public string strBiographyNL { get; set; }
+
             public string strBiographyHU { get; set; }
+
             public string strBiographyNO { get; set; }
+
             public string strBiographyIL { get; set; }
+
             public string strBiographyPL { get; set; }
+
             public string strGender { get; set; }
+
             public string intMembers { get; set; }
+
             public string strCountry { get; set; }
+
             public string strCountryCode { get; set; }
+
             public string strArtistThumb { get; set; }
+
             public string strArtistLogo { get; set; }
+
             public string strArtistFanart { get; set; }
+
             public string strArtistFanart2 { get; set; }
+
             public string strArtistFanart3 { get; set; }
+
             public string strArtistBanner { get; set; }
+
             public string strMusicBrainzID { get; set; }
+
             public object strLastFMChart { get; set; }
+
             public string strLocked { get; set; }
         }
 
diff --git a/MediaBrowser.Providers/Plugins/AudioDb/Configuration/config.html b/MediaBrowser.Providers/Plugins/AudioDb/Configuration/config.html
index 34494644d4..fbf413f2b5 100644
--- a/MediaBrowser.Providers/Plugins/AudioDb/Configuration/config.html
+++ b/MediaBrowser.Providers/Plugins/AudioDb/Configuration/config.html
@@ -31,8 +31,8 @@
             $('.configPage').on('pageshow', function () {
                 Dashboard.showLoadingMsg();
                 ApiClient.getPluginConfiguration(PluginConfig.pluginId).then(function (config) {
-                    $('#enable').checked(config.Enable);
-                    $('#replaceAlbumName').checked(config.ReplaceAlbumName);
+                    $('#enable').checked = config.Enable;
+                    $('#replaceAlbumName').checked = config.ReplaceAlbumName;
 
                     Dashboard.hideLoadingMsg();
                 });
@@ -43,8 +43,8 @@
 
                 var form = this;
                 ApiClient.getPluginConfiguration(PluginConfig.pluginId).then(function (config) {
-                    config.Enable = $('#enable', form).checked();
-                    config.ReplaceAlbumName = $('#replaceAlbumName', form).checked();
+                    config.Enable = $('#enable', form).checked;
+                    config.ReplaceAlbumName = $('#replaceAlbumName', form).checked;
 
                     ApiClient.updatePluginConfiguration(PluginConfig.pluginId, config).then(Dashboard.processPluginConfigurationUpdateResult);
                 });
diff --git a/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs b/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs
index 2d8cb431ca..478ea51909 100644
--- a/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs
+++ b/MediaBrowser.Providers/Plugins/AudioDb/ExternalIds.cs
@@ -10,7 +10,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
         public string Name => "TheAudioDb";
 
         /// <inheritdoc />
-        public string Key => MetadataProviders.AudioDbAlbum.ToString();
+        public string Key => MetadataProvider.AudioDbAlbum.ToString();
 
         /// <inheritdoc />
         public string UrlFormatString => "https://www.theaudiodb.com/album/{0}";
@@ -25,7 +25,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
         public string Name => "TheAudioDb Album";
 
         /// <inheritdoc />
-        public string Key => MetadataProviders.AudioDbAlbum.ToString();
+        public string Key => MetadataProvider.AudioDbAlbum.ToString();
 
         /// <inheritdoc />
         public string UrlFormatString => "https://www.theaudiodb.com/album/{0}";
@@ -40,7 +40,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
         public string Name => "TheAudioDb";
 
         /// <inheritdoc />
-        public string Key => MetadataProviders.AudioDbArtist.ToString();
+        public string Key => MetadataProvider.AudioDbArtist.ToString();
 
         /// <inheritdoc />
         public string UrlFormatString => "https://www.theaudiodb.com/artist/{0}";
@@ -55,7 +55,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
         public string Name => "TheAudioDb Artist";
 
         /// <inheritdoc />
-        public string Key => MetadataProviders.AudioDbArtist.ToString();
+        public string Key => MetadataProvider.AudioDbArtist.ToString();
 
         /// <inheritdoc />
         public string UrlFormatString => "https://www.theaudiodb.com/artist/{0}";