added IsOnTour artists filter

This commit is contained in:
Luke Pulverenti 2013-04-24 10:30:12 -04:00
parent 7ee60375a8
commit 0d15e1d631
7 changed files with 73 additions and 8 deletions

View File

@ -20,6 +20,11 @@ namespace MediaBrowser.Api.UserLibrary
[Api(Description = "Gets all artists from a given item, folder, or the entire library")]
public class GetArtists : GetItemsByName
{
/// <summary>
/// Filter by artists that are on tour, or not
/// </summary>
/// <value><c>null</c> if [is on tour] contains no value, <c>true</c> if [is on tour]; otherwise, <c>false</c>.</value>
public bool? IsOnTour { get; set; }
}
/// <summary>
@ -148,6 +153,26 @@ namespace MediaBrowser.Api.UserLibrary
return ToOptimizedResult(result);
}
/// <summary>
/// Filters the items.
/// </summary>
/// <param name="request">The request.</param>
/// <param name="items">The items.</param>
/// <returns>IEnumerable{BaseItem}.</returns>
protected override IEnumerable<BaseItem> FilterItems(GetItemsByName request, IEnumerable<BaseItem> items)
{
items = base.FilterItems(request, items);
var getArtists = (GetArtists) request;
if (getArtists.IsOnTour.HasValue)
{
items = items.OfType<Artist>().Where(i => i.IsOnTour == getArtists.IsOnTour.Value);
}
return items;
}
/// <summary>
/// Gets all items.
/// </summary>

View File

@ -204,7 +204,7 @@ namespace MediaBrowser.Api.UserLibrary
/// <param name="request">The request.</param>
/// <param name="items">The items.</param>
/// <returns>IEnumerable{BaseItem}.</returns>
private IEnumerable<BaseItem> FilterItems(GetItemsByName request, IEnumerable<BaseItem> items)
protected virtual IEnumerable<BaseItem> FilterItems(GetItemsByName request, IEnumerable<BaseItem> items)
{
// Exclude item types
if (!string.IsNullOrEmpty(request.ExcludeItemTypes))

View File

@ -50,6 +50,7 @@
<Compile Include="Net\WebSocketMessage.cs" />
<Compile Include="Net\WebSocketMessageType.cs" />
<Compile Include="Net\WebSocketState.cs" />
<Compile Include="Querying\ArtistsQuery.cs" />
<Compile Include="Querying\ItemsByNameQuery.cs" />
<Compile Include="Entities\BaseItemInfo.cs" />
<Compile Include="Connectivity\ClientConnectionInfo.cs" />
@ -82,6 +83,7 @@
<Compile Include="Net\HttpException.cs" />
<Compile Include="Net\NetworkShare.cs" />
<Compile Include="Net\NetworkShareType.cs" />
<Compile Include="Querying\PersonsQuery.cs" />
<Compile Include="Serialization\IJsonSerializer.cs" />
<Compile Include="Serialization\IXmlSerializer.cs" />
<Compile Include="Updates\CheckForUpdateResult.cs" />

View File

@ -0,0 +1,15 @@

namespace MediaBrowser.Model.Querying
{
/// <summary>
/// Class ArtistsQuery
/// </summary>
public class ArtistsQuery : ItemsByNameQuery
{
/// <summary>
/// Filter by artists that are on tour, or not
/// </summary>
/// <value><c>null</c> if [is on tour] contains no value, <c>true</c> if [is on tour]; otherwise, <c>false</c>.</value>
public bool? IsOnTour { get; set; }
}
}

View File

@ -38,6 +38,12 @@ namespace MediaBrowser.Model.Querying
/// <value>The sort by.</value>
public string[] SortBy { get; set; }
/// <summary>
/// Filter by artists
/// </summary>
/// <value>The artists.</value>
public string[] Artists { get; set; }
/// <summary>
/// The sort order to return results with
/// </summary>
@ -194,6 +200,7 @@ namespace MediaBrowser.Model.Querying
Years = new int[] { };
PersonTypes = new string[] { };
Ids = new string[] { };
Artists = new string[] { };
ImageTypes = new ImageType[] { };
AirDays = new DayOfWeek[] { };

View File

@ -42,11 +42,6 @@ namespace MediaBrowser.Model.Querying
/// </summary>
/// <value>The fields.</value>
public ItemFields[] Fields { get; set; }
/// <summary>
/// Gets or sets the person types.
/// </summary>
/// <value>The person types.</value>
public string[] PersonTypes { get; set; }
/// <summary>
/// Initializes a new instance of the <see cref="ItemsByNameQuery"/> class.
@ -54,8 +49,6 @@ namespace MediaBrowser.Model.Querying
public ItemsByNameQuery()
{
Fields = new ItemFields[] {};
PersonTypes = new string[] {};
}
}
}

View File

@ -0,0 +1,23 @@

namespace MediaBrowser.Model.Querying
{
/// <summary>
/// Class PersonsQuery
/// </summary>
public class PersonsQuery : ItemsByNameQuery
{
/// <summary>
/// Gets or sets the person types.
/// </summary>
/// <value>The person types.</value>
public string[] PersonTypes { get; set; }
/// <summary>
/// Initializes a new instance of the <see cref="PersonsQuery"/> class.
/// </summary>
public PersonsQuery()
{
PersonTypes = new string[] { };
}
}
}