lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1567 from MediaBrowser/dev

Browse Source 
update playlist querying
This commit is contained in:
Luke 2016-03-20 14:43:16 -04:00
commit 7caed86e85
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Controller/Entities/Folder.cs
View File

@ -829,10 +829,13 @@ namespace MediaBrowser.Controller.Entities
private bool RequiresPostFiltering(InternalItemsQuery query) private bool RequiresPostFiltering(InternalItemsQuery query)
{ {
if (LinkedChildren.Count > 0) if (LinkedChildren.Count > 0)
{
if (!(this is ICollectionFolder))
{ {
Logger.Debug("Query requires post-filtering due to LinkedChildren"); Logger.Debug("Query requires post-filtering due to LinkedChildren");
return true; return true;
} }
}
if (query.SortBy != null && query.SortBy.Length > 0) if (query.SortBy != null && query.SortBy.Length > 0)
{ {

5
MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
View File

@ -19,6 +19,7 @@ using System.Runtime.Serialization;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using MediaBrowser.Controller.Channels; using MediaBrowser.Controller.Channels;
using MediaBrowser.Controller.Playlists;
using MediaBrowser.Model.LiveTv; using MediaBrowser.Model.LiveTv;
namespace MediaBrowser.Server.Implementations.Persistence namespace MediaBrowser.Server.Implementations.Persistence
@ -729,10 +730,12 @@ namespace MediaBrowser.Server.Implementations.Persistence
var topParent = item.GetTopParent(); var topParent = item.GetTopParent();
if (topParent != null) if (topParent != null)
{ {
//Logger.Debug("Item {0} has top parent {1}", item.Id, topParent.Id);
_saveItemCommand.GetParameter(index++).Value = topParent.Id.ToString("N"); _saveItemCommand.GetParameter(index++).Value = topParent.Id.ToString("N");
} }
else else
{ {
//Logger.Debug("Item {0} has null top parent", item.Id);
_saveItemCommand.GetParameter(index++).Value = null; _saveItemCommand.GetParameter(index++).Value = null;
} }
@ -2199,6 +2202,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
typeof(MusicGenre), typeof(MusicGenre),
typeof(MusicVideo), typeof(MusicVideo),
typeof(Movie), typeof(Movie),
typeof(Playlist),
typeof(AudioPodcast),
typeof(Trailer), typeof(Trailer),
typeof(BoxSet), typeof(BoxSet),
typeof(Episode), typeof(Episode),