Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-05 21:33:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2349 from MediaBrowser/dev

Browse source 
Dev
This commit is contained in:
Luke 2016-12-18 00:26:20 -05:00 committed by GitHub
parent f4b3ad24e0 38b26acd87
commit aaa027f322
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Emby.Server.Implementations/LiveTv/LiveTvManager.cs
View file

@ -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));
}

2
MediaBrowser.Model/LiveTv/TimerQuery.cs
View file

@ -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>

6
MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
View file

@ -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>