mirror of https://github.com/jellyfin/jellyfin.git
Convert RecordingNotifier to IHostedService
This commit is contained in:
parent
9e62b6919f
commit
24b4d02596
|
@ -6,6 +6,7 @@ using System.Net.Mime;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using Emby.Server.Implementations.EntryPoints;
|
using Emby.Server.Implementations.EntryPoints;
|
||||||
using Jellyfin.Api.Middleware;
|
using Jellyfin.Api.Middleware;
|
||||||
|
using Jellyfin.LiveTv;
|
||||||
using Jellyfin.LiveTv.Extensions;
|
using Jellyfin.LiveTv.Extensions;
|
||||||
using Jellyfin.MediaEncoding.Hls.Extensions;
|
using Jellyfin.MediaEncoding.Hls.Extensions;
|
||||||
using Jellyfin.Networking;
|
using Jellyfin.Networking;
|
||||||
|
@ -129,6 +130,7 @@ namespace Jellyfin.Server
|
||||||
services.AddHostedService<PortForwardingHost>();
|
services.AddHostedService<PortForwardingHost>();
|
||||||
services.AddHostedService<LibraryChangedNotifier>();
|
services.AddHostedService<LibraryChangedNotifier>();
|
||||||
services.AddHostedService<UserDataChangeNotifier>();
|
services.AddHostedService<UserDataChangeNotifier>();
|
||||||
|
services.AddHostedService<RecordingNotifier>();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -1,7 +1,3 @@
|
||||||
#nullable disable
|
|
||||||
|
|
||||||
#pragma warning disable CS1591
|
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
@ -10,34 +6,44 @@ using Jellyfin.Data.Enums;
|
||||||
using Jellyfin.Data.Events;
|
using Jellyfin.Data.Events;
|
||||||
using MediaBrowser.Controller.Library;
|
using MediaBrowser.Controller.Library;
|
||||||
using MediaBrowser.Controller.LiveTv;
|
using MediaBrowser.Controller.LiveTv;
|
||||||
using MediaBrowser.Controller.Plugins;
|
|
||||||
using MediaBrowser.Controller.Session;
|
using MediaBrowser.Controller.Session;
|
||||||
using MediaBrowser.Model.Session;
|
using MediaBrowser.Model.Session;
|
||||||
|
using Microsoft.Extensions.Hosting;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
namespace Jellyfin.LiveTv
|
namespace Jellyfin.LiveTv
|
||||||
{
|
{
|
||||||
public sealed class RecordingNotifier : IServerEntryPoint
|
/// <summary>
|
||||||
|
/// <see cref="IHostedService"/> responsible for notifying users when a LiveTV recording is completed.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class RecordingNotifier : IHostedService
|
||||||
{
|
{
|
||||||
private readonly ILiveTvManager _liveTvManager;
|
private readonly ILogger<RecordingNotifier> _logger;
|
||||||
private readonly ISessionManager _sessionManager;
|
private readonly ISessionManager _sessionManager;
|
||||||
private readonly IUserManager _userManager;
|
private readonly IUserManager _userManager;
|
||||||
private readonly ILogger<RecordingNotifier> _logger;
|
private readonly ILiveTvManager _liveTvManager;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="RecordingNotifier"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="logger">The <see cref="ILogger"/>.</param>
|
||||||
|
/// <param name="sessionManager">The <see cref="ISessionManager"/>.</param>
|
||||||
|
/// <param name="userManager">The <see cref="IUserManager"/>.</param>
|
||||||
|
/// <param name="liveTvManager">The <see cref="ILiveTvManager"/>.</param>
|
||||||
public RecordingNotifier(
|
public RecordingNotifier(
|
||||||
|
ILogger<RecordingNotifier> logger,
|
||||||
ISessionManager sessionManager,
|
ISessionManager sessionManager,
|
||||||
IUserManager userManager,
|
IUserManager userManager,
|
||||||
ILogger<RecordingNotifier> logger,
|
|
||||||
ILiveTvManager liveTvManager)
|
ILiveTvManager liveTvManager)
|
||||||
{
|
{
|
||||||
|
_logger = logger;
|
||||||
_sessionManager = sessionManager;
|
_sessionManager = sessionManager;
|
||||||
_userManager = userManager;
|
_userManager = userManager;
|
||||||
_logger = logger;
|
|
||||||
_liveTvManager = liveTvManager;
|
_liveTvManager = liveTvManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public Task RunAsync()
|
public Task StartAsync(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
_liveTvManager.TimerCancelled += OnLiveTvManagerTimerCancelled;
|
_liveTvManager.TimerCancelled += OnLiveTvManagerTimerCancelled;
|
||||||
_liveTvManager.SeriesTimerCancelled += OnLiveTvManagerSeriesTimerCancelled;
|
_liveTvManager.SeriesTimerCancelled += OnLiveTvManagerSeriesTimerCancelled;
|
||||||
|
@ -47,29 +53,35 @@ namespace Jellyfin.LiveTv
|
||||||
return Task.CompletedTask;
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async void OnLiveTvManagerSeriesTimerCreated(object sender, GenericEventArgs<TimerEventInfo> e)
|
/// <inheritdoc />
|
||||||
|
public Task StopAsync(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
await SendMessage(SessionMessageType.SeriesTimerCreated, e.Argument).ConfigureAwait(false);
|
_liveTvManager.TimerCancelled -= OnLiveTvManagerTimerCancelled;
|
||||||
|
_liveTvManager.SeriesTimerCancelled -= OnLiveTvManagerSeriesTimerCancelled;
|
||||||
|
_liveTvManager.TimerCreated -= OnLiveTvManagerTimerCreated;
|
||||||
|
_liveTvManager.SeriesTimerCreated -= OnLiveTvManagerSeriesTimerCreated;
|
||||||
|
|
||||||
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async void OnLiveTvManagerTimerCreated(object sender, GenericEventArgs<TimerEventInfo> e)
|
private async void OnLiveTvManagerSeriesTimerCreated(object? sender, GenericEventArgs<TimerEventInfo> e)
|
||||||
{
|
=> await SendMessage(SessionMessageType.SeriesTimerCreated, e.Argument).ConfigureAwait(false);
|
||||||
await SendMessage(SessionMessageType.TimerCreated, e.Argument).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void OnLiveTvManagerSeriesTimerCancelled(object sender, GenericEventArgs<TimerEventInfo> e)
|
private async void OnLiveTvManagerTimerCreated(object? sender, GenericEventArgs<TimerEventInfo> e)
|
||||||
{
|
=> await SendMessage(SessionMessageType.TimerCreated, e.Argument).ConfigureAwait(false);
|
||||||
await SendMessage(SessionMessageType.SeriesTimerCancelled, e.Argument).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void OnLiveTvManagerTimerCancelled(object sender, GenericEventArgs<TimerEventInfo> e)
|
private async void OnLiveTvManagerSeriesTimerCancelled(object? sender, GenericEventArgs<TimerEventInfo> e)
|
||||||
{
|
=> await SendMessage(SessionMessageType.SeriesTimerCancelled, e.Argument).ConfigureAwait(false);
|
||||||
await SendMessage(SessionMessageType.TimerCancelled, e.Argument).ConfigureAwait(false);
|
|
||||||
}
|
private async void OnLiveTvManagerTimerCancelled(object? sender, GenericEventArgs<TimerEventInfo> e)
|
||||||
|
=> await SendMessage(SessionMessageType.TimerCancelled, e.Argument).ConfigureAwait(false);
|
||||||
|
|
||||||
private async Task SendMessage(SessionMessageType name, TimerEventInfo info)
|
private async Task SendMessage(SessionMessageType name, TimerEventInfo info)
|
||||||
{
|
{
|
||||||
var users = _userManager.Users.Where(i => i.HasPermission(PermissionKind.EnableLiveTvAccess)).Select(i => i.Id).ToList();
|
var users = _userManager.Users
|
||||||
|
.Where(i => i.HasPermission(PermissionKind.EnableLiveTvAccess))
|
||||||
|
.Select(i => i.Id)
|
||||||
|
.ToList();
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -80,14 +92,5 @@ namespace Jellyfin.LiveTv
|
||||||
_logger.LogError(ex, "Error sending message");
|
_logger.LogError(ex, "Error sending message");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public void Dispose()
|
|
||||||
{
|
|
||||||
_liveTvManager.TimerCancelled -= OnLiveTvManagerTimerCancelled;
|
|
||||||
_liveTvManager.SeriesTimerCancelled -= OnLiveTvManagerSeriesTimerCancelled;
|
|
||||||
_liveTvManager.TimerCreated -= OnLiveTvManagerTimerCreated;
|
|
||||||
_liveTvManager.SeriesTimerCreated -= OnLiveTvManagerSeriesTimerCreated;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue