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

update live stream sharing

Browse Source
This commit is contained in:
Luke Pulverenti
2016-10-11 17:33:38 -04:00
parent d54f03514d
commit 2c6fc11dcf
13 changed files with 90 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,6 +59,15 @@ namespace MediaBrowser.Controller.Entities.Audio
AlbumArtists = new List<string>();
}
[IgnoreDataMember]
public override bool SupportsPlayedStatus
{
get
{
return true;
}
}
[IgnoreDataMember]
public override bool SupportsAddingToPlaylist
{

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

@@ -807,18 +807,6 @@ namespace MediaBrowser.Controller.Entities
return true;
}
if (query.HasThemeSong.HasValue)
{
Logger.Debug("Query requires post-filtering due to HasThemeSong");
return true;
}
if (query.HasThemeVideo.HasValue)
{
Logger.Debug("Query requires post-filtering due to HasThemeVideo");
return true;
}
// Filter by VideoType
if (query.VideoTypes.Length > 0)
{

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

@@ -16,8 +16,6 @@ namespace MediaBrowser.Controller.Entities
RemoteTrailers = new List<MediaUrl>();
LocalTrailerIds = new List<Guid>();
RemoteTrailerIds = new List<Guid>();
ThemeSongIds = new List<Guid>();
ThemeVideoIds = new List<Guid>();
}
public List<Guid> LocalTrailerIds { get; set; }

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

@@ -168,6 +168,8 @@ namespace MediaBrowser.Controller.Entities
switch (name)
{
case ItemFields.ThemeSongIds:
case ItemFields.ThemeVideoIds:
case ItemFields.ProductionLocations:
case ItemFields.Keywords:
case ItemFields.Taglines:

9
MediaBrowser.Controller/Entities/Movies/Movie.cs
View File

@@ -68,6 +68,15 @@ namespace MediaBrowser.Controller.Entities.Movies
set { TmdbCollectionName = value; }
}
[IgnoreDataMember]
protected override bool SupportsIsInMixedFolderDetection
{
get
{
return false;
}
}
protected override async Task<bool> RefreshedOwnedItems(MetadataRefreshOptions options, List<FileSystemMetadata> fileSystemChildren, CancellationToken cancellationToken)
{
var hasChanges = await base.RefreshedOwnedItems(options, fileSystemChildren, cancellationToken).ConfigureAwait(false);

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

@@ -53,6 +53,15 @@ namespace MediaBrowser.Controller.Entities
}
}
[IgnoreDataMember]
protected override bool SupportsIsInMixedFolderDetection
{
get
{
return true;
}
}
public override string CreatePresentationUniqueKey()
{
if (!string.IsNullOrWhiteSpace(PrimaryVersionId))

9
MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs
View File

@@ -54,6 +54,15 @@ namespace MediaBrowser.Controller.LiveTv
}
}
[IgnoreDataMember]
protected override bool SupportsIsInMixedFolderDetection
{
get
{
return false;
}
}
[IgnoreDataMember]
public override bool SupportsPlayedStatus
{

14
MediaBrowser.Controller/Playlists/Playlist.cs
View File

@@ -207,15 +207,15 @@ namespace MediaBrowser.Controller.Playlists
public override bool IsVisible(User user)
{
if (base.IsVisible(user))
{
var userId = user.Id.ToString("N");
var userId = user.Id.ToString("N");
return Shares.Any(i => string.Equals(userId, i.UserId, StringComparison.OrdinalIgnoreCase)) ||
string.Equals(OwnerUserId, userId, StringComparison.OrdinalIgnoreCase);
}
return Shares.Any(i => string.Equals(userId, i.UserId, StringComparison.OrdinalIgnoreCase)) ||
string.Equals(OwnerUserId, userId, StringComparison.OrdinalIgnoreCase);
}
return false;
public override bool IsVisibleStandalone(User user)
{
return IsVisible(user);
}
}
}