diff --git a/MediaBrowser.Api/LibraryService.cs b/MediaBrowser.Api/LibraryService.cs index 82089536cb..202d372e83 100644 --- a/MediaBrowser.Api/LibraryService.cs +++ b/MediaBrowser.Api/LibraryService.cs @@ -335,7 +335,9 @@ namespace MediaBrowser.Api /// System.Object. public object Get(GetItemCounts request) { - var items = GetAllLibraryItems(request.UserId, _userManager, _libraryManager).ToList(); + var items = GetAllLibraryItems(request.UserId, _userManager, _libraryManager) + .Where(i => i.LocationType != LocationType.Virtual) + .ToList(); var filteredItems = request.UserId.HasValue ? FilterItems(items, request, request.UserId.Value).ToList() : items; diff --git a/MediaBrowser.Api/TvShowsService.cs b/MediaBrowser.Api/TvShowsService.cs index fad17814ec..0ac181dea2 100644 --- a/MediaBrowser.Api/TvShowsService.cs +++ b/MediaBrowser.Api/TvShowsService.cs @@ -1,10 +1,9 @@ -using System.Collections; -using System.Globalization; -using MediaBrowser.Controller.Dto; +using MediaBrowser.Controller.Dto; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Persistence; +using MediaBrowser.Model.Entities; using MediaBrowser.Model.Querying; using ServiceStack.ServiceHost; using System; @@ -48,18 +47,9 @@ namespace MediaBrowser.Api [ApiMember(Name = "Fields", Description = "Optional. Specify additional fields of information to return in the output. This allows multiple, comma delimeted. Options: Budget, Chapters, CriticRatingSummary, DateCreated, Genres, HomePageUrl, IndexOptions, MediaStreams, Overview, OverviewHtml, ParentId, Path, People, ProviderIds, PrimaryImageAspectRatio, Revenue, SortName, Studios, Taglines, TrailerUrls", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)] public string Fields { get; set; } - [ApiMember(Name = "ExcludeLocationTypes", Description = "Optional. If specified, results will be filtered based on LocationType. This allows multiple, comma delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)] - public string ExcludeLocationTypes { get; set; } + [ApiMember(Name = "SeriesId", Description = "Optional. Filter by series id", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")] + public string SeriesId { get; set; } - [ApiMember(Name = "MinPremiereDate", Description = "Optional. The minimum premiere date. Format = yyyyMMddHHmmss", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")] - public string MinPremiereDate { get; set; } - - [ApiMember(Name = "MaxPremiereDate", Description = "Optional. The maximum premiere date. Format = yyyyMMddHHmmss", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")] - public string MaxPremiereDate { get; set; } - - [ApiMember(Name = "HasPremiereDate", Description = "Optional filter by items with premiere dates.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")] - public bool? HasPremiereDate { get; set; } - /// /// Gets the item fields. /// @@ -170,10 +160,15 @@ namespace MediaBrowser.Api { var user = _userManager.GetUserById(request.UserId); - var itemsList = user.RootFolder - .GetRecursiveChildren(user, i => i is Series) + var items = user.RootFolder + .GetRecursiveChildren(user) + .OfType(); + + items = FilterSeries(request, items); + + var itemsList = items .AsParallel() - .Select(i => GetNextUp((Series)i, user, request)) + .Select(i => GetNextUp(i, user, request)) .ToList(); itemsList = itemsList @@ -264,35 +259,19 @@ namespace MediaBrowser.Api private IEnumerable FilterItems(GetNextUpEpisodes request, IEnumerable items) { - // ExcludeLocationTypes - if (!string.IsNullOrEmpty(request.ExcludeLocationTypes)) + // Make this configurable when needed + items = items.Where(i => i.LocationType != LocationType.Virtual); + + return items; + } + + private IEnumerable FilterSeries(GetNextUpEpisodes request, IEnumerable items) + { + if (!string.IsNullOrWhiteSpace(request.SeriesId)) { - var vals = request.ExcludeLocationTypes.Split(','); + var id = new Guid(request.SeriesId); - items = items - .Where(f => !vals.Contains(f.LocationType.ToString(), StringComparer.OrdinalIgnoreCase)) - .ToList(); - } - - if (!string.IsNullOrEmpty(request.MinPremiereDate)) - { - var date = DateTime.ParseExact(request.MinPremiereDate, "yyyyMMddHHmmss", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal); - - items = items.Where(i => !i.PremiereDate.HasValue || i.PremiereDate.Value >= date); - } - - if (!string.IsNullOrEmpty(request.MaxPremiereDate)) - { - var date = DateTime.ParseExact(request.MaxPremiereDate, "yyyyMMddHHmmss", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal); - - items = items.Where(i => !i.PremiereDate.HasValue || i.PremiereDate.Value <= date); - } - - if (request.HasPremiereDate.HasValue) - { - var val = request.HasPremiereDate.Value; - - items = items.Where(i => i.PremiereDate.HasValue == val); + items = items.Where(i => i.Id == id); } return items; diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs index cb01dae733..4db7cf9707 100644 --- a/MediaBrowser.Api/UserLibrary/ItemsService.cs +++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs @@ -1,5 +1,4 @@ -using System.Globalization; -using MediaBrowser.Controller.Dto; +using MediaBrowser.Controller.Dto; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Entities.Movies; @@ -181,22 +180,19 @@ namespace MediaBrowser.Api.UserLibrary [ApiMember(Name = "IsHD", Description = "Optional filter by items that are HD or not.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")] public bool? IsHD { get; set; } - [ApiMember(Name = "ExcludeLocationTypes", Description = "Optional. If specified, results will be filtered based on LocationType. This allows multiple, comma delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)] - public string ExcludeLocationTypes { get; set; } - [ApiMember(Name = "LocationTypes", Description = "Optional. If specified, results will be filtered based on LocationType. This allows multiple, comma delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)] public string LocationTypes { get; set; } - [ApiMember(Name = "MinPremiereDate", Description = "Optional. The minimum premiere date. Format = yyyyMMddHHmmss", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")] - public string MinPremiereDate { get; set; } - - [ApiMember(Name = "MaxPremiereDate", Description = "Optional. The maximum premiere date. Format = yyyyMMddHHmmss", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")] - public string MaxPremiereDate { get; set; } - - [ApiMember(Name = "HasPremiereDate", Description = "Optional filter by items with premiere dates.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")] - public bool? HasPremiereDate { get; set; } + [ApiMember(Name = "ExcludeLocationTypes", Description = "Optional. If specified, results will be filtered based on LocationType. This allows multiple, comma delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)] + public string ExcludeLocationTypes { get; set; } public bool IncludeIndexContainers { get; set; } + + [ApiMember(Name = "IsMissing", Description = "Optional filter by items that are missing episodes or not.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")] + public bool? IsMissing { get; set; } + + [ApiMember(Name = "IsUnaired", Description = "Optional filter by items that are unaired episodes or not.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")] + public bool? IsUnaired { get; set; } } /// @@ -270,6 +266,8 @@ namespace MediaBrowser.Api.UserLibrary items = ApplyFilter(items, filter, user, _userDataRepository); } + items = FilterVirtualEpisodes(request, items, user); + items = items.AsEnumerable(); items = ApplySearchTerm(request, items); @@ -440,6 +438,93 @@ namespace MediaBrowser.Api.UserLibrary return items; } + private IEnumerable FilterVirtualEpisodes(GetItems request, IEnumerable items, User user) + { + items = FilterVirtualSeasons(request, items, user); + + if (request.IsMissing.HasValue) + { + var val = request.IsMissing.Value; + items = items.Where(i => + { + var e = i as Episode; + if (e != null) + { + return e.IsMissingEpisode == val; + } + return true; + }); + } + + if (request.IsUnaired.HasValue) + { + var val = request.IsUnaired.Value; + items = items.Where(i => + { + var e = i as Episode; + if (e != null) + { + return e.IsUnaired == val; + } + return true; + }); + } + + return items; + } + + private IEnumerable FilterVirtualSeasons(GetItems request, IEnumerable items, User user) + { + if (request.IsMissing.HasValue && request.IsUnaired.HasValue) + { + var isMissing = request.IsMissing.Value; + var isUnaired = request.IsUnaired.Value; + + if (!isMissing && !isUnaired) + { + return items.Where(i => + { + var e = i as Season; + if (e != null) + { + return !e.IsMissingOrUnaired; + } + return true; + }); + } + } + + if (request.IsMissing.HasValue) + { + var val = request.IsMissing.Value; + items = items.Where(i => + { + var e = i as Season; + if (e != null) + { + return e.IsMissingSeason == val; + } + return true; + }); + } + + if (request.IsUnaired.HasValue) + { + var val = request.IsUnaired.Value; + items = items.Where(i => + { + var e = i as Season; + if (e != null) + { + return e.IsUnaired == val; + } + return true; + }); + } + + return items; + } + /// /// Applies the additional filters. /// @@ -593,13 +678,6 @@ namespace MediaBrowser.Api.UserLibrary items = items.Where(f => vals.Contains(f.GetType().Name, StringComparer.OrdinalIgnoreCase)); } - // ExcludeLocationTypes - if (!string.IsNullOrEmpty(request.ExcludeLocationTypes)) - { - var vals = request.ExcludeLocationTypes.Split(','); - items = items.Where(f => !vals.Contains(f.LocationType.ToString(), StringComparer.OrdinalIgnoreCase)); - } - // LocationTypes if (!string.IsNullOrEmpty(request.LocationTypes)) { @@ -607,6 +685,13 @@ namespace MediaBrowser.Api.UserLibrary items = items.Where(f => vals.Contains(f.LocationType.ToString(), StringComparer.OrdinalIgnoreCase)); } + // ExcludeLocationTypes + if (!string.IsNullOrEmpty(request.ExcludeLocationTypes)) + { + var vals = request.ExcludeLocationTypes.Split(','); + items = items.Where(f => !vals.Contains(f.LocationType.ToString(), StringComparer.OrdinalIgnoreCase)); + } + if (!string.IsNullOrEmpty(request.NameStartsWithOrGreater)) { items = items.Where(i => string.Compare(request.NameStartsWithOrGreater, i.SortName, StringComparison.CurrentCultureIgnoreCase) < 1); @@ -826,7 +911,8 @@ namespace MediaBrowser.Api.UserLibrary if (request.IsHD.HasValue) { - items = items.OfType TmdbCollection, MusicBrainzReleaseGroup, - Zap2It + Zap2It, + NesBox, + NesBoxRom } } diff --git a/MediaBrowser.Model/Querying/ItemQuery.cs b/MediaBrowser.Model/Querying/ItemQuery.cs index d351474eb7..ba51bc46dd 100644 --- a/MediaBrowser.Model/Querying/ItemQuery.cs +++ b/MediaBrowser.Model/Querying/ItemQuery.cs @@ -241,16 +241,25 @@ namespace MediaBrowser.Model.Querying /// /// The location types. public LocationType[] LocationTypes { get; set; } + + /// + /// Gets or sets a value indicating whether this instance is missing episode. + /// + /// null if [is missing episode] contains no value, true if [is missing episode]; otherwise, false. + public bool? IsMissing { get; set; } + + /// + /// Gets or sets a value indicating whether this instance is unaired episode. + /// + /// null if [is unaired episode] contains no value, true if [is unaired episode]; otherwise, false. + public bool? IsUnaired { get; set; } + /// /// Gets or sets the exclude location types. /// /// The exclude location types. public LocationType[] ExcludeLocationTypes { get; set; } - - public bool? HasPremiereDate { get; set; } - public DateTime? MinPremiereDate { get; set; } - public DateTime? MaxPremiereDate { get; set; } - + /// /// Initializes a new instance of the class. /// diff --git a/MediaBrowser.Model/Querying/NextUpQuery.cs b/MediaBrowser.Model/Querying/NextUpQuery.cs index 1b7b45ca30..4f5d47a04e 100644 --- a/MediaBrowser.Model/Querying/NextUpQuery.cs +++ b/MediaBrowser.Model/Querying/NextUpQuery.cs @@ -1,6 +1,4 @@ -using MediaBrowser.Model.Entities; -using System; - + namespace MediaBrowser.Model.Querying { public class NextUpQuery @@ -11,6 +9,12 @@ namespace MediaBrowser.Model.Querying /// The user id. public string UserId { get; set; } + /// + /// Gets or sets the series id. + /// + /// The series id. + public string SeriesId { get; set; } + /// /// Skips over a given number of items within the results. Use for paging. /// @@ -28,20 +32,5 @@ namespace MediaBrowser.Model.Querying /// /// The fields. public ItemFields[] Fields { get; set; } - - /// - /// Gets or sets the exclude location types. - /// - /// The exclude location types. - public LocationType[] ExcludeLocationTypes { get; set; } - - public bool? HasPremiereDate { get; set; } - public DateTime? MinPremiereDate { get; set; } - public DateTime? MaxPremiereDate { get; set; } - - public NextUpQuery() - { - ExcludeLocationTypes = new LocationType[] { }; - } } } diff --git a/MediaBrowser.Providers/TV/RemoteEpisodeProvider.cs b/MediaBrowser.Providers/TV/RemoteEpisodeProvider.cs index e8b4b0f3de..7ac51e76d8 100644 --- a/MediaBrowser.Providers/TV/RemoteEpisodeProvider.cs +++ b/MediaBrowser.Providers/TV/RemoteEpisodeProvider.cs @@ -240,17 +240,16 @@ namespace MediaBrowser.Providers.TV { cancellationToken.ThrowIfCancellationRequested(); + var status = ProviderRefreshStatus.Success; + var episode = (Episode)item; var seriesId = episode.Series != null ? episode.Series.GetProviderId(MetadataProviders.Tvdb) : null; if (!string.IsNullOrEmpty(seriesId)) { - var seriesDataPath = RemoteSeriesProvider.GetSeriesDataPath(ConfigurationManager.ApplicationPaths, - seriesId); + var seriesDataPath = RemoteSeriesProvider.GetSeriesDataPath(ConfigurationManager.ApplicationPaths, seriesId); - var status = ProviderRefreshStatus.Success; - try { status = await FetchEpisodeData(episode, seriesDataPath, cancellationToken).ConfigureAwait(false); @@ -259,20 +258,10 @@ namespace MediaBrowser.Providers.TV { // Don't fail the provider because this will just keep on going and going. } - - BaseProviderInfo data; - if (!item.ProviderData.TryGetValue(Id, out data)) - { - data = new BaseProviderInfo(); - item.ProviderData[Id] = data; - } - - SetLastRefreshed(item, DateTime.UtcNow, status); - return true; } - Logger.Info("Episode provider not fetching because series does not have a tvdb id: " + item.Path); - return false; + SetLastRefreshed(item, DateTime.UtcNow, status); + return true; } diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs index 9a2f6c6373..adf914766b 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs @@ -52,7 +52,8 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV // If there's a collection type and it's not tv, it can't be a series if (!string.IsNullOrEmpty(collectionType) && - !string.Equals(collectionType, CollectionType.TvShows, StringComparison.OrdinalIgnoreCase)) + !string.Equals(collectionType, CollectionType.TvShows, StringComparison.OrdinalIgnoreCase) && + !string.Equals(collectionType, CollectionType.BoxSets, StringComparison.OrdinalIgnoreCase)) { return null; } diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec index 1dd6ed0f10..1446dbec26 100644 --- a/Nuget/MediaBrowser.Common.Internal.nuspec +++ b/Nuget/MediaBrowser.Common.Internal.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common.Internal - 3.0.232 + 3.0.233 MediaBrowser.Common.Internal Luke ebr,Luke,scottisafool @@ -12,7 +12,7 @@ Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption. Copyright © Media Browser 2013 - + diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec index cc3d1c7e59..6da43af68b 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common - 3.0.232 + 3.0.233 MediaBrowser.Common Media Browser Team ebr,Luke,scottisafool diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec index 0e7fa7fbfe..fab5c80931 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Server.Core - 3.0.232 + 3.0.233 Media Browser.Server.Core Media Browser Team ebr,Luke,scottisafool @@ -12,7 +12,7 @@ Contains core components required to build plugins for Media Browser Server. Copyright © Media Browser 2013 - +