update music user data key

3 files changed, 15 insertions, 7 deletions

diff --git a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
index 7362ee58f7..cb74d4dd77 100644
--- a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
+++ b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
@@ -180,7 +180,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                     }
                     catch (XmlException)
                     {
-                        
+
                     }
                 }
             }
@@ -661,7 +661,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                             if (!string.IsNullOrWhiteSpace(val))
                             {
                                 val = val.Replace("plugin://plugin.video.youtube/?action=play_video&videoid=", "http://www.youtube.com/watch?v=", StringComparison.OrdinalIgnoreCase);
-                                
+
                                 hasTrailer.AddTrailerUrl(val, false);
                             }
                         }
@@ -860,6 +860,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                     break;
 
                 case "collectionnumber":
+                case "tmdbcolid":
                     var tmdbCollection = reader.ReadElementContentAsString();
                     if (!string.IsNullOrWhiteSpace(tmdbCollection))
                     {
diff --git a/MediaBrowser.XbmcMetadata/Parsers/MovieNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/MovieNfoParser.cs
index 8d5c2bf20e..14c214f043 100644
--- a/MediaBrowser.XbmcMetadata/Parsers/MovieNfoParser.cs
+++ b/MediaBrowser.XbmcMetadata/Parsers/MovieNfoParser.cs
@@ -11,7 +11,8 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 {
     class MovieNfoParser : BaseNfoParser<Video>
     {
-        public MovieNfoParser(ILogger logger, IConfigurationManager config) : base(logger, config)
+        public MovieNfoParser(ILogger logger, IConfigurationManager config)
+            : base(logger, config)
         {
         }
 
@@ -44,12 +45,18 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                 case "set":
                     {
-                        var val = reader.ReadElementContentAsString();
                         var movie = item as Movie;
 
+                        var tmdbcolid = reader.GetAttribute("tmdbcolid");
+                        if (!string.IsNullOrWhiteSpace(tmdbcolid) && movie != null)
+                        {
+                            movie.SetProviderId(MetadataProviders.TmdbCollection, tmdbcolid);
+                        }
+
+                        var val = reader.ReadElementContentAsString();
                         if (!string.IsNullOrWhiteSpace(val) && movie != null)
                         {
-                            movie.TmdbCollectionName = val;
+                            movie.CollectionName = val;
                         }
 
                         break;
diff --git a/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
index 3734f3f36f..0b8ce9712c 100644
--- a/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
@@ -101,9 +101,9 @@ namespace MediaBrowser.XbmcMetadata.Savers
 
             if (movie != null)
             {
-                if (!string.IsNullOrEmpty(movie.TmdbCollectionName))
+                if (!string.IsNullOrEmpty(movie.CollectionName))
                 {
-                    writer.WriteElementString("set", movie.TmdbCollectionName);
+                    writer.WriteElementString("set", movie.CollectionName);
                 }
             }
         }