diff options
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/LiveTvManager.cs | 14 | ||||
| -rw-r--r-- | MediaBrowser.Model/LiveTv/TimerQuery.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Server.Mac/Emby.Server.Mac.csproj | 6 |
3 files changed, 15 insertions, 7 deletions
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs index 5e12fc9b9..265817cbe 100644 --- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs +++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs @@ -2009,6 +2009,14 @@ namespace Emby.Server.Implementations.LiveTv .Where(i => _tvDtoService.GetInternalSeriesTimerId(i.Item2.Name, i.Item1.SeriesTimerId) == guid); } + if (!string.IsNullOrEmpty(query.Id)) + { + var guid = new Guid(query.Id); + + timers = timers + .Where(i => _tvDtoService.GetInternalTimerId(i.Item2.Name, i.Item1.Id) == guid); + } + var returnList = new List<TimerInfoDto>(); foreach (var i in timers) @@ -2143,7 +2151,11 @@ namespace Emby.Server.Implementations.LiveTv public async Task<TimerInfoDto> GetTimer(string id, CancellationToken cancellationToken) { - var results = await GetTimers(new TimerQuery(), cancellationToken).ConfigureAwait(false); + var results = await GetTimers(new TimerQuery + { + Id = id + + }, cancellationToken).ConfigureAwait(false); return results.Items.FirstOrDefault(i => string.Equals(i.Id, id, StringComparison.OrdinalIgnoreCase)); } diff --git a/MediaBrowser.Model/LiveTv/TimerQuery.cs b/MediaBrowser.Model/LiveTv/TimerQuery.cs index 310dc486f..c6202680c 100644 --- a/MediaBrowser.Model/LiveTv/TimerQuery.cs +++ b/MediaBrowser.Model/LiveTv/TimerQuery.cs @@ -8,6 +8,8 @@ /// <value>The channel identifier.</value> public string ChannelId { get; set; } + public string Id { get; set; } + /// <summary> /// Gets or sets the series timer identifier. /// </summary> diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index c4b1af7a8..dc61e19a0 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -380,9 +380,6 @@ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\livetvitems.html">
<Link>Resources\dashboard-ui\livetvitems.html</Link>
</BundleResource>
- <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\livetvseriestimer.html">
- <Link>Resources\dashboard-ui\livetvseriestimer.html</Link>
- </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\livetvsettings.html">
<Link>Resources\dashboard-ui\livetvsettings.html</Link>
</BundleResource>
@@ -3167,9 +3164,6 @@ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\livetvschedule.js">
<Link>Resources\dashboard-ui\scripts\livetvschedule.js</Link>
</BundleResource>
- <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\livetvseriestimer.js">
- <Link>Resources\dashboard-ui\scripts\livetvseriestimer.js</Link>
- </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\livetvseriestimers.js">
<Link>Resources\dashboard-ui\scripts\livetvseriestimers.js</Link>
</BundleResource>
|