diff --git a/MediaBrowser.Dlna/PlayTo/PlayToServerEntryPoint.cs b/MediaBrowser.Dlna/PlayTo/PlayToServerEntryPoint.cs index d86b6650a..b1afeb0f4 100644 --- a/MediaBrowser.Dlna/PlayTo/PlayToServerEntryPoint.cs +++ b/MediaBrowser.Dlna/PlayTo/PlayToServerEntryPoint.cs @@ -20,7 +20,7 @@ namespace MediaBrowser.Dlna.PlayTo public void Run() { - _manager.Start(); + //_manager.Start(); } #region Dispose diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs index 7ba3939a2..661dc62bb 100644 --- a/MediaBrowser.Model/Dto/BaseItemDto.cs +++ b/MediaBrowser.Model/Dto/BaseItemDto.cs @@ -48,6 +48,10 @@ namespace MediaBrowser.Model.Dto public string AwardSummary { get; set; } public float? Metascore { get; set; } + + public bool IsUnidentified { get; set; } + + public int? AnimeSeriesIndex { get; set; } /// /// Gets or sets the DVD season number. diff --git a/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs b/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs index 9182587b1..f5b43e407 100644 --- a/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs +++ b/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs @@ -380,7 +380,7 @@ namespace MediaBrowser.Providers.Movies /// System.String. internal static string GetMoviesDataPath(IApplicationPaths appPaths) { - var dataPath = Path.Combine(appPaths.DataPath, "fanart-movies"); + var dataPath = Path.Combine(appPaths.CachePath, "fanart-movies"); return dataPath; } diff --git a/MediaBrowser.Providers/Music/FanArtArtistProvider.cs b/MediaBrowser.Providers/Music/FanArtArtistProvider.cs index 270219a2b..b9916dfba 100644 --- a/MediaBrowser.Providers/Music/FanArtArtistProvider.cs +++ b/MediaBrowser.Providers/Music/FanArtArtistProvider.cs @@ -458,7 +458,7 @@ namespace MediaBrowser.Providers.Music /// System.String. internal static string GetArtistDataPath(IApplicationPaths appPaths) { - var dataPath = Path.Combine(appPaths.DataPath, "fanart-music"); + var dataPath = Path.Combine(appPaths.CachePath, "fanart-music"); return dataPath; } diff --git a/MediaBrowser.Providers/People/MovieDbPersonProvider.cs b/MediaBrowser.Providers/People/MovieDbPersonProvider.cs index 792c9e910..01be6bf91 100644 --- a/MediaBrowser.Providers/People/MovieDbPersonProvider.cs +++ b/MediaBrowser.Providers/People/MovieDbPersonProvider.cs @@ -217,7 +217,7 @@ namespace MediaBrowser.Providers.People private static string GetPersonsDataPath(IApplicationPaths appPaths) { - return Path.Combine(appPaths.DataPath, "tmdb-people"); + return Path.Combine(appPaths.CachePath, "tmdb-people"); } #region Result Objects diff --git a/MediaBrowser.Providers/Savers/SeriesXmlSaver.cs b/MediaBrowser.Providers/Savers/SeriesXmlSaver.cs index 5f58001ec..e69f2e085 100644 --- a/MediaBrowser.Providers/Savers/SeriesXmlSaver.cs +++ b/MediaBrowser.Providers/Savers/SeriesXmlSaver.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Controller.Entities; +using System.Globalization; +using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Library; using MediaBrowser.Model.Entities; @@ -36,6 +37,8 @@ namespace MediaBrowser.Providers.Savers return item is Series && updateType >= ItemUpdateType.MetadataDownload; } + private static readonly CultureInfo UsCulture = new CultureInfo("en-US"); + /// /// Saves the specified item. /// @@ -94,6 +97,11 @@ namespace MediaBrowser.Providers.Savers builder.Append("" + SecurityElement.Escape(series.PremiereDate.Value.ToLocalTime().ToString("yyyy-MM-dd")) + ""); } + if (series.AnimeSeriesIndex.HasValue) + { + builder.Append("" + SecurityElement.Escape(series.AnimeSeriesIndex.Value.ToString(UsCulture)) + ""); + } + XmlSaverHelpers.AddCommonNodes(series, builder); builder.Append(""); @@ -111,7 +119,8 @@ namespace MediaBrowser.Providers.Savers "FirstAired", // Don't preserve old series node - "Series" + "Series", + "AnimeSeriesIndex" }); } diff --git a/MediaBrowser.Providers/TV/FanartSeriesProvider.cs b/MediaBrowser.Providers/TV/FanartSeriesProvider.cs index f8fee5e3d..a9554d396 100644 --- a/MediaBrowser.Providers/TV/FanartSeriesProvider.cs +++ b/MediaBrowser.Providers/TV/FanartSeriesProvider.cs @@ -356,7 +356,7 @@ namespace MediaBrowser.Providers.TV /// System.String. internal static string GetSeriesDataPath(IApplicationPaths appPaths) { - var dataPath = Path.Combine(appPaths.DataPath, "fanart-tv"); + var dataPath = Path.Combine(appPaths.CachePath, "fanart-tv"); return dataPath; } diff --git a/MediaBrowser.Providers/TV/SeriesXmlParser.cs b/MediaBrowser.Providers/TV/SeriesXmlParser.cs index 8ed25bc7e..0c220031c 100644 --- a/MediaBrowser.Providers/TV/SeriesXmlParser.cs +++ b/MediaBrowser.Providers/TV/SeriesXmlParser.cs @@ -74,6 +74,21 @@ namespace MediaBrowser.Providers.TV break; } + case "AnimeSeriesIndex": + { + var number = reader.ReadElementContentAsString(); + + if (!string.IsNullOrWhiteSpace(number)) + { + int num; + + if (int.TryParse(number, out num)) + { + item.AnimeSeriesIndex = num; + } + } + break; + } case "SeriesName": item.Name = reader.ReadElementContentAsString(); break; diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs index fee80c317..1174f16ae 100644 --- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs +++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs @@ -664,6 +664,7 @@ namespace MediaBrowser.Server.Implementations.Dto } dto.DisplayMediaType = item.DisplayMediaType; + dto.IsUnidentified = item.IsUnidentified; if (fields.Contains(ItemFields.Settings)) { @@ -1092,6 +1093,8 @@ namespace MediaBrowser.Server.Implementations.Dto { dto.DisplaySpecialsWithSeasons = series.DisplaySpecialsWithSeasons; } + + dto.AnimeSeriesIndex = series.AnimeSeriesIndex; } if (episode != null)