update music brainz album responses

2 files changed, 31 insertions, 4 deletions

diff --git a/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs b/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
index 09a0edcf0..30fe7c21a 100644
--- a/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
+++ b/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
@@ -293,11 +293,33 @@ namespace MediaBrowser.Providers.Music
 
             var doc = await GetMusicBrainzResponse(url, false, cancellationToken).ConfigureAwait(false);
 
-            var ns = new XmlNamespaceManager(doc.NameTable);
-            ns.AddNamespace("mb", MusicBrainzBaseUrl + "/ns/mmd-2.0#");
-            var node = doc.SelectSingleNode("//mb:release-group-list/mb:release-group/@id", ns);
+            var docElem = doc.DocumentElement;
+
+            if (docElem == null)
+            {
+                return null;
+            }
+
+            var releaseList = docElem.FirstChild;
+            if (releaseList == null)
+            {
+                return null;
+            }
 
-            return node != null ? node.Value : null;
+            var nodes = releaseList.ChildNodes;
+            string releaseGroupId = null;
+
+            if (nodes != null)
+            {
+                foreach (var node in nodes.Cast<XmlNode>())
+                {
+                    if (string.Equals(node.Name, "release-group", StringComparison.OrdinalIgnoreCase))
+                    {
+                        return node.Attributes["id"].Value;
+                    }
+                }
+            }
+            return null;
         }
 
         /// <summary>
diff --git a/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
index 18423f59e..e30a52c78 100644
--- a/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
@@ -44,6 +44,11 @@ namespace MediaBrowser.XbmcMetadata.Savers
             }
             else
             {
+                //if (item is Movie)
+                //{
+                //    list.Add(Path.Combine(item.ContainingFolderPath, "movie.nfo"));
+                //}
+
                 list.Add(Path.ChangeExtension(item.Path, ".nfo"));
             }