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

3.2.17.11

Browse Source
This commit is contained in:
Luke Pulverenti 2017-05-23 12:56:01 -04:00
parent 8b9e7e1f59
commit 27c3acb2bf
2 changed files with 57 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Emby.Server.Implementations/Data/SqliteItemRepository.cs
View File

@ -1348,10 +1348,10 @@ namespace Emby.Server.Implementations.Data
private BaseItem GetItem(IReadOnlyList<IResultSetValue> reader, InternalItemsQuery query)
{
return GetItem(reader, query, HasProgramAttributes(query), HasEpisodeAttributes(query), HasStartDate(query), HasTrailerTypes(query), HasArtistFields(query));
return GetItem(reader, query, HasProgramAttributes(query), HasEpisodeAttributes(query), HasStartDate(query), HasTrailerTypes(query), HasArtistFields(query), HasSeriesFields(query));
}
private BaseItem GetItem(IReadOnlyList<IResultSetValue> reader, InternalItemsQuery query, bool enableProgramAttributes, bool hasEpisodeAttributes, bool queryHasStartDate, bool hasTrailerTypes, bool hasArtistFields)
private BaseItem GetItem(IReadOnlyList<IResultSetValue> reader, InternalItemsQuery query, bool enableProgramAttributes, bool hasEpisodeAttributes, bool queryHasStartDate, bool hasTrailerTypes, bool hasArtistFields, bool hasSeriesFields)
{
var typeString = reader.GetString(0);
@ -1800,6 +1800,8 @@ namespace Emby.Server.Implementations.Data
index++;
var hasSeries = item as IHasSeries;
if (hasSeriesFields)
{
if (hasSeries != null)
{
if (!reader.IsDBNull(index))
@ -1808,6 +1810,7 @@ namespace Emby.Server.Implementations.Data
}
}
index++;
}
if (hasEpisodeAttributes)
{
@ -1831,6 +1834,8 @@ namespace Emby.Server.Implementations.Data
index++;
}
if (hasSeriesFields)
{
if (hasSeries != null)
{
if (!reader.IsDBNull(index))
@ -1839,6 +1844,7 @@ namespace Emby.Server.Implementations.Data
}
}
index++;
}
if (HasField(query, ItemFields.PresentationUniqueKey))
{
@ -2461,6 +2467,34 @@ namespace Emby.Server.Implementations.Data
return types.Any(i => query.IncludeItemTypes.Contains(i, StringComparer.OrdinalIgnoreCase));
}
private bool HasSeriesFields(InternalItemsQuery query)
{
var excludeParentTypes = new string[]
{
"PhotoAlbum"
};
if (excludeParentTypes.Contains(query.ParentType ?? string.Empty, StringComparer.OrdinalIgnoreCase))
{
return false;
}
if (query.IncludeItemTypes.Length == 0)
{
return true;
}
var types = new string[]
{
"Book",
"AudioBook",
"Episode",
"Season"
};
return types.Any(i => query.IncludeItemTypes.Contains(i, StringComparer.OrdinalIgnoreCase));
}
private string[] GetFinalColumnsToSelect(InternalItemsQuery query, string[] startColumns)
{
var list = startColumns.ToList();
@ -2511,6 +2545,12 @@ namespace Emby.Server.Implementations.Data
list.Remove("Artists");
}
if (!HasSeriesFields(query))
{
list.Remove("SeriesId");
list.Remove("SeriesName");
}
if (!HasEpisodeAttributes(query))
{
list.Remove("SeasonName");
@ -2753,10 +2793,11 @@ namespace Emby.Server.Implementations.Data
var hasStartDate = HasStartDate(query);
var hasTrailerTypes = HasTrailerTypes(query);
var hasArtistFields = HasArtistFields(query);
var hasSeriesFields = HasSeriesFields(query);
foreach (var row in statement.ExecuteQuery())
{
var item = GetItem(row, query, hasProgramAttributes, hasEpisodeAttributes, hasStartDate, hasTrailerTypes, hasArtistFields);
var item = GetItem(row, query, hasProgramAttributes, hasEpisodeAttributes, hasStartDate, hasTrailerTypes, hasArtistFields, hasSeriesFields);
if (item != null)
{
list.Add(item);
@ -2961,10 +3002,11 @@ namespace Emby.Server.Implementations.Data
var hasStartDate = HasStartDate(query);
var hasTrailerTypes = HasTrailerTypes(query);
var hasArtistFields = HasArtistFields(query);
var hasSeriesFields = HasSeriesFields(query);
foreach (var row in statement.ExecuteQuery())
{
var item = GetItem(row, query, hasProgramAttributes, hasEpisodeAttributes, hasStartDate, hasTrailerTypes, hasArtistFields);
var item = GetItem(row, query, hasProgramAttributes, hasEpisodeAttributes, hasStartDate, hasTrailerTypes, hasArtistFields, hasSeriesFields);
if (item != null)
{
list.Add(item);
@ -5320,10 +5362,11 @@ namespace Emby.Server.Implementations.Data
var hasStartDate = HasStartDate(query);
var hasTrailerTypes = HasTrailerTypes(query);
var hasArtistFields = HasArtistFields(query);
var hasSeriesFields = HasSeriesFields(query);
foreach (var row in statement.ExecuteQuery())
{
var item = GetItem(row, query, hasProgramAttributes, hasEpisodeAttributes, hasStartDate, hasTrailerTypes, hasArtistFields);
var item = GetItem(row, query, hasProgramAttributes, hasEpisodeAttributes, hasStartDate, hasTrailerTypes, hasArtistFields, hasSeriesFields);
if (item != null)
{
var countStartColumn = columns.Count - 1;

2
SharedVersion.cs
View File

@ -1,3 +1,3 @@
using System.Reflection;
[assembly: AssemblyVersion("3.2.17.10")]
[assembly: AssemblyVersion("3.2.17.11")]