michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
Eric Reed 2013-04-24 10:44:22 -04:00
commit da6bcc1830
11 changed files with 133 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
MediaBrowser.Api/UserLibrary/ArtistsService.cs
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>

2
MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
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))

39
MediaBrowser.Api/UserLibrary/ItemsService.cs
View File

@ -1,5 +1,6 @@
using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
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)]
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>
/// Limit results to items containing specific years
/// </summary>
@ -87,21 +95,21 @@ namespace MediaBrowser.Api.UserLibrary
/// Gets or sets the image types.
/// </summary>
/// <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; }
/// <summary>
/// Gets or sets the item ids.
/// </summary>
/// <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; }
/// <summary>
/// Gets or sets the media types.
/// </summary>
/// <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; }
/// <summary>
@ -379,6 +387,31 @@ namespace MediaBrowser.Api.UserLibrary
/// <returns>IEnumerable{BaseItem}.</returns>
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
if (!string.IsNullOrEmpty(request.MinOfficalRating))
{

6
MediaBrowser.Controller/Entities/Audio/Artist.cs
View File

@ -14,5 +14,11 @@ namespace MediaBrowser.Controller.Entities.Audio
{
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; }
}
}

10
MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
View File

@ -139,5 +139,15 @@ namespace MediaBrowser.Controller.Entities.Audio
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));
}
}
}

8
MediaBrowser.Controller/Providers/Music/LastfmHelper.cs
View File

@ -1,4 +1,5 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Model.Entities;
using System;
@ -31,6 +32,13 @@ namespace MediaBrowser.Controller.Providers.Music
{
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)

2
MediaBrowser.Model/MediaBrowser.Model.csproj
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" />

15
MediaBrowser.Model/Querying/ArtistsQuery.cs Normal file
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; }
}
}

7
MediaBrowser.Model/Querying/ItemQuery.cs
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[] { };

7
MediaBrowser.Model/Querying/ItemsByNameQuery.cs
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[] {};
}
}
}

23
MediaBrowser.Model/Querying/PersonsQuery.cs Normal file
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[] { };
}
}
}