Merge pull request #345 from ChangemakerStudios/feature/ServiceTrayNotification

Add Papercut SMTP Service Tray Manager

Author: Jaben

Papercut.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.9.34701.34
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11205.157
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Papercut", "src\Papercut.UI\Papercut.csproj", "{AC067042-66BD-4110-ADA1-E2CEA43E7947}"
 EndProject
@@ -57,6 +57,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Papercut.Infrastructure.Smt
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
 	ProjectSection(SolutionItems) = preProject
+		examples\appsettings.json = examples\appsettings.json
 		examples\Directory.Build.props = examples\Directory.Build.props
 		examples\README.md = examples\README.md
 	EndProjectSection
@@ -75,6 +76,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SendRichEmailTest", "exampl
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SendWordWrapTest", "examples\SendWordWrapTest\SendWordWrapTest.csproj", "{EA8024E3-5D17-3271-8D7A-BC8982C05ADE}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Papercut.Service.TrayNotification", "src\Papercut.Service.TrayNotification\Papercut.Service.TrayNotification.csproj", "{83838EEA-4004-B056-5AA6-4BB789F67A07}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|AnyCPU = Debug|AnyCPU
@@ -313,6 +316,18 @@ Global
 		{EA8024E3-5D17-3271-8D7A-BC8982C05ADE}.Release|x64.Build.0 = Release|Any CPU
 		{EA8024E3-5D17-3271-8D7A-BC8982C05ADE}.Release|x86.ActiveCfg = Release|Any CPU
 		{EA8024E3-5D17-3271-8D7A-BC8982C05ADE}.Release|x86.Build.0 = Release|Any CPU
+		{83838EEA-4004-B056-5AA6-4BB789F67A07}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
+		{83838EEA-4004-B056-5AA6-4BB789F67A07}.Debug|AnyCPU.Build.0 = Debug|Any CPU
+		{83838EEA-4004-B056-5AA6-4BB789F67A07}.Debug|x64.ActiveCfg = Debug|x64
+		{83838EEA-4004-B056-5AA6-4BB789F67A07}.Debug|x64.Build.0 = Debug|x64
+		{83838EEA-4004-B056-5AA6-4BB789F67A07}.Debug|x86.ActiveCfg = Debug|x86
+		{83838EEA-4004-B056-5AA6-4BB789F67A07}.Debug|x86.Build.0 = Debug|x86
+		{83838EEA-4004-B056-5AA6-4BB789F67A07}.Release|AnyCPU.ActiveCfg = Release|Any CPU
+		{83838EEA-4004-B056-5AA6-4BB789F67A07}.Release|AnyCPU.Build.0 = Release|Any CPU
+		{83838EEA-4004-B056-5AA6-4BB789F67A07}.Release|x64.ActiveCfg = Release|x64
+		{83838EEA-4004-B056-5AA6-4BB789F67A07}.Release|x64.Build.0 = Release|x64
+		{83838EEA-4004-B056-5AA6-4BB789F67A07}.Release|x86.ActiveCfg = Release|x86
+		{83838EEA-4004-B056-5AA6-4BB789F67A07}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Papercut.Core/Domain/Message/MessageEntry.cs

@@ -39,38 +39,14 @@ public class MessageEntry : INotifyPropertyChanged, IEquatable<MessageEntry>, IF
 
     protected DateTime? _created;
 
-    private bool _hasBeenSeen;
+    protected bool _hasBeenSeen;
 
-    private bool _isSelected;
+    protected bool _isSelected;
 
     public MessageEntry(FileInfo fileInfo)
     {
         _info = fileInfo;
-
-        var firstBit = _info.Name.Split(' ').FirstOrDefault();
-
-        if (firstBit?.Length == DateTimeFormat.Length)
-        {
-            _created = DateTime.ParseExact(
-                firstBit,
-                DateTimeFormat,
-                CultureInfo.InvariantCulture);
-        }
-        else
-        {
-            _created = _info.CreationTime;
-        }
-
-        if (_created > DateTime.Now.Add(-TimeSpan.FromMinutes(5)))
-        {
-            // anything under 5 minutes old is "new" still by default
-            _hasBeenSeen = false;
-        }
-        else
-        {
-            // everything else has been seen by default
-            _hasBeenSeen = true;
-        }
+        InitializeFromFileInfo();
     }
 
     public MessageEntry(string file)
@@ -122,6 +98,31 @@ public bool Equals(MessageEntry? other)
 
     public event PropertyChangedEventHandler? PropertyChanged;
 
+    private void InitializeFromFileInfo()
+    {
+        var firstBit = _info.Name.Split(' ').FirstOrDefault();
+        if (firstBit?.Length == DateTimeFormat.Length)
+        {
+            _created = DateTime.ParseExact(
+                firstBit,
+                DateTimeFormat,
+                CultureInfo.InvariantCulture);
+        }
+        else
+        {
+            _created = _info.CreationTime;
+        }
+
+        if (_created > DateTime.Now.Add(-TimeSpan.FromMinutes(5)))
+        {
+            _hasBeenSeen = false;
+        }
+        else
+        {
+            _hasBeenSeen = true;
+        }
+    }
+
     public override string ToString()
     {
         return DisplayText;
@@ -151,4 +152,16 @@ protected virtual void OnPropertyChanged(string propertyName)
             propertyChangedEventHandler.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
     }
+
+    public MessageEntryDto ToDto()
+    {
+        return new MessageEntryDto
+        {
+            ModifiedDate = ModifiedDate,
+            File = File,
+            Name = Name,
+            FileSize = FileSize,
+            DisplayText = DisplayText,
+        };
+    }
 }

src/Papercut.Core/Domain/Message/MessageEntryDto.cs

@@ -0,0 +1,34 @@
+// Papercut
+// 
+// Copyright © 2008 - 2012 Ken Robertson
+// Copyright © 2013 - 2025 Jaben Cargman
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+namespace Papercut.Core.Domain.Message;
+
+public class MessageEntryDto
+{
+    public DateTime ModifiedDate { get; init; }
+
+    public required string File { get; init; }
+
+    public string? Name { get; init; }
+
+    public string? FileSize { get; init; }
+
+    public string? DisplayText { get; init; }
+
+    public MessageEntry ToEntry() => new(File);
+}

src/Papercut.Core/Domain/Message/NewMessageEvent.cs

@@ -20,12 +20,4 @@
 
 namespace Papercut.Core.Domain.Message;
 
-public class NewMessageEvent : IEvent
-{
-    public NewMessageEvent(MessageEntry newMessage)
-    {
-        this.NewMessage = newMessage;
-    }
-
-    public MessageEntry NewMessage { get; set; }
-}
+public record NewMessageEvent(MessageEntryDto NewMessage) : IEvent;

src/Papercut.Core/Domain/Network/EndpointDefinition.cs

@@ -38,7 +38,7 @@ public EndpointDefinition(
         StoreName storeName = StoreName.My)
         : this(address, port)
     {
-        this.Certificate = this.LoadCertificateFromStore(
+        this.Certificate = LoadCertificateFromStore(
             certificateFindType,
             certificateFindValue,
             storeLocation,
@@ -66,7 +66,7 @@ private IPAddress ParseIpAddress(string value)
         return IPAddress.Parse(value);
     }
 
-    private X509Certificate? LoadCertificateFromStore(
+    private static X509Certificate2 LoadCertificateFromStore(
         X509FindType findType,
         string findValue,
         StoreLocation storeLocation,
@@ -102,7 +102,7 @@ private IPAddress ParseIpAddress(string value)
             var certificate = certificates[0];
 
             // Validate certificate has private key (required for TLS server)
-            if (certificate is X509Certificate2 cert2)
+            if (certificate is { } cert2)
             {
                 if (!cert2.HasPrivateKey)
                 {

src/Papercut.Core/Domain/Network/IServer.cs

@@ -31,7 +31,7 @@ public interface IServer : IDisposable, IAsyncDisposable
 
     int ListenPort { get; }
 
-    Task StartAsync(EndpointDefinition endpoint);
+    Task StartAsync(EndpointDefinition endpoint, CancellationToken token = default);
 
-    Task StopAsync();
+    Task StopAsync(CancellationToken token = default);
 }

src/Papercut.Core/Domain/Paths/IPathTemplatesProvider.cs

@@ -20,9 +20,15 @@
 
 namespace Papercut.Core.Domain.Paths;
 
+public enum PathTemplateType
+{
+    Message,
+    Logging
+}
+
 public interface IPathTemplatesProvider
 {
-    ObservableCollection<string> MessagePathTemplates { get; }
+    ObservableCollection<string> PathTemplates { get; }
 
-    ObservableCollection<string> LoggingPathTemplates { get; }
+    PathTemplateType Type { get; }
 }

src/Papercut.Core/Domain/Paths/MessagePathConfigurator.cs

@@ -18,9 +18,4 @@
 
 namespace Papercut.Core.Domain.Paths;
 
-public class MessagePathConfigurator : PathConfiguratorBase
-{
-    public MessagePathConfigurator(IPathTemplatesProvider pathTemplateProvider, ILogger logger) : base(pathTemplateProvider, logger)
-    {
-    }
-}
+public class MessagePathConfigurator(IPathTemplatesProvider pathTemplateProvider, ILogger logger) : PathConfiguratorBase(pathTemplateProvider, logger);