2 files changed, 35 insertions, 20 deletions
diff --git a/MediaBrowser.XbmcMetadata/EntryPoint.cs b/MediaBrowser.XbmcMetadata/EntryPoint.cs
index 992991a7ed..fe4d50efaa 100644
--- a/MediaBrowser.XbmcMetadata/EntryPoint.cs
+++ b/MediaBrowser.XbmcMetadata/EntryPoint.cs
@@ -16,27 +16,30 @@ namespace MediaBrowser.XbmcMetadata
     {
         private readonly IUserDataManager _userDataManager;
         private readonly ILogger _logger;
-        private readonly ILibraryManager _libraryManager;
         private readonly IProviderManager _providerManager;
         private readonly IConfigurationManager _config;
 
-        public EntryPoint(IUserDataManager userDataManager, ILibraryManager libraryManager, ILogger logger, IProviderManager providerManager, IConfigurationManager config)
+        public EntryPoint(
+            IUserDataManager userDataManager,
+            ILogger logger,
+            IProviderManager providerManager,
+            IConfigurationManager config)
         {
             _userDataManager = userDataManager;
-            _libraryManager = libraryManager;
             _logger = logger;
             _providerManager = providerManager;
             _config = config;
         }
 
+        /// <inheritdoc />
         public Task RunAsync()
         {
-            _userDataManager.UserDataSaved += _userDataManager_UserDataSaved;
+            _userDataManager.UserDataSaved += OnUserDataSaved;
 
             return Task.CompletedTask;
         }
 
-        void _userDataManager_UserDataSaved(object sender, UserDataSaveEventArgs e)
+        private void OnUserDataSaved(object sender, UserDataSaveEventArgs e)
         {
             if (e.SaveReason == UserDataSaveReason.PlaybackFinished || e.SaveReason == UserDataSaveReason.TogglePlayed || e.SaveReason == UserDataSaveReason.UpdateUserRating)
             {
@@ -47,9 +50,10 @@ namespace MediaBrowser.XbmcMetadata
             }
         }
 
+        /// <inheritdoc />
         public void Dispose()
         {
-            _userDataManager.UserDataSaved -= _userDataManager_UserDataSaved;
+            _userDataManager.UserDataSaved -= OnUserDataSaved;
         }
 
         private void SaveMetadataForItem(BaseItem item, ItemUpdateType updateReason)
diff --git a/MediaBrowser.XbmcMetadata/Savers/AlbumNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/AlbumNfoSaver.cs
index 430b931999..a1905bf26c 100644
--- a/MediaBrowser.XbmcMetadata/Savers/AlbumNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/AlbumNfoSaver.cs
@@ -15,16 +15,30 @@ namespace MediaBrowser.XbmcMetadata.Savers
 {
     public class AlbumNfoSaver : BaseNfoSaver
     {
+        public AlbumNfoSaver(
+            IFileSystem fileSystem,
+            IServerConfigurationManager configurationManager,
+            ILibraryManager libraryManager,
+            IUserManager userManager,
+            IUserDataManager userDataManager,
+            ILogger logger)
+            : base(fileSystem, configurationManager, libraryManager, userManager, userDataManager, logger)
+        {
+        }
+
+        /// <inheritdoc />
         protected override string GetLocalSavePath(BaseItem item)
         {
             return Path.Combine(item.Path, "album.nfo");
         }
 
+        /// <inheritdoc />
         protected override string GetRootElementName(BaseItem item)
         {
             return "album";
         }
 
+        /// <inheritdoc />
         public override bool IsEnabledFor(BaseItem item, ItemUpdateType updateType)
         {
             if (!item.SupportsLocalMetadata)
@@ -35,6 +49,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
             return item is MusicAlbum && updateType >= MinimumUpdateType;
         }
 
+        /// <inheritdoc />
         protected override void WriteCustomElements(BaseItem item, XmlWriter writer)
         {
             var album = (MusicAlbum)item;
@@ -52,8 +67,6 @@ namespace MediaBrowser.XbmcMetadata.Savers
             AddTracks(album.Tracks, writer);
         }
 
-        private readonly CultureInfo UsCulture = new CultureInfo("en-US");
-
         private void AddTracks(IEnumerable<BaseItem> tracks, XmlWriter writer)
         {
             foreach (var track in tracks.OrderBy(i => i.ParentIndexNumber ?? 0).ThenBy(i => i.IndexNumber ?? 0))
@@ -62,7 +75,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
 
                 if (track.IndexNumber.HasValue)
                 {
-                    writer.WriteElementString("position", track.IndexNumber.Value.ToString(UsCulture));
+                    writer.WriteElementString("position", track.IndexNumber.Value.ToString(CultureInfo.InvariantCulture));
                 }
 
                 if (!string.IsNullOrEmpty(track.Name))
@@ -81,21 +94,19 @@ namespace MediaBrowser.XbmcMetadata.Savers
             }
         }
 
+        /// <inheritdoc />
         protected override List<string> GetTagsUsed(BaseItem item)
         {
             var list = base.GetTagsUsed(item);
-            list.AddRange(new string[]
-            {
-                "track",
-                "artist",
-                "albumartist"
-            });
-            return list;
-        }
+            list.AddRange(
+                new string[]
+                {
+                    "track",
+                    "artist",
+                    "albumartist"
+                });
 
-        public AlbumNfoSaver(IFileSystem fileSystem, IServerConfigurationManager configurationManager, ILibraryManager libraryManager, IUserManager userManager, IUserDataManager userDataManager, ILogger logger)
-            : base(fileSystem, configurationManager, libraryManager, userManager, userDataManager, logger)
-        {
+            return list;
         }
     }
 }