alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-20 05:04:18 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

support multiple user data keys

Browse Source
This commit is contained in:
Luke Pulverenti
2016-04-30 19:05:21 -04:00
parent 1f9d32afc5
commit 6330b13262
26 changed files with 219 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs
View File

@@ -45,17 +45,6 @@ namespace MediaBrowser.Controller.LiveTv
set { }
}
/// <summary>
/// Gets the user data key.
/// </summary>
/// <returns>System.String.</returns>
protected override string CreateUserDataKey()
{
var name = GetClientTypeName();
return name + "-" + Name + (EpisodeTitle ?? string.Empty);
}
/// <summary>
/// Gets a value indicating whether this instance is owned item.
/// </summary>

11
MediaBrowser.Controller/LiveTv/LiveTvChannel.cs
View File

@@ -11,13 +11,12 @@ namespace MediaBrowser.Controller.LiveTv
{
public class LiveTvChannel : BaseItem, IHasMediaSources
{
/// <summary>
/// Gets the user data key.
/// </summary>
/// <returns>System.String.</returns>
protected override string CreateUserDataKey()
public override List<string> GetUserDataKeys()
{
return GetClientTypeName() + "-" + Name;
var list = base.GetUserDataKeys();
list.Insert(0, GetClientTypeName() + "-" + Name);
return list;
}
public override UnratedItem GetBlockUnratedType()

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

@@ -4,36 +4,40 @@ using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.LiveTv;
using System;
using System.Collections.Generic;
using System.Runtime.Serialization;
using MediaBrowser.Model.Entities;
namespace MediaBrowser.Controller.LiveTv
{
public class LiveTvProgram : BaseItem, IHasLookupInfo<LiveTvProgramLookupInfo>, IHasStartDate, IHasProgramAttributes
{
/// <summary>
/// Gets the user data key.
/// </summary>
/// <returns>System.String.</returns>
protected override string CreateUserDataKey()
public override List<string> GetUserDataKeys()
{
if (IsMovie)
{
var key = Movie.GetMovieUserDataKey(this);
var list = base.GetUserDataKeys();
if (!IsSeries)
{
var key = this.GetProviderId(MetadataProviders.Imdb);
if (!string.IsNullOrWhiteSpace(key))
{
return key;
list.Insert(0, key);
}
key = this.GetProviderId(MetadataProviders.Tmdb);
if (!string.IsNullOrWhiteSpace(key))
{
list.Insert(0, key);
}
}
if (IsSeries && !string.IsNullOrWhiteSpace(EpisodeTitle))
else if (!string.IsNullOrWhiteSpace(EpisodeTitle))
{
var name = GetClientTypeName();
return name + "-" + Name + (EpisodeTitle ?? string.Empty);
list.Insert(0, name + "-" + Name + (EpisodeTitle ?? string.Empty));
}
return base.CreateUserDataKey();
return list;
}
[IgnoreDataMember]

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

@@ -45,32 +45,6 @@ namespace MediaBrowser.Controller.LiveTv
set { }
}
/// <summary>
/// Gets the user data key.
/// </summary>
/// <returns>System.String.</returns>
protected override string CreateUserDataKey()
{
if (IsMovie)
{
var key = Movie.GetMovieUserDataKey(this);
if (!string.IsNullOrWhiteSpace(key))
{
return key;
}
}
if (IsSeries && !string.IsNullOrWhiteSpace(EpisodeTitle))
{
var name = GetClientTypeName();
return name + "-" + Name + (EpisodeTitle ?? string.Empty);
}
return base.CreateUserDataKey();
}
[IgnoreDataMember]
public override string MediaType
{