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

update recording dialogs

Browse Source
This commit is contained in:
Luke Pulverenti 2016-09-21 17:09:14 -04:00
parent 284df8a7bc
commit 6999017bc9
6 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,7 @@ namespace MediaBrowser.Controller.Entities
ProviderIds = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); ProviderIds = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
LockedFields = new List<MetadataFields>(); LockedFields = new List<MetadataFields>();
ImageInfos = new List<ItemImageInfo>(); ImageInfos = new List<ItemImageInfo>();
InheritedTags = new List<string>();
} }
public static readonly char[] SlugReplaceChars = { '?', '/', '&' }; public static readonly char[] SlugReplaceChars = { '?', '/', '&' };
@ -794,6 +795,9 @@ namespace MediaBrowser.Controller.Entities
[IgnoreDataMember] [IgnoreDataMember]
public int InheritedParentalRatingValue { get; set; } public int InheritedParentalRatingValue { get; set; }
[IgnoreDataMember]
public List<string> InheritedTags { get; set; }
/// <summary> /// <summary>
/// Gets or sets the critic rating. /// Gets or sets the critic rating.
/// </summary> /// </summary>

1
MediaBrowser.Controller/Entities/IHasMetadata.cs
View File

@ -64,5 +64,6 @@ namespace MediaBrowser.Controller.Entities
int? GetInheritedParentalRatingValue(); int? GetInheritedParentalRatingValue();
int InheritedParentalRatingValue { get; set; } int InheritedParentalRatingValue { get; set; }
List<string> GetInheritedTags(); List<string> GetInheritedTags();
List<string> InheritedTags { get; set; }
} }
} }

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

@ -53,6 +53,10 @@ namespace MediaBrowser.Controller.LiveTv
/// <value><c>true</c> if [record any channel]; otherwise, <c>false</c>.</value> /// <value><c>true</c> if [record any channel]; otherwise, <c>false</c>.</value>
public bool RecordAnyChannel { get; set; } public bool RecordAnyChannel { get; set; }
public int KeepUpTo { get; set; }
public bool SkipEpisodesInLibrary { get; set; }
/// <summary> /// <summary>
/// Gets or sets a value indicating whether [record new only]. /// Gets or sets a value indicating whether [record new only].
/// </summary> /// </summary>
@ -104,6 +108,7 @@ namespace MediaBrowser.Controller.LiveTv
public SeriesTimerInfo() public SeriesTimerInfo()
{ {
Days = new List<DayOfWeek>(); Days = new List<DayOfWeek>();
SkipEpisodesInLibrary = true;
} }
} }
} }

4
MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
View File

@ -18,12 +18,16 @@ namespace MediaBrowser.Model.LiveTv
/// <value><c>true</c> if [record any time]; otherwise, <c>false</c>.</value> /// <value><c>true</c> if [record any time]; otherwise, <c>false</c>.</value>
public bool RecordAnyTime { get; set; } public bool RecordAnyTime { get; set; }
public bool SkipEpisodesInLibrary { get; set; }
/// <summary> /// <summary>
/// Gets or sets a value indicating whether [record any channel]. /// Gets or sets a value indicating whether [record any channel].
/// </summary> /// </summary>
/// <value><c>true</c> if [record any channel]; otherwise, <c>false</c>.</value> /// <value><c>true</c> if [record any channel]; otherwise, <c>false</c>.</value>
public bool RecordAnyChannel { get; set; } public bool RecordAnyChannel { get; set; }
public int KeepUpTo { get; set; }
/// <summary> /// <summary>
/// Gets or sets a value indicating whether [record new only]. /// Gets or sets a value indicating whether [record new only].
/// </summary> /// </summary>

4
MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
View File

@ -541,6 +541,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
instance.RecordAnyChannel = info.RecordAnyChannel; instance.RecordAnyChannel = info.RecordAnyChannel;
instance.RecordAnyTime = info.RecordAnyTime; instance.RecordAnyTime = info.RecordAnyTime;
instance.RecordNewOnly = info.RecordNewOnly; instance.RecordNewOnly = info.RecordNewOnly;
instance.SkipEpisodesInLibrary = info.SkipEpisodesInLibrary;
instance.KeepUpTo = info.KeepUpTo;
instance.StartDate = info.StartDate; instance.StartDate = info.StartDate;
_seriesTimerProvider.Update(instance); _seriesTimerProvider.Update(instance);
@ -1381,7 +1383,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
allPrograms = GetProgramsForSeries(seriesTimer, allPrograms); allPrograms = GetProgramsForSeries(seriesTimer, allPrograms);
if (filterByCurrentRecordings) if (filterByCurrentRecordings && seriesTimer.SkipEpisodesInLibrary)
{ {
allPrograms = allPrograms.Where(i => !IsProgramAlreadyInLibrary(i)); allPrograms = allPrograms.Where(i => !IsProgramAlreadyInLibrary(i));
} }

4
MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
View File

@ -100,6 +100,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv
Priority = info.Priority, Priority = info.Priority,
RecordAnyChannel = info.RecordAnyChannel, RecordAnyChannel = info.RecordAnyChannel,
RecordAnyTime = info.RecordAnyTime, RecordAnyTime = info.RecordAnyTime,
SkipEpisodesInLibrary = info.SkipEpisodesInLibrary,
KeepUpTo = info.KeepUpTo,
RecordNewOnly = info.RecordNewOnly, RecordNewOnly = info.RecordNewOnly,
ExternalChannelId = info.ChannelId, ExternalChannelId = info.ChannelId,
ExternalProgramId = info.ProgramId, ExternalProgramId = info.ProgramId,
@ -308,6 +310,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv
Priority = dto.Priority, Priority = dto.Priority,
RecordAnyChannel = dto.RecordAnyChannel, RecordAnyChannel = dto.RecordAnyChannel,
RecordAnyTime = dto.RecordAnyTime, RecordAnyTime = dto.RecordAnyTime,
SkipEpisodesInLibrary = dto.SkipEpisodesInLibrary,
KeepUpTo = dto.KeepUpTo,
RecordNewOnly = dto.RecordNewOnly, RecordNewOnly = dto.RecordNewOnly,
ProgramId = dto.ExternalProgramId, ProgramId = dto.ExternalProgramId,
ChannelId = dto.ExternalChannelId, ChannelId = dto.ExternalChannelId,