mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-25 23:18:54 +02:00
commit
aaa027f322
|
@ -2009,6 +2009,14 @@ namespace Emby.Server.Implementations.LiveTv
|
||||||
.Where(i => _tvDtoService.GetInternalSeriesTimerId(i.Item2.Name, i.Item1.SeriesTimerId) == guid);
|
.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>();
|
var returnList = new List<TimerInfoDto>();
|
||||||
|
|
||||||
foreach (var i in timers)
|
foreach (var i in timers)
|
||||||
|
@ -2143,7 +2151,11 @@ namespace Emby.Server.Implementations.LiveTv
|
||||||
|
|
||||||
public async Task<TimerInfoDto> GetTimer(string id, CancellationToken cancellationToken)
|
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));
|
return results.Items.FirstOrDefault(i => string.Equals(i.Id, id, StringComparison.OrdinalIgnoreCase));
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,8 @@
|
||||||
/// <value>The channel identifier.</value>
|
/// <value>The channel identifier.</value>
|
||||||
public string ChannelId { get; set; }
|
public string ChannelId { get; set; }
|
||||||
|
|
||||||
|
public string Id { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the series timer identifier.
|
/// Gets or sets the series timer identifier.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -380,9 +380,6 @@
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\livetvitems.html">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\livetvitems.html">
|
||||||
<Link>Resources\dashboard-ui\livetvitems.html</Link>
|
<Link>Resources\dashboard-ui\livetvitems.html</Link>
|
||||||
</BundleResource>
|
</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">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\livetvsettings.html">
|
||||||
<Link>Resources\dashboard-ui\livetvsettings.html</Link>
|
<Link>Resources\dashboard-ui\livetvsettings.html</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
@ -3167,9 +3164,6 @@
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\livetvschedule.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\livetvschedule.js">
|
||||||
<Link>Resources\dashboard-ui\scripts\livetvschedule.js</Link>
|
<Link>Resources\dashboard-ui\scripts\livetvschedule.js</Link>
|
||||||
</BundleResource>
|
</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">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\livetvseriestimers.js">
|
||||||
<Link>Resources\dashboard-ui\scripts\livetvseriestimers.js</Link>
|
<Link>Resources\dashboard-ui\scripts\livetvseriestimers.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
|
Loading…
Reference in a new issue