Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-08 23:00:51 +02:00
Code Issues 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-30 11:25:43 -04:00
parent 449cb05f7b 93f3d11df4
commit c9038fec27
3 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
MediaBrowser.Controller/Entities/BaseItem.cs
View file

@ -32,6 +32,9 @@ namespace MediaBrowser.Controller.Entities
People = new List<PersonInfo>();
CriticReviews = new List<ItemReview>();
Taglines = new List<string>();
ScreenshotImagePaths = new List<string>();
BackdropImagePaths = new List<string>();
ProductionLocations = new List<string>();
}
/// <summary>
@ -731,6 +734,11 @@ namespace MediaBrowser.Controller.Entities
/// <returns>List{Video}.</returns>
private List<Trailer> LoadLocalTrailers()
{
if (LocationType != LocationType.FileSystem)
{
return new List<Trailer>();
}
ItemResolveArgs resolveArgs;
try
@ -789,6 +797,11 @@ namespace MediaBrowser.Controller.Entities
/// <returns>List{Audio.Audio}.</returns>
private List<Audio.Audio> LoadThemeSongs()
{
if (LocationType != LocationType.FileSystem)
{
return new List<Audio.Audio>();
}
ItemResolveArgs resolveArgs;
try
@ -847,6 +860,11 @@ namespace MediaBrowser.Controller.Entities
/// <returns>List{Video}.</returns>
private List<Video> LoadThemeVideos()
{
if (LocationType != LocationType.FileSystem)
{
return new List<Video>();
}
ItemResolveArgs resolveArgs;
try

9
MediaBrowser.Controller/Entities/IndexFolder.cs
View file

@ -5,6 +5,7 @@ using System.Linq;
using System.Runtime.Serialization;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Model.Entities;
namespace MediaBrowser.Controller.Entities
{
@ -64,6 +65,14 @@ namespace MediaBrowser.Controller.Entities
}
}
public override LocationType LocationType
{
get
{
return LocationType.Virtual;
}
}
/// <summary>
/// Override this to return the folder that should be used to construct a container
/// for this item in an index. GroupInIndex should be true as well.

5
MediaBrowser.Controller/Entities/Movies/Movie.cs
View file

@ -115,6 +115,11 @@ namespace MediaBrowser.Controller.Entities.Movies
/// <returns>IEnumerable{Video}.</returns>
private IEnumerable<Video> LoadSpecialFeatures()
{
if (LocationType != LocationType.FileSystem)
{
return new List<Video>();
}
FileSystemInfo folder;
try