mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-08 12:28:19 +02:00
Merge pull request #2176 from Bond-009/nullable2
Enable nullable reference types for Emby.Photos and Emby.Notifications
This commit is contained in:
commit
a3bb81553d
10 changed files with 171 additions and 82 deletions
|
@ -1,5 +1,11 @@
|
||||||
|
#pragma warning disable CS1591
|
||||||
|
#pragma warning disable SA1402
|
||||||
|
#pragma warning disable SA1600
|
||||||
|
#pragma warning disable SA1649
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics.CodeAnalysis;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
@ -16,7 +22,7 @@ namespace Emby.Notifications.Api
|
||||||
public class GetNotifications : IReturn<NotificationResult>
|
public class GetNotifications : IReturn<NotificationResult>
|
||||||
{
|
{
|
||||||
[ApiMember(Name = "UserId", Description = "User Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
|
[ApiMember(Name = "UserId", Description = "User Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
|
||||||
public string UserId { get; set; }
|
public string UserId { get; set; } = string.Empty;
|
||||||
|
|
||||||
[ApiMember(Name = "IsRead", Description = "An optional filter by IsRead", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
|
[ApiMember(Name = "IsRead", Description = "An optional filter by IsRead", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
|
||||||
public bool? IsRead { get; set; }
|
public bool? IsRead { get; set; }
|
||||||
|
@ -30,32 +36,34 @@ namespace Emby.Notifications.Api
|
||||||
|
|
||||||
public class Notification
|
public class Notification
|
||||||
{
|
{
|
||||||
public string Id { get; set; }
|
public string Id { get; set; } = string.Empty;
|
||||||
|
|
||||||
public string UserId { get; set; }
|
public string UserId { get; set; } = string.Empty;
|
||||||
|
|
||||||
public DateTime Date { get; set; }
|
public DateTime Date { get; set; }
|
||||||
|
|
||||||
public bool IsRead { get; set; }
|
public bool IsRead { get; set; }
|
||||||
|
|
||||||
public string Name { get; set; }
|
public string Name { get; set; } = string.Empty;
|
||||||
|
|
||||||
public string Description { get; set; }
|
public string Description { get; set; } = string.Empty;
|
||||||
|
|
||||||
public string Url { get; set; }
|
public string Url { get; set; } = string.Empty;
|
||||||
|
|
||||||
public NotificationLevel Level { get; set; }
|
public NotificationLevel Level { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class NotificationResult
|
public class NotificationResult
|
||||||
{
|
{
|
||||||
public Notification[] Notifications { get; set; }
|
public IReadOnlyList<Notification> Notifications { get; set; } = Array.Empty<Notification>();
|
||||||
|
|
||||||
public int TotalRecordCount { get; set; }
|
public int TotalRecordCount { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class NotificationsSummary
|
public class NotificationsSummary
|
||||||
{
|
{
|
||||||
public int UnreadCount { get; set; }
|
public int UnreadCount { get; set; }
|
||||||
|
|
||||||
public NotificationLevel MaxUnreadNotificationLevel { get; set; }
|
public NotificationLevel MaxUnreadNotificationLevel { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -63,7 +71,7 @@ namespace Emby.Notifications.Api
|
||||||
public class GetNotificationsSummary : IReturn<NotificationsSummary>
|
public class GetNotificationsSummary : IReturn<NotificationsSummary>
|
||||||
{
|
{
|
||||||
[ApiMember(Name = "UserId", Description = "User Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
|
[ApiMember(Name = "UserId", Description = "User Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
|
||||||
public string UserId { get; set; }
|
public string UserId { get; set; } = string.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
[Route("/Notifications/Types", "GET", Summary = "Gets notification types")]
|
[Route("/Notifications/Types", "GET", Summary = "Gets notification types")]
|
||||||
|
@ -80,16 +88,16 @@ namespace Emby.Notifications.Api
|
||||||
public class AddAdminNotification : IReturnVoid
|
public class AddAdminNotification : IReturnVoid
|
||||||
{
|
{
|
||||||
[ApiMember(Name = "Name", Description = "The notification's name", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
|
[ApiMember(Name = "Name", Description = "The notification's name", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
|
||||||
public string Name { get; set; }
|
public string Name { get; set; } = string.Empty;
|
||||||
|
|
||||||
[ApiMember(Name = "Description", Description = "The notification's description", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
|
[ApiMember(Name = "Description", Description = "The notification's description", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
|
||||||
public string Description { get; set; }
|
public string Description { get; set; } = string.Empty;
|
||||||
|
|
||||||
[ApiMember(Name = "ImageUrl", Description = "The notification's image url", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
|
[ApiMember(Name = "ImageUrl", Description = "The notification's image url", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
|
||||||
public string ImageUrl { get; set; }
|
public string? ImageUrl { get; set; }
|
||||||
|
|
||||||
[ApiMember(Name = "Url", Description = "The notification's info url", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
|
[ApiMember(Name = "Url", Description = "The notification's info url", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
|
||||||
public string Url { get; set; }
|
public string? Url { get; set; }
|
||||||
|
|
||||||
[ApiMember(Name = "Level", Description = "The notification level", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
|
[ApiMember(Name = "Level", Description = "The notification level", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
|
||||||
public NotificationLevel Level { get; set; }
|
public NotificationLevel Level { get; set; }
|
||||||
|
@ -99,20 +107,20 @@ namespace Emby.Notifications.Api
|
||||||
public class MarkRead : IReturnVoid
|
public class MarkRead : IReturnVoid
|
||||||
{
|
{
|
||||||
[ApiMember(Name = "UserId", Description = "User Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
|
[ApiMember(Name = "UserId", Description = "User Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
|
||||||
public string UserId { get; set; }
|
public string UserId { get; set; } = string.Empty;
|
||||||
|
|
||||||
[ApiMember(Name = "Ids", Description = "A list of notification ids, comma delimited", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST", AllowMultiple = true)]
|
[ApiMember(Name = "Ids", Description = "A list of notification ids, comma delimited", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST", AllowMultiple = true)]
|
||||||
public string Ids { get; set; }
|
public string Ids { get; set; } = string.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
[Route("/Notifications/{UserId}/Unread", "POST", Summary = "Marks notifications as unread")]
|
[Route("/Notifications/{UserId}/Unread", "POST", Summary = "Marks notifications as unread")]
|
||||||
public class MarkUnread : IReturnVoid
|
public class MarkUnread : IReturnVoid
|
||||||
{
|
{
|
||||||
[ApiMember(Name = "UserId", Description = "User Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
|
[ApiMember(Name = "UserId", Description = "User Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
|
||||||
public string UserId { get; set; }
|
public string UserId { get; set; } = string.Empty;
|
||||||
|
|
||||||
[ApiMember(Name = "Ids", Description = "A list of notification ids, comma delimited", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST", AllowMultiple = true)]
|
[ApiMember(Name = "Ids", Description = "A list of notification ids, comma delimited", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST", AllowMultiple = true)]
|
||||||
public string Ids { get; set; }
|
public string Ids { get; set; } = string.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
[Authenticated]
|
[Authenticated]
|
||||||
|
@ -127,32 +135,29 @@ namespace Emby.Notifications.Api
|
||||||
_userManager = userManager;
|
_userManager = userManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request")]
|
||||||
public object Get(GetNotificationTypes request)
|
public object Get(GetNotificationTypes request)
|
||||||
{
|
{
|
||||||
return _notificationManager.GetNotificationTypes();
|
return _notificationManager.GetNotificationTypes();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request")]
|
||||||
public object Get(GetNotificationServices request)
|
public object Get(GetNotificationServices request)
|
||||||
{
|
{
|
||||||
return _notificationManager.GetNotificationServices().ToList();
|
return _notificationManager.GetNotificationServices().ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request")]
|
||||||
public object Get(GetNotificationsSummary request)
|
public object Get(GetNotificationsSummary request)
|
||||||
{
|
{
|
||||||
return new NotificationsSummary
|
return new NotificationsSummary
|
||||||
{
|
{
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task Post(AddAdminNotification request)
|
public Task Post(AddAdminNotification request)
|
||||||
{
|
{
|
||||||
// This endpoint really just exists as post of a real with sickbeard
|
// This endpoint really just exists as post of a real with sickbeard
|
||||||
return AddNotification(request);
|
|
||||||
}
|
|
||||||
|
|
||||||
private Task AddNotification(AddAdminNotification request)
|
|
||||||
{
|
|
||||||
var notification = new NotificationRequest
|
var notification = new NotificationRequest
|
||||||
{
|
{
|
||||||
Date = DateTime.UtcNow,
|
Date = DateTime.UtcNow,
|
||||||
|
@ -166,14 +171,17 @@ namespace Emby.Notifications.Api
|
||||||
return _notificationManager.SendNotification(notification, CancellationToken.None);
|
return _notificationManager.SendNotification(notification, CancellationToken.None);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request")]
|
||||||
public void Post(MarkRead request)
|
public void Post(MarkRead request)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request")]
|
||||||
public void Post(MarkUnread request)
|
public void Post(MarkUnread request)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request")]
|
||||||
public object Get(GetNotifications request)
|
public object Get(GetNotifications request)
|
||||||
{
|
{
|
||||||
return new NotificationResult();
|
return new NotificationResult();
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
#pragma warning disable CS1591
|
||||||
|
#pragma warning disable SA1600
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
|
|
@ -4,6 +4,8 @@
|
||||||
<TargetFramework>netstandard2.1</TargetFramework>
|
<TargetFramework>netstandard2.1</TargetFramework>
|
||||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||||
|
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
@ -16,4 +18,16 @@
|
||||||
<ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
|
<ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<!-- Code analyzers-->
|
||||||
|
<ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
|
||||||
|
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" />
|
||||||
|
<PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" />
|
||||||
|
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
|
||||||
|
<PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
||||||
|
<CodeAnalysisRuleSet>../jellyfin.ruleset</CodeAnalysisRuleSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
#pragma warning disable CS1591
|
||||||
|
#pragma warning disable SA1600
|
||||||
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using MediaBrowser.Common.Configuration;
|
using MediaBrowser.Common.Configuration;
|
||||||
using MediaBrowser.Model.Notifications;
|
using MediaBrowser.Model.Notifications;
|
||||||
|
@ -13,7 +16,7 @@ namespace Emby.Notifications
|
||||||
new ConfigurationStore
|
new ConfigurationStore
|
||||||
{
|
{
|
||||||
Key = "notifications",
|
Key = "notifications",
|
||||||
ConfigurationType = typeof (NotificationOptions)
|
ConfigurationType = typeof(NotificationOptions)
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,70 +21,85 @@ using Microsoft.Extensions.Logging;
|
||||||
namespace Emby.Notifications
|
namespace Emby.Notifications
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Creates notifications for various system events
|
/// Creates notifications for various system events.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class Notifications : IServerEntryPoint
|
public class NotificationEntryPoint : IServerEntryPoint
|
||||||
{
|
{
|
||||||
private readonly ILogger _logger;
|
private readonly ILogger _logger;
|
||||||
|
private readonly IActivityManager _activityManager;
|
||||||
|
private readonly ILocalizationManager _localization;
|
||||||
private readonly INotificationManager _notificationManager;
|
private readonly INotificationManager _notificationManager;
|
||||||
|
|
||||||
private readonly ILibraryManager _libraryManager;
|
private readonly ILibraryManager _libraryManager;
|
||||||
private readonly IServerApplicationHost _appHost;
|
private readonly IServerApplicationHost _appHost;
|
||||||
|
|
||||||
private Timer LibraryUpdateTimer { get; set; }
|
|
||||||
private readonly object _libraryChangedSyncLock = new object();
|
|
||||||
|
|
||||||
private readonly IConfigurationManager _config;
|
private readonly IConfigurationManager _config;
|
||||||
private readonly ILocalizationManager _localization;
|
|
||||||
private readonly IActivityManager _activityManager;
|
private readonly object _libraryChangedSyncLock = new object();
|
||||||
|
private readonly List<BaseItem> _itemsAdded = new List<BaseItem>();
|
||||||
|
|
||||||
|
private Timer? _libraryUpdateTimer;
|
||||||
|
|
||||||
private string[] _coreNotificationTypes;
|
private string[] _coreNotificationTypes;
|
||||||
|
|
||||||
public Notifications(
|
private bool _disposed = false;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="NotificationEntryPoint" /> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="logger">The logger.</param>
|
||||||
|
/// <param name="activityManager">The activity manager.</param>
|
||||||
|
/// <param name="localization">The localization manager.</param>
|
||||||
|
/// <param name="notificationManager">The notification manager.</param>
|
||||||
|
/// <param name="libraryManager">The library manager.</param>
|
||||||
|
/// <param name="appHost">The application host.</param>
|
||||||
|
/// <param name="config">The configuration manager.</param>
|
||||||
|
public NotificationEntryPoint(
|
||||||
|
ILogger<NotificationEntryPoint> logger,
|
||||||
IActivityManager activityManager,
|
IActivityManager activityManager,
|
||||||
ILocalizationManager localization,
|
ILocalizationManager localization,
|
||||||
ILogger logger,
|
|
||||||
INotificationManager notificationManager,
|
INotificationManager notificationManager,
|
||||||
ILibraryManager libraryManager,
|
ILibraryManager libraryManager,
|
||||||
IServerApplicationHost appHost,
|
IServerApplicationHost appHost,
|
||||||
IConfigurationManager config)
|
IConfigurationManager config)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
|
_activityManager = activityManager;
|
||||||
|
_localization = localization;
|
||||||
_notificationManager = notificationManager;
|
_notificationManager = notificationManager;
|
||||||
_libraryManager = libraryManager;
|
_libraryManager = libraryManager;
|
||||||
_appHost = appHost;
|
_appHost = appHost;
|
||||||
_config = config;
|
_config = config;
|
||||||
_localization = localization;
|
|
||||||
_activityManager = activityManager;
|
|
||||||
|
|
||||||
_coreNotificationTypes = new CoreNotificationTypes(localization).GetNotificationTypes().Select(i => i.Type).ToArray();
|
_coreNotificationTypes = new CoreNotificationTypes(localization).GetNotificationTypes().Select(i => i.Type).ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
public Task RunAsync()
|
public Task RunAsync()
|
||||||
{
|
{
|
||||||
_libraryManager.ItemAdded += _libraryManager_ItemAdded;
|
_libraryManager.ItemAdded += OnLibraryManagerItemAdded;
|
||||||
_appHost.HasPendingRestartChanged += _appHost_HasPendingRestartChanged;
|
_appHost.HasPendingRestartChanged += OnAppHostHasPendingRestartChanged;
|
||||||
_appHost.HasUpdateAvailableChanged += _appHost_HasUpdateAvailableChanged;
|
_appHost.HasUpdateAvailableChanged += OnAppHostHasUpdateAvailableChanged;
|
||||||
_activityManager.EntryCreated += _activityManager_EntryCreated;
|
_activityManager.EntryCreated += OnActivityManagerEntryCreated;
|
||||||
|
|
||||||
return Task.CompletedTask;
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async void _appHost_HasPendingRestartChanged(object sender, EventArgs e)
|
private async void OnAppHostHasPendingRestartChanged(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
var type = NotificationType.ServerRestartRequired.ToString();
|
var type = NotificationType.ServerRestartRequired.ToString();
|
||||||
|
|
||||||
var notification = new NotificationRequest
|
var notification = new NotificationRequest
|
||||||
{
|
{
|
||||||
NotificationType = type,
|
NotificationType = type,
|
||||||
Name = string.Format(_localization.GetLocalizedString("ServerNameNeedsToBeRestarted"), _appHost.Name)
|
Name = string.Format(
|
||||||
|
CultureInfo.InvariantCulture,
|
||||||
|
_localization.GetLocalizedString("ServerNameNeedsToBeRestarted"),
|
||||||
|
_appHost.Name)
|
||||||
};
|
};
|
||||||
|
|
||||||
await SendNotification(notification, null).ConfigureAwait(false);
|
await SendNotification(notification, null).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async void _activityManager_EntryCreated(object sender, GenericEventArgs<ActivityLogEntry> e)
|
private async void OnActivityManagerEntryCreated(object sender, GenericEventArgs<ActivityLogEntry> e)
|
||||||
{
|
{
|
||||||
var entry = e.Argument;
|
var entry = e.Argument;
|
||||||
|
|
||||||
|
@ -117,7 +132,7 @@ namespace Emby.Notifications
|
||||||
return _config.GetConfiguration<NotificationOptions>("notifications");
|
return _config.GetConfiguration<NotificationOptions>("notifications");
|
||||||
}
|
}
|
||||||
|
|
||||||
private async void _appHost_HasUpdateAvailableChanged(object sender, EventArgs e)
|
private async void OnAppHostHasUpdateAvailableChanged(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
if (!_appHost.HasUpdateAvailable)
|
if (!_appHost.HasUpdateAvailable)
|
||||||
{
|
{
|
||||||
|
@ -136,8 +151,7 @@ namespace Emby.Notifications
|
||||||
await SendNotification(notification, null).ConfigureAwait(false);
|
await SendNotification(notification, null).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
private readonly List<BaseItem> _itemsAdded = new List<BaseItem>();
|
private void OnLibraryManagerItemAdded(object sender, ItemChangeEventArgs e)
|
||||||
private void _libraryManager_ItemAdded(object sender, ItemChangeEventArgs e)
|
|
||||||
{
|
{
|
||||||
if (!FilterItem(e.Item))
|
if (!FilterItem(e.Item))
|
||||||
{
|
{
|
||||||
|
@ -146,14 +160,17 @@ namespace Emby.Notifications
|
||||||
|
|
||||||
lock (_libraryChangedSyncLock)
|
lock (_libraryChangedSyncLock)
|
||||||
{
|
{
|
||||||
if (LibraryUpdateTimer == null)
|
if (_libraryUpdateTimer == null)
|
||||||
{
|
{
|
||||||
LibraryUpdateTimer = new Timer(LibraryUpdateTimerCallback, null, 5000,
|
_libraryUpdateTimer = new Timer(
|
||||||
|
LibraryUpdateTimerCallback,
|
||||||
|
null,
|
||||||
|
5000,
|
||||||
Timeout.Infinite);
|
Timeout.Infinite);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
LibraryUpdateTimer.Change(5000, Timeout.Infinite);
|
_libraryUpdateTimer.Change(5000, Timeout.Infinite);
|
||||||
}
|
}
|
||||||
|
|
||||||
_itemsAdded.Add(e.Item);
|
_itemsAdded.Add(e.Item);
|
||||||
|
@ -188,7 +205,8 @@ namespace Emby.Notifications
|
||||||
{
|
{
|
||||||
items = _itemsAdded.ToList();
|
items = _itemsAdded.ToList();
|
||||||
_itemsAdded.Clear();
|
_itemsAdded.Clear();
|
||||||
DisposeLibraryUpdateTimer();
|
_libraryUpdateTimer!.Dispose(); // Shouldn't be null as it just set off this callback
|
||||||
|
_libraryUpdateTimer = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
items = items.Take(10).ToList();
|
items = items.Take(10).ToList();
|
||||||
|
@ -198,7 +216,10 @@ namespace Emby.Notifications
|
||||||
var notification = new NotificationRequest
|
var notification = new NotificationRequest
|
||||||
{
|
{
|
||||||
NotificationType = NotificationType.NewLibraryContent.ToString(),
|
NotificationType = NotificationType.NewLibraryContent.ToString(),
|
||||||
Name = string.Format(_localization.GetLocalizedString("ValueHasBeenAddedToLibrary"), GetItemName(item)),
|
Name = string.Format(
|
||||||
|
CultureInfo.InvariantCulture,
|
||||||
|
_localization.GetLocalizedString("ValueHasBeenAddedToLibrary"),
|
||||||
|
GetItemName(item)),
|
||||||
Description = item.Overview
|
Description = item.Overview
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -206,6 +227,11 @@ namespace Emby.Notifications
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Creates a human readable name for the item.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="item">The item.</param>
|
||||||
|
/// <returns>A human readable name for the item.</returns>
|
||||||
public static string GetItemName(BaseItem item)
|
public static string GetItemName(BaseItem item)
|
||||||
{
|
{
|
||||||
var name = item.Name;
|
var name = item.Name;
|
||||||
|
@ -219,6 +245,7 @@ namespace Emby.Notifications
|
||||||
episode.IndexNumber.Value,
|
episode.IndexNumber.Value,
|
||||||
name);
|
name);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (episode.ParentIndexNumber.HasValue)
|
if (episode.ParentIndexNumber.HasValue)
|
||||||
{
|
{
|
||||||
name = string.Format(
|
name = string.Format(
|
||||||
|
@ -229,7 +256,6 @@ namespace Emby.Notifications
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (item is IHasSeries hasSeries)
|
if (item is IHasSeries hasSeries)
|
||||||
{
|
{
|
||||||
name = hasSeries.SeriesName + " - " + name;
|
name = hasSeries.SeriesName + " - " + name;
|
||||||
|
@ -257,7 +283,7 @@ namespace Emby.Notifications
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task SendNotification(NotificationRequest notification, BaseItem relatedItem)
|
private async Task SendNotification(NotificationRequest notification, BaseItem? relatedItem)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -269,23 +295,37 @@ namespace Emby.Notifications
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
DisposeLibraryUpdateTimer();
|
Dispose(true);
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
_libraryManager.ItemAdded -= _libraryManager_ItemAdded;
|
|
||||||
_appHost.HasPendingRestartChanged -= _appHost_HasPendingRestartChanged;
|
|
||||||
_appHost.HasUpdateAvailableChanged -= _appHost_HasUpdateAvailableChanged;
|
|
||||||
_activityManager.EntryCreated -= _activityManager_EntryCreated;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void DisposeLibraryUpdateTimer()
|
/// <summary>
|
||||||
|
/// Releases unmanaged and optionally managed resources.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
|
||||||
|
protected virtual void Dispose(bool disposing)
|
||||||
{
|
{
|
||||||
if (LibraryUpdateTimer != null)
|
if (_disposed)
|
||||||
{
|
{
|
||||||
LibraryUpdateTimer.Dispose();
|
return;
|
||||||
LibraryUpdateTimer = null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (disposing)
|
||||||
|
{
|
||||||
|
_libraryUpdateTimer?.Dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
_libraryUpdateTimer = null;
|
||||||
|
|
||||||
|
_libraryManager.ItemAdded -= OnLibraryManagerItemAdded;
|
||||||
|
_appHost.HasPendingRestartChanged -= OnAppHostHasPendingRestartChanged;
|
||||||
|
_appHost.HasUpdateAvailableChanged -= OnAppHostHasUpdateAvailableChanged;
|
||||||
|
_activityManager.EntryCreated -= OnActivityManagerEntryCreated;
|
||||||
|
|
||||||
|
_disposed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -16,20 +16,32 @@ using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
namespace Emby.Notifications
|
namespace Emby.Notifications
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// NotificationManager class.
|
||||||
|
/// </summary>
|
||||||
public class NotificationManager : INotificationManager
|
public class NotificationManager : INotificationManager
|
||||||
{
|
{
|
||||||
private readonly ILogger _logger;
|
private readonly ILogger _logger;
|
||||||
private readonly IUserManager _userManager;
|
private readonly IUserManager _userManager;
|
||||||
private readonly IServerConfigurationManager _config;
|
private readonly IServerConfigurationManager _config;
|
||||||
|
|
||||||
private INotificationService[] _services;
|
private INotificationService[] _services = Array.Empty<INotificationService>();
|
||||||
private INotificationTypeFactory[] _typeFactories;
|
private INotificationTypeFactory[] _typeFactories = Array.Empty<INotificationTypeFactory>();
|
||||||
|
|
||||||
public NotificationManager(ILoggerFactory loggerFactory, IUserManager userManager, IServerConfigurationManager config)
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="NotificationManager" /> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="logger">The logger.</param>
|
||||||
|
/// <param name="userManager">The user manager.</param>
|
||||||
|
/// <param name="config">The server configuration manager.</param>
|
||||||
|
public NotificationManager(
|
||||||
|
ILogger<NotificationManager> logger,
|
||||||
|
IUserManager userManager,
|
||||||
|
IServerConfigurationManager config)
|
||||||
{
|
{
|
||||||
|
_logger = logger;
|
||||||
_userManager = userManager;
|
_userManager = userManager;
|
||||||
_config = config;
|
_config = config;
|
||||||
_logger = loggerFactory.CreateLogger(GetType().Name);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private NotificationOptions GetConfiguration()
|
private NotificationOptions GetConfiguration()
|
||||||
|
@ -37,12 +49,14 @@ namespace Emby.Notifications
|
||||||
return _config.GetConfiguration<NotificationOptions>("notifications");
|
return _config.GetConfiguration<NotificationOptions>("notifications");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
public Task SendNotification(NotificationRequest request, CancellationToken cancellationToken)
|
public Task SendNotification(NotificationRequest request, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
return SendNotification(request, null, cancellationToken);
|
return SendNotification(request, null, cancellationToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task SendNotification(NotificationRequest request, BaseItem relatedItem, CancellationToken cancellationToken)
|
/// <inheritdoc />
|
||||||
|
public Task SendNotification(NotificationRequest request, BaseItem? relatedItem, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var notificationType = request.NotificationType;
|
var notificationType = request.NotificationType;
|
||||||
|
|
||||||
|
@ -64,7 +78,8 @@ namespace Emby.Notifications
|
||||||
return Task.WhenAll(tasks);
|
return Task.WhenAll(tasks);
|
||||||
}
|
}
|
||||||
|
|
||||||
private Task SendNotification(NotificationRequest request,
|
private Task SendNotification(
|
||||||
|
NotificationRequest request,
|
||||||
INotificationService service,
|
INotificationService service,
|
||||||
IEnumerable<User> users,
|
IEnumerable<User> users,
|
||||||
string title,
|
string title,
|
||||||
|
@ -79,7 +94,7 @@ namespace Emby.Notifications
|
||||||
return Task.WhenAll(tasks);
|
return Task.WhenAll(tasks);
|
||||||
}
|
}
|
||||||
|
|
||||||
private IEnumerable<Guid> GetUserIds(NotificationRequest request, NotificationOption options)
|
private IEnumerable<Guid> GetUserIds(NotificationRequest request, NotificationOption? options)
|
||||||
{
|
{
|
||||||
if (request.SendToUserMode.HasValue)
|
if (request.SendToUserMode.HasValue)
|
||||||
{
|
{
|
||||||
|
@ -109,7 +124,8 @@ namespace Emby.Notifications
|
||||||
return request.UserIds;
|
return request.UserIds;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task SendNotification(NotificationRequest request,
|
private async Task SendNotification(
|
||||||
|
NotificationRequest request,
|
||||||
INotificationService service,
|
INotificationService service,
|
||||||
string title,
|
string title,
|
||||||
string description,
|
string description,
|
||||||
|
@ -161,12 +177,14 @@ namespace Emby.Notifications
|
||||||
return GetConfiguration().IsServiceEnabled(service.Name, notificationType);
|
return GetConfiguration().IsServiceEnabled(service.Name, notificationType);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
public void AddParts(IEnumerable<INotificationService> services, IEnumerable<INotificationTypeFactory> notificationTypeFactories)
|
public void AddParts(IEnumerable<INotificationService> services, IEnumerable<INotificationTypeFactory> notificationTypeFactories)
|
||||||
{
|
{
|
||||||
_services = services.ToArray();
|
_services = services.ToArray();
|
||||||
_typeFactories = notificationTypeFactories.ToArray();
|
_typeFactories = notificationTypeFactories.ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
public List<NotificationTypeInfo> GetNotificationTypes()
|
public List<NotificationTypeInfo> GetNotificationTypes()
|
||||||
{
|
{
|
||||||
var list = _typeFactories.Select(i =>
|
var list = _typeFactories.Select(i =>
|
||||||
|
@ -180,7 +198,6 @@ namespace Emby.Notifications
|
||||||
_logger.LogError(ex, "Error in GetNotificationTypes");
|
_logger.LogError(ex, "Error in GetNotificationTypes");
|
||||||
return new List<NotificationTypeInfo>();
|
return new List<NotificationTypeInfo>();
|
||||||
}
|
}
|
||||||
|
|
||||||
}).SelectMany(i => i).ToList();
|
}).SelectMany(i => i).ToList();
|
||||||
|
|
||||||
var config = GetConfiguration();
|
var config = GetConfiguration();
|
||||||
|
@ -193,13 +210,13 @@ namespace Emby.Notifications
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
public IEnumerable<NameIdPair> GetNotificationServices()
|
public IEnumerable<NameIdPair> GetNotificationServices()
|
||||||
{
|
{
|
||||||
return _services.Select(i => new NameIdPair
|
return _services.Select(i => new NameIdPair
|
||||||
{
|
{
|
||||||
Name = i.Name,
|
Name = i.Name,
|
||||||
Id = i.Name.GetMD5().ToString("N", CultureInfo.InvariantCulture)
|
Id = i.Name.GetMD5().ToString("N", CultureInfo.InvariantCulture)
|
||||||
|
|
||||||
}).OrderBy(i => i.Name);
|
}).OrderBy(i => i.Name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<!-- Code Analyzers-->
|
<!-- Code Analyzers-->
|
||||||
|
|
|
@ -29,7 +29,7 @@ using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
namespace Emby.Server.Implementations.Activity
|
namespace Emby.Server.Implementations.Activity
|
||||||
{
|
{
|
||||||
public class ActivityLogEntryPoint : IServerEntryPoint
|
public sealed class ActivityLogEntryPoint : IServerEntryPoint
|
||||||
{
|
{
|
||||||
private readonly ILogger _logger;
|
private readonly ILogger _logger;
|
||||||
private readonly IInstallationManager _installationManager;
|
private readonly IInstallationManager _installationManager;
|
||||||
|
@ -39,7 +39,6 @@ namespace Emby.Server.Implementations.Activity
|
||||||
private readonly ILocalizationManager _localization;
|
private readonly ILocalizationManager _localization;
|
||||||
private readonly ISubtitleManager _subManager;
|
private readonly ISubtitleManager _subManager;
|
||||||
private readonly IUserManager _userManager;
|
private readonly IUserManager _userManager;
|
||||||
private readonly IServerApplicationHost _appHost;
|
|
||||||
private readonly IDeviceManager _deviceManager;
|
private readonly IDeviceManager _deviceManager;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -64,8 +63,7 @@ namespace Emby.Server.Implementations.Activity
|
||||||
ILocalizationManager localization,
|
ILocalizationManager localization,
|
||||||
IInstallationManager installationManager,
|
IInstallationManager installationManager,
|
||||||
ISubtitleManager subManager,
|
ISubtitleManager subManager,
|
||||||
IUserManager userManager,
|
IUserManager userManager)
|
||||||
IServerApplicationHost appHost)
|
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
_sessionManager = sessionManager;
|
_sessionManager = sessionManager;
|
||||||
|
@ -76,7 +74,6 @@ namespace Emby.Server.Implementations.Activity
|
||||||
_installationManager = installationManager;
|
_installationManager = installationManager;
|
||||||
_subManager = subManager;
|
_subManager = subManager;
|
||||||
_userManager = userManager;
|
_userManager = userManager;
|
||||||
_appHost = appHost;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task RunAsync()
|
public Task RunAsync()
|
||||||
|
@ -141,7 +138,7 @@ namespace Emby.Server.Implementations.Activity
|
||||||
CultureInfo.InvariantCulture,
|
CultureInfo.InvariantCulture,
|
||||||
_localization.GetLocalizedString("SubtitleDownloadFailureFromForItem"),
|
_localization.GetLocalizedString("SubtitleDownloadFailureFromForItem"),
|
||||||
e.Provider,
|
e.Provider,
|
||||||
Notifications.Notifications.GetItemName(e.Item)),
|
Emby.Notifications.NotificationEntryPoint.GetItemName(e.Item)),
|
||||||
Type = "SubtitleDownloadFailure",
|
Type = "SubtitleDownloadFailure",
|
||||||
ItemId = e.Item.Id.ToString("N", CultureInfo.InvariantCulture),
|
ItemId = e.Item.Id.ToString("N", CultureInfo.InvariantCulture),
|
||||||
ShortOverview = e.Exception.Message
|
ShortOverview = e.Exception.Message
|
||||||
|
@ -533,6 +530,7 @@ namespace Emby.Server.Implementations.Activity
|
||||||
private void CreateLogEntry(ActivityLogEntry entry)
|
private void CreateLogEntry(ActivityLogEntry entry)
|
||||||
=> _activityManager.Create(entry);
|
=> _activityManager.Create(entry);
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
_taskManager.TaskCompleted -= OnTaskCompleted;
|
_taskManager.TaskCompleted -= OnTaskCompleted;
|
||||||
|
|
|
@ -847,7 +847,10 @@ namespace Emby.Server.Implementations
|
||||||
UserViewManager = new UserViewManager(LibraryManager, LocalizationManager, UserManager, ChannelManager, LiveTvManager, ServerConfigurationManager);
|
UserViewManager = new UserViewManager(LibraryManager, LocalizationManager, UserManager, ChannelManager, LiveTvManager, ServerConfigurationManager);
|
||||||
serviceCollection.AddSingleton(UserViewManager);
|
serviceCollection.AddSingleton(UserViewManager);
|
||||||
|
|
||||||
NotificationManager = new NotificationManager(LoggerFactory, UserManager, ServerConfigurationManager);
|
NotificationManager = new NotificationManager(
|
||||||
|
LoggerFactory.CreateLogger<NotificationManager>(),
|
||||||
|
UserManager,
|
||||||
|
ServerConfigurationManager);
|
||||||
serviceCollection.AddSingleton(NotificationManager);
|
serviceCollection.AddSingleton(NotificationManager);
|
||||||
|
|
||||||
serviceCollection.AddSingleton<IDeviceDiscovery>(new DeviceDiscovery(ServerConfigurationManager));
|
serviceCollection.AddSingleton<IDeviceDiscovery>(new DeviceDiscovery(ServerConfigurationManager));
|
||||||
|
|
|
@ -5,6 +5,8 @@
|
||||||
<Rule Id="SA1202" Action="Info" />
|
<Rule Id="SA1202" Action="Info" />
|
||||||
<!-- disable warning SA1204: Static members must appear before non-static members -->
|
<!-- disable warning SA1204: Static members must appear before non-static members -->
|
||||||
<Rule Id="SA1204" Action="Info" />
|
<Rule Id="SA1204" Action="Info" />
|
||||||
|
<!-- disable warning SA1404: Code analysis suppression should have justification -->
|
||||||
|
<Rule Id="SA1404" Action="Info" />
|
||||||
|
|
||||||
<!-- disable warning SA1009: Closing parenthesis should be followed by a space. -->
|
<!-- disable warning SA1009: Closing parenthesis should be followed by a space. -->
|
||||||
<Rule Id="SA1009" Action="None" />
|
<Rule Id="SA1009" Action="None" />
|
||||||
|
|
Loading…
Reference in a new issue