alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-22 01:54:42 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

update video osd

Browse Source
This commit is contained in:
Luke Pulverenti
2017-01-09 12:05:34 -05:00
parent 3b7b06f70b
commit 85cd90d6e6
13 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MediaBrowser.Controller/Entities/AudioBook.cs
View File

@@ -16,6 +16,15 @@ namespace MediaBrowser.Controller.Entities
}
}
[IgnoreDataMember]
public override bool SupportsPlayedStatus
{
get
{
return true;
}
}
[IgnoreDataMember]
public string SeriesPresentationUniqueKey { get; set; }
[IgnoreDataMember]

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

@@ -1336,7 +1336,7 @@ namespace MediaBrowser.Controller.Entities
if (!user.Configuration.DisplayMissingEpisodes || !user.Configuration.DisplayUnairedEpisodes)
{
query.ExcludeLocationTypes = new[] { LocationType.Virtual };
query.IsVirtualItem = false;
}
var itemsResult = await GetItems(query).ConfigureAwait(false);
@@ -1375,7 +1375,7 @@ namespace MediaBrowser.Controller.Entities
{
Recursive = true,
IsFolder = false,
ExcludeLocationTypes = new[] { LocationType.Virtual },
IsVirtualItem = false,
EnableTotalRecordCount = false
}).Result;

2
MediaBrowser.Controller/Entities/InternalItemsQuery.cs
View File

@@ -130,7 +130,6 @@ namespace MediaBrowser.Controller.Entities
public string[] TopParentIds { get; set; }
public LocationType[] LocationTypes { get; set; }
public LocationType[] ExcludeLocationTypes { get; set; }
public string[] PresetViews { get; set; }
public SourceType[] SourceTypes { get; set; }
public SourceType[] ExcludeSourceTypes { get; set; }
@@ -233,7 +232,6 @@ namespace MediaBrowser.Controller.Entities
ExcludeTags = new string[] { };
ExcludeInheritedTags = new string[] { };
LocationTypes = new LocationType[] { };
ExcludeLocationTypes = new LocationType[] { };
PresetViews = new string[] { };
SourceTypes = new SourceType[] { };
ExcludeSourceTypes = new SourceType[] { };

4
MediaBrowser.Controller/Entities/UserViewBuilder.cs
View File

@@ -647,7 +647,7 @@ namespace MediaBrowser.Controller.Entities
query.SetUser(user);
query.Limit = GetSpecialItemsLimit();
query.IncludeItemTypes = new[] { typeof(Episode).Name };
query.ExcludeLocationTypes = new[] { LocationType.Virtual };
query.IsVirtualItem = false;
return ConvertToResult(_libraryManager.GetItemList(query));
}
@@ -1199,7 +1199,7 @@ namespace MediaBrowser.Controller.Entities
return false;
}
if (query.ExcludeLocationTypes.Length > 0 && query.ExcludeLocationTypes.Contains(item.LocationType))
if (query.IsVirtualItem.HasValue && item.IsVirtualItem != query.IsVirtualItem.Value)
{
return false;
}

5
MediaBrowser.Controller/LiveTv/LiveTvProgram.cs
View File

@@ -15,6 +15,11 @@ namespace MediaBrowser.Controller.LiveTv
{
public class LiveTvProgram : BaseItem, IHasLookupInfo<LiveTvProgramLookupInfo>, IHasStartDate, IHasProgramAttributes
{
public LiveTvProgram()
{
IsVirtualItem = true;
}
public override List<string> GetUserDataKeys()
{
var list = base.GetUserDataKeys();