Merge branch 'dev' of https://github.com/hatharry/Emby.git

1 files changed, 4 insertions, 13 deletions

diff --git a/MediaBrowser.Api/StartupWizardService.cs b/MediaBrowser.Api/StartupWizardService.cs
index ef898eb53..d5158677c 100644
--- a/MediaBrowser.Api/StartupWizardService.cs
+++ b/MediaBrowser.Api/StartupWizardService.cs
@@ -88,8 +88,6 @@ namespace MediaBrowser.Api
             var result = new StartupConfiguration
             {
                 UICulture = _config.Configuration.UICulture,
-                EnableInternetProviders = _config.Configuration.EnableInternetProviders,
-                SaveLocalMeta = _config.Configuration.SaveLocalMeta,
                 MetadataCountryCode = _config.Configuration.MetadataCountryCode,
                 PreferredMetadataLanguage = _config.Configuration.PreferredMetadataLanguage
             };
@@ -116,15 +114,16 @@ namespace MediaBrowser.Api
             config.EnableLocalizedGuids = true;
             config.EnableStandaloneMusicKeys = true;
             config.EnableCaseSensitiveItemIds = true;
-            //config.EnableFolderView = true;
+            config.EnableFolderView = true;
             config.SchemaVersion = 109;
+            config.EnableSimpleArtistDetection = true;
+            config.SkipDeserializationForBasicTypes = true;
+            config.SkipDeserializationForPrograms = true;
         }
 
         public void Post(UpdateStartupConfiguration request)
         {
             _config.Configuration.UICulture = request.UICulture;
-            _config.Configuration.EnableInternetProviders = request.EnableInternetProviders;
-            _config.Configuration.SaveLocalMeta = request.SaveLocalMeta;
             _config.Configuration.MetadataCountryCode = request.MetadataCountryCode;
             _config.Configuration.PreferredMetadataLanguage = request.PreferredMetadataLanguage;
             _config.SaveConfiguration();
@@ -148,12 +147,6 @@ namespace MediaBrowser.Api
         {
             var user = _userManager.Users.First();
 
-            // TODO: This should be handled internally by xbmc metadata
-            const string metadataKey = "xbmcmetadata";
-            var metadata = _config.GetConfiguration<XbmcMetadataOptions>(metadataKey);
-            metadata.UserId = user.Id.ToString("N");
-            _config.SaveConfiguration(metadataKey, metadata);
-
             user.Name = request.Name;
             await _userManager.UpdateUser(user).ConfigureAwait(false);
 
@@ -221,8 +214,6 @@ namespace MediaBrowser.Api
     public class StartupConfiguration
     {
         public string UICulture { get; set; }
-        public bool EnableInternetProviders { get; set; }
-        public bool SaveLocalMeta { get; set; }
         public string MetadataCountryCode { get; set; }
         public string PreferredMetadataLanguage { get; set; }
         public string LiveTvTunerType { get; set; }