mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 05:47:14 -04:00
fix wrong music videos showing on album page
This commit is contained in:
parent
1b7c1e0c53
commit
280a53868a
@ -82,9 +82,12 @@ namespace MediaBrowser.Api.UserLibrary
|
|||||||
/// Gets or sets the studios.
|
/// Gets or sets the studios.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value>The studios.</value>
|
/// <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)]
|
[ApiMember(Name = "Artists", Description = "Optional. If specified, results will be filtered based on artist. This allows multiple, pipe delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
|
||||||
public string Artists { get; set; }
|
public string Artists { get; set; }
|
||||||
|
|
||||||
|
[ApiMember(Name = "Albums", Description = "Optional. If specified, results will be filtered based on album. This allows multiple, pipe delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
|
||||||
|
public string Albums { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Limit results to items containing specific years
|
/// Limit results to items containing specific years
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -452,6 +455,38 @@ namespace MediaBrowser.Api.UserLibrary
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Albums
|
||||||
|
if (!string.IsNullOrEmpty(request.Albums))
|
||||||
|
{
|
||||||
|
var albums = request.Albums.Split('|');
|
||||||
|
|
||||||
|
items = items.Where(i =>
|
||||||
|
{
|
||||||
|
var audio = i as Audio;
|
||||||
|
|
||||||
|
if (audio != null)
|
||||||
|
{
|
||||||
|
return albums.Any(a => string.Equals(a, audio.Album, StringComparison.OrdinalIgnoreCase));
|
||||||
|
}
|
||||||
|
|
||||||
|
var album = i as MusicAlbum;
|
||||||
|
|
||||||
|
if (album != null)
|
||||||
|
{
|
||||||
|
return albums.Any(a => string.Equals(a, album.Name, StringComparison.OrdinalIgnoreCase));
|
||||||
|
}
|
||||||
|
|
||||||
|
var musicVideo = i as MusicVideo;
|
||||||
|
|
||||||
|
if (musicVideo != null)
|
||||||
|
{
|
||||||
|
return albums.Any(a => string.Equals(a, musicVideo.Album, StringComparison.OrdinalIgnoreCase));
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(request.AdjacentTo))
|
if (!string.IsNullOrEmpty(request.AdjacentTo))
|
||||||
{
|
{
|
||||||
var item = DtoBuilder.GetItemByClientId(request.AdjacentTo, _userManager, _libraryManager);
|
var item = DtoBuilder.GetItemByClientId(request.AdjacentTo, _userManager, _libraryManager);
|
||||||
|
@ -495,7 +495,7 @@ namespace MediaBrowser.Providers.TV
|
|||||||
foreach (XmlNode node in nodes)
|
foreach (XmlNode node in nodes)
|
||||||
{
|
{
|
||||||
var n = node.SelectSingleNode("./SeriesName");
|
var n = node.SelectSingleNode("./SeriesName");
|
||||||
if (n != null && GetComparableName(n.InnerText) == comparableName)
|
if (n != null && string.Equals(GetComparableName(n.InnerText), comparableName, StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
n = node.SelectSingleNode("./seriesid");
|
n = node.SelectSingleNode("./seriesid");
|
||||||
if (n != null)
|
if (n != null)
|
||||||
|
Loading…
Reference in New Issue
Block a user