diff options
Diffstat (limited to 'MediaBrowser.XbmcMetadata')
5 files changed, 11 insertions, 13 deletions
diff --git a/MediaBrowser.XbmcMetadata/EntryPoint.cs b/MediaBrowser.XbmcMetadata/EntryPoint.cs index ac5313a291..b1c687a6e3 100644 --- a/MediaBrowser.XbmcMetadata/EntryPoint.cs +++ b/MediaBrowser.XbmcMetadata/EntryPoint.cs @@ -8,7 +8,6 @@ using MediaBrowser.Model.Logging; using MediaBrowser.XbmcMetadata.Configuration; using MediaBrowser.XbmcMetadata.Savers; using System; -using System.Linq; using MediaBrowser.Controller.Dto; namespace MediaBrowser.XbmcMetadata diff --git a/MediaBrowser.XbmcMetadata/Parsers/MovieNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/MovieNfoParser.cs index f9ca238c7e..85f9f92baa 100644 --- a/MediaBrowser.XbmcMetadata/Parsers/MovieNfoParser.cs +++ b/MediaBrowser.XbmcMetadata/Parsers/MovieNfoParser.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Common.Configuration; +using System.Linq; +using MediaBrowser.Common.Configuration; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.Providers; @@ -81,7 +82,9 @@ namespace MediaBrowser.XbmcMetadata.Parsers if (!string.IsNullOrWhiteSpace(val) && movie != null) { - movie.Artists.Add(val); + var list = movie.Artists.ToList(); + list.Add(val); + movie.Artists = list.ToArray(); } break; diff --git a/MediaBrowser.XbmcMetadata/Savers/AlbumNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/AlbumNfoSaver.cs index ec53b3bc4c..f9f9c9b98a 100644 --- a/MediaBrowser.XbmcMetadata/Savers/AlbumNfoSaver.cs +++ b/MediaBrowser.XbmcMetadata/Savers/AlbumNfoSaver.cs @@ -57,10 +57,9 @@ namespace MediaBrowser.XbmcMetadata.Savers private static readonly CultureInfo UsCulture = new CultureInfo("en-US"); - private void AddTracks(IEnumerable<Audio> tracks, XmlWriter writer) + private void AddTracks(IEnumerable<BaseItem> tracks, XmlWriter writer) { - foreach (var track in tracks.OrderBy(i => i.ParentIndexNumber ?? 0) - .ThenBy(i => i.IndexNumber ?? 0)) + foreach (var track in tracks.OrderBy(i => i.ParentIndexNumber ?? 0).ThenBy(i => i.IndexNumber ?? 0)) { writer.WriteStartElement("track"); diff --git a/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs index 413738ade1..a7f4e56a65 100644 --- a/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs +++ b/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs @@ -7,7 +7,6 @@ using MediaBrowser.XbmcMetadata.Configuration; using System.Collections.Generic; using System.Globalization; using System.IO; -using System.Linq; using System.Xml; using MediaBrowser.Controller.IO; @@ -50,16 +49,14 @@ namespace MediaBrowser.XbmcMetadata.Savers } var albums = artist - .GetRecursiveChildren(i => i is MusicAlbum) - .Cast<MusicAlbum>() - .ToList(); + .GetRecursiveChildren(i => i is MusicAlbum); AddAlbums(albums, writer); } private static readonly CultureInfo UsCulture = new CultureInfo("en-US"); - private void AddAlbums(IEnumerable<MusicAlbum> albums, XmlWriter writer) + private void AddAlbums(IList<BaseItem> albums, XmlWriter writer) { foreach (var album in albums) { diff --git a/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs index 70fb4e5fa2..1989a2c284 100644 --- a/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs +++ b/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs @@ -8,7 +8,6 @@ using MediaBrowser.Model.Entities; using MediaBrowser.Model.Logging; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Xml; using MediaBrowser.Controller.IO; @@ -21,7 +20,8 @@ namespace MediaBrowser.XbmcMetadata.Savers { protected override string GetLocalSavePath(IHasMetadata item) { - return GetMovieSavePaths(new ItemInfo(item), FileSystem).FirstOrDefault(); + var paths = GetMovieSavePaths(new ItemInfo(item), FileSystem); + return paths.Count == 0 ? null : paths[0]; } public static List<string> GetMovieSavePaths(ItemInfo item, IFileSystem fileSystem) |