Winify – Diff between revs 56 and 67

Subversion Repositories:

?pathlinks?

Rev 56 – Rev 71 – Go to most recent revision – Details – Blame – Last modification – View Log

 using Winify.Gotify;
 using Winify.Settings;
 using Winify.Utilities;
 using Winify.Utilities.Serialization;
 using ScheduledContinuation = Toasts.ScheduledContinuation;
-using Toasts = Toasts.Toasts;
 namespace Winify
+{
     public partial class MainForm : Form
         private LogViewForm _logViewForm;
         private readonly LogMemorySink _memorySink;
-        private readonly global::Toasts.Toasts _toasts;
+        private readonly Toasts.Toasts _toasts;
+        #endregion
-        #endregion
+        #region Constructors, Destructors and Finalizers
-        #region Constructors, Destructors and Finalizers
+        public MainForm()
+        {
-        public MainForm()
+            InitializeComponent();
             _cancellationTokenSource = new CancellationTokenSource();
-            _cancellationToken = _cancellationTokenSource.Token;
-            ChangedConfigurationContinuation = new ScheduledContinuation();
+            _cancellationToken = _cancellationTokenSource.Token;
-            _toasts = new global::Toasts.Toasts(_cancellationToken);
+            ChangedConfigurationContinuation = new ScheduledContinuation();
             _toasts = new Toasts.Toasts(_cancellationToken);
             var servers = await LoadServers();
             _gotifyConnections = new ConcurrentBag<GotifyConnection>();
             foreach (var server in servers.Server)
+            {
                 var gotifyConnection = new GotifyConnection(server, Configuration);
-                gotifyConnection.GotifyNotification += GotifyConnection_GotifyNotification;
+                gotifyConnection.GotifyMessage += GotifyConnectionGotifyMessage;
                 gotifyConnection.Start();
                 _gotifyConnections.Add(gotifyConnection);
+            }
+        }
         private void LogViewToolStripMenuItem_Click(object sender, EventArgs e)
         {
+            if (_logViewForm != null)
+            {
+                return;
             if (_logViewForm != null) return;
             _logViewForm = new LogViewForm(this, _memorySink, _cancellationToken);
             _logViewForm.Closing += LogViewForm_Closing;
             _logViewForm.Show();
+        }
+        private void LogViewForm_Closing(object sender, CancelEventArgs e)
+        {
+            if (_logViewForm == null)
         private void LogViewForm_Closing(object sender, CancelEventArgs e)
                 return;
             if (_logViewForm == null) return;
             await Task.WhenAll(SaveServers(e.Servers), SaveAnnouncements(e.Announcements));
             // Update connections to gotify servers.
             while (_gotifyConnections.TryTake(out var gotifyConnection))
             {
-                gotifyConnection.GotifyNotification -= GotifyConnection_GotifyNotification;
+                gotifyConnection.GotifyMessage -= GotifyConnectionGotifyMessage;
-                gotifyConnection.Stop();
+                await gotifyConnection.Stop();
-                gotifyConnection.Dispose();
-                gotifyConnection = null;
+                gotifyConnection.Dispose();
+            }
             foreach (var server in e.Servers.Server)
             {
                 var gotifyConnection = new GotifyConnection(server, Configuration);
-                gotifyConnection.GotifyNotification += GotifyConnection_GotifyNotification;
+                gotifyConnection.GotifyMessage += GotifyConnectionGotifyMessage;
                 gotifyConnection.Start();
                 _gotifyConnections.Add(gotifyConnection);
             }
+        }
-        private async void GotifyConnection_GotifyNotification(object sender, GotifyNotificationEventArgs e)
+        private async void GotifyConnectionGotifyMessage(object sender, GotifyMessageEventArgs e)
+        {
-        {
+            var announcements = await LoadAnnouncements();
             var announcements = await LoadAnnouncements();
-            foreach (var announcement in announcements.Announcement)
-                if (announcement.AppId == e.Notification.AppId)
-                {
-                    var configuredNotification = new ToastForm(
-                        $"{e.Notification.Title} ({e.Notification.Server.Name}/{e.Notification.AppId})",
-                        e.Notification.Message, announcement.LingerTime, e.Image);
+            foreach (var announcement in announcements.Announcement)
+            {
+                if (announcement.AppId != e.Message.AppId)
+                {
+                    continue;
+                }
+                var configuredNotification = new ToastForm(
+                    $"{e.Message.Title} ({e.Message.Server.Name}/{e.Message.AppId})",
+                    e.Message.Message, announcement.LingerTime, e.Image);
-                    await _toasts.Queue(configuredNotification);
+                await _toasts.Queue(configuredNotification);
-                    return;
+                return;
-                }
+            }
             if (Configuration.InfiniteToastDuration)
+            {
                 var infiniteToastForm = new ToastForm(
-                    $"{e.Notification.Title} ({e.Notification.Server.Name}/{e.Notification.AppId})",
+                    $"{e.Message.Title} ({e.Message.Server.Name}/{e.Message.AppId})",
-                    e.Notification.Message, e.Image);
+                    e.Message.Message, e.Image);
                 await _toasts.Queue(infiniteToastForm);
                 return;
+            }
             var toastForm = new ToastForm(
+                $"{e.Message.Title} ({e.Message.Server.Name}/{e.Message.AppId})",
+                e.Message.Message, Configuration.ToastDuration, e.Image);
-                $"{e.Notification.Title} ({e.Notification.Server.Name}/{e.Notification.AppId})",
+            await _toasts.Queue(toastForm);
                 e.Notification.Message, Configuration.ToastDuration, e.Image);
-            await _toasts.Queue(toastForm);
+        private void SettingsForm_Closing(object sender, CancelEventArgs e)
+        {
             if (_settingsForm == null)
         private void SettingsForm_Closing(object sender, CancelEventArgs e)
-        {
+                return;
+            }
+            _settingsForm.Save -= SettingsForm_Save;
-            if (_settingsForm == null) return;
+            _settingsForm.Closing -= SettingsForm_Closing;
             _settingsForm.Dispose();
-            _settingsForm.Save -= SettingsForm_Save;
+            _settingsForm = null;
             _settingsForm.Closing -= SettingsForm_Closing;
             _settingsForm.Dispose();
-            _settingsForm = null;
+        private void AboutToolStripMenuItem_Click(object sender, EventArgs e)
-        }
+        {
+            if (_aboutForm != null)
+            {
+                return;
+            }
         private void AboutToolStripMenuItem_Click(object sender, EventArgs e)
             _aboutForm = new AboutForm();
-            if (_aboutForm != null) return;
+            _aboutForm.Closing += AboutForm_Closing;