glax/Tranga-Website
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed missing logger for notificationManagers on deserialization

Browse Source
This commit is contained in:
glax 2023-07-09 21:38:49 +02:00
parent 78023ef0fd
commit 0f8932e712
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Tranga/NotificationManager.cs
View File

@ -7,7 +7,7 @@ namespace Tranga;
public abstract class NotificationManager public abstract class NotificationManager
{ {
protected readonly Logger? logger; protected Logger? logger;
public NotificationManagerType notificationManagerType; public NotificationManagerType notificationManagerType;
protected NotificationManager(NotificationManagerType notificationManagerType, Logger? logger = null) protected NotificationManager(NotificationManagerType notificationManagerType, Logger? logger = null)
@ -19,6 +19,11 @@ public abstract class NotificationManager
public enum NotificationManagerType : byte { Gotify = 0, LunaSea = 1 } public enum NotificationManagerType : byte { Gotify = 0, LunaSea = 1 }
public abstract void SendNotification(string title, string notificationText); public abstract void SendNotification(string title, string notificationText);
public void AddLogger(Logger pLogger)
{
this.logger = pLogger;
}
public class NotificationManagerJsonConverter : JsonConverter public class NotificationManagerJsonConverter : JsonConverter
{ {

4
Tranga/TrangaSettings.cs
View File

@ -37,8 +37,12 @@ public class TrangaSettings
TrangaSettings settings = JsonConvert.DeserializeObject<TrangaSettings>(toRead, TrangaSettings settings = JsonConvert.DeserializeObject<TrangaSettings>(toRead,
new JsonSerializerSettings { Converters = { new NotificationManager.NotificationManagerJsonConverter(), new LibraryManager.LibraryManagerJsonConverter() } })!; new JsonSerializerSettings { Converters = { new NotificationManager.NotificationManagerJsonConverter(), new LibraryManager.LibraryManagerJsonConverter() } })!;
if (logger is not null) if (logger is not null)
{
foreach (LibraryManager lm in settings.libraryManagers) foreach (LibraryManager lm in settings.libraryManagers)
lm.AddLogger(logger); lm.AddLogger(logger);
foreach(NotificationManager nm in settings.notificationManagers)
nm.AddLogger(logger);
}
return settings; return settings;
} }