|
@@ -2,6 +2,7 @@
|
|
using MediaBrowser.Common.Plugins;
|
|
using MediaBrowser.Common.Plugins;
|
|
using MediaBrowser.Common.ScheduledTasks;
|
|
using MediaBrowser.Common.ScheduledTasks;
|
|
using MediaBrowser.Common.Updates;
|
|
using MediaBrowser.Common.Updates;
|
|
|
|
+using MediaBrowser.Controller.Configuration;
|
|
using MediaBrowser.Controller.Entities;
|
|
using MediaBrowser.Controller.Entities;
|
|
using MediaBrowser.Controller.Library;
|
|
using MediaBrowser.Controller.Library;
|
|
using MediaBrowser.Controller.Notifications;
|
|
using MediaBrowser.Controller.Notifications;
|
|
@@ -27,6 +28,8 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
|
|
private readonly ITaskManager _taskManager;
|
|
private readonly ITaskManager _taskManager;
|
|
private readonly INotificationManager _notificationManager;
|
|
private readonly INotificationManager _notificationManager;
|
|
|
|
|
|
|
|
+ private IServerConfigurationManager _config;
|
|
|
|
+
|
|
public Notifications(IInstallationManager installationManager, IUserManager userManager, ILogger logger, ITaskManager taskManager, INotificationManager notificationManager)
|
|
public Notifications(IInstallationManager installationManager, IUserManager userManager, ILogger logger, ITaskManager taskManager, INotificationManager notificationManager)
|
|
{
|
|
{
|
|
_installationManager = installationManager;
|
|
_installationManager = installationManager;
|
|
@@ -75,7 +78,8 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
|
|
{
|
|
{
|
|
var result = e.Argument;
|
|
var result = e.Argument;
|
|
|
|
|
|
- if (result.Status == TaskCompletionStatus.Failed)
|
|
|
|
|
|
+ if (result.Status == TaskCompletionStatus.Failed &&
|
|
|
|
+ _config.Configuration.NotificationOptions.SendOnFailedTasks)
|
|
{
|
|
{
|
|
var userIds = _userManager
|
|
var userIds = _userManager
|
|
.Users
|
|
.Users
|
|
@@ -130,6 +134,11 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
|
|
|
|
|
|
async void _installationManager_PackageInstallationCompleted(object sender, InstallationEventArgs e)
|
|
async void _installationManager_PackageInstallationCompleted(object sender, InstallationEventArgs e)
|
|
{
|
|
{
|
|
|
|
+ if (!_config.Configuration.NotificationOptions.SendOnUpdates)
|
|
|
|
+ {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
var installationInfo = e.InstallationInfo;
|
|
var installationInfo = e.InstallationInfo;
|
|
|
|
|
|
var userIds = _userManager
|
|
var userIds = _userManager
|