added Artists filter

pull/702/head
Luke Pulverenti 12 years ago
parent 7f0b662b51
commit 7ee60375a8

@ -1,5 +1,6 @@
using MediaBrowser.Controller.Dto; using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Localization; using MediaBrowser.Controller.Localization;
@ -76,6 +77,13 @@ namespace MediaBrowser.Api.UserLibrary
[ApiMember(Name = "Studios", Description = "Optional. If specified, results will be filtered based on studio. This allows multiple, comma delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)] [ApiMember(Name = "Studios", Description = "Optional. If specified, results will be filtered based on studio. This allows multiple, comma delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
public string Studios { get; set; } public string Studios { get; set; }
/// <summary>
/// Gets or sets the studios.
/// </summary>
/// <value>The studios.</value>
[ApiMember(Name = "Artists", Description = "Optional. If specified, results will be filtered based on studio. This allows multiple, pipe delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
public string Artists { get; set; }
/// <summary> /// <summary>
/// Limit results to items containing specific years /// Limit results to items containing specific years
/// </summary> /// </summary>
@ -87,21 +95,21 @@ namespace MediaBrowser.Api.UserLibrary
/// Gets or sets the image types. /// Gets or sets the image types.
/// </summary> /// </summary>
/// <value>The image types.</value> /// <value>The image types.</value>
[ApiMember(Name = "ImageTypes", Description = "Optional. If specified, results will be filtered based on those containing image types. This allows multiple, comma delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)] [ApiMember(Name = "ImageTypes", Description = "Optional. If specified, results will be filtered based on those containing image types. This allows multiple, comma delimited.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
public string ImageTypes { get; set; } public string ImageTypes { get; set; }
/// <summary> /// <summary>
/// Gets or sets the item ids. /// Gets or sets the item ids.
/// </summary> /// </summary>
/// <value>The item ids.</value> /// <value>The item ids.</value>
[ApiMember(Name = "Ids", Description = "Optional. If specific items are needed, specify a list of item id's to retrieve. This allows multiple, comma delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)] [ApiMember(Name = "Ids", Description = "Optional. If specific items are needed, specify a list of item id's to retrieve. This allows multiple, comma delimited.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
public string Ids { get; set; } public string Ids { get; set; }
/// <summary> /// <summary>
/// Gets or sets the media types. /// Gets or sets the media types.
/// </summary> /// </summary>
/// <value>The media types.</value> /// <value>The media types.</value>
[ApiMember(Name = "MediaTypes", Description = "Optional filter by MediaType. Allows multiple, comma delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)] [ApiMember(Name = "MediaTypes", Description = "Optional filter by MediaType. Allows multiple, comma delimited.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
public string MediaTypes { get; set; } public string MediaTypes { get; set; }
/// <summary> /// <summary>
@ -379,6 +387,31 @@ namespace MediaBrowser.Api.UserLibrary
/// <returns>IEnumerable{BaseItem}.</returns> /// <returns>IEnumerable{BaseItem}.</returns>
internal static IEnumerable<BaseItem> ApplyAdditionalFilters(GetItems request, IEnumerable<BaseItem> items) internal static IEnumerable<BaseItem> ApplyAdditionalFilters(GetItems request, IEnumerable<BaseItem> items)
{ {
// Artists
if (!string.IsNullOrEmpty(request.Artists))
{
var artists = request.Artists.Split('|');
items = items.Where(i =>
{
var audio = i as Audio;
if (audio != null)
{
return artists.Any(audio.HasArtist);
}
var album = i as MusicAlbum;
if (album != null)
{
return artists.Any(album.HasArtist);
}
return false;
});
}
// Min official rating // Min official rating
if (!string.IsNullOrEmpty(request.MinOfficalRating)) if (!string.IsNullOrEmpty(request.MinOfficalRating))
{ {

@ -14,5 +14,11 @@ namespace MediaBrowser.Controller.Entities.Audio
{ {
return "Artist-" + Name; return "Artist-" + Name;
} }
/// <summary>
/// Gets or sets a value indicating whether this instance is on tour.
/// </summary>
/// <value><c>true</c> if this instance is on tour; otherwise, <c>false</c>.</value>
public bool IsOnTour { get; set; }
} }
} }

@ -139,5 +139,15 @@ namespace MediaBrowser.Controller.Entities.Audio
base.Images = value; base.Images = value;
} }
} }
/// <summary>
/// Determines whether the specified artist has artist.
/// </summary>
/// <param name="artist">The artist.</param>
/// <returns><c>true</c> if the specified artist has artist; otherwise, <c>false</c>.</returns>
public bool HasArtist(string artist)
{
return Children.OfType<Audio>().Any(i => i.HasArtist(artist));
}
} }
} }

@ -1,4 +1,5 @@
using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
using System; using System;
@ -31,6 +32,13 @@ namespace MediaBrowser.Controller.Providers.Music
{ {
AddGenres(artist, data.tags); AddGenres(artist, data.tags);
} }
var entity = artist as Artist;
if (entity != null)
{
entity.IsOnTour = string.Equals(data.ontour, "1");
}
} }
public static void ProcessAlbumData(BaseItem item, LastfmAlbum data) public static void ProcessAlbumData(BaseItem item, LastfmAlbum data)

Loading…
Cancel
Save