Code cleanups

daleghent · Mar 1, 2024 · 104f06d · 104f06d
1 parent 1bcd182
commit 104f06d
Show file tree

Hide file tree

Showing 13 changed files with 50 additions and 34 deletions.
diff --git a/Email/EmailCommon.cs b/Email/EmailCommon.cs
@@ -79,19 +79,19 @@ public IList<string> ValidateSettings() {
 
         private void SettingsChanged(object sender, PropertyChangedEventArgs e) {
             switch (e.PropertyName) {
-                case "SmtpHostName":
+                case nameof(SmtpHostName):
                     SmtpHostName = Properties.Settings.Default.SmtpHostName;
                     break;
 
-                case "SmtpHostPort":
+                case nameof(SmtpHostPort):
                     SmtpHostPort = Properties.Settings.Default.SmtpHostPort;
                     break;
 
-                case "SmtpUsername":
+                case nameof(SmtpUsername):
                     SmtpUsername = Security.Decrypt(Properties.Settings.Default.SmtpUsername);
                     break;
 
-                case "SmtpPassword":
+                case nameof(SmtpPassword):
                     SmtpPassword = Security.Decrypt(Properties.Settings.Default.SmtpPassword);
                     break;
             }

diff --git a/Email/FailuresToEmailTrigger.cs b/Email/FailuresToEmailTrigger.cs
@@ -266,24 +266,26 @@ public override string ToString() {
         }
 
         private string SmtpFromAddress { get; set; }
+        private string SmtpDefaultRecipients { get; set; }
         private string EmailFailureSubjectText { get; set; }
         private string EmailFailureBodyText { get; set; }
 
         private void SettingsChanged(object sender, PropertyChangedEventArgs e) {
             switch (e.PropertyName) {
-                case "SmtpFromAddress":
+                case nameof(SmtpFromAddress):
                     SmtpFromAddress = Properties.Settings.Default.SmtpFromAddress;
                     break;
 
-                case "SmtpDefaultRecipients":
-                    Recipient = Properties.Settings.Default.SmtpDefaultRecipients;
+                case nameof(SmtpDefaultRecipients):
+                    SmtpDefaultRecipients = Properties.Settings.Default.SmtpDefaultRecipients;
+                    Recipient = SmtpDefaultRecipients;
                     break;
 
-                case "EmailFailureSubjectText":
+                case nameof(EmailFailureSubjectText):
                     EmailFailureSubjectText = Properties.Settings.Default.EmailFailureSubjectText;
                     break;
 
-                case "EmailFailureBodyText":
+                case nameof(EmailFailureBodyText):
                     EmailFailureBodyText = Properties.Settings.Default.EmailFailureBodyText;
                     break;
             }

diff --git a/Email/SendToEmail.cs b/Email/SendToEmail.cs
@@ -200,11 +200,11 @@ public override string ToString() {
 
         private void SettingsChanged(object sender, PropertyChangedEventArgs e) {
             switch (e.PropertyName) {
-                case "SmtpFromAddress":
+                case nameof(SmtpFromAddress):
                     SmtpFromAddress = Properties.Settings.Default.SmtpFromAddress;
                     break;
 
-                case "SmtpDefaultRecipients":
+                case nameof(SmtpDefaultRecipients):
                     SmtpDefaultRecipients = Properties.Settings.Default.SmtpDefaultRecipients;
                     Recipient = SmtpDefaultRecipients;
                     break;

diff --git a/IFTTT/FailuresToIftttTrigger.cs b/IFTTT/FailuresToIftttTrigger.cs
@@ -270,15 +270,15 @@ private string ResolveAllTokens(string text, FailedItem failedItem, IMetadata me
 
         private void SettingsChanged(object sender, PropertyChangedEventArgs e) {
             switch (e.PropertyName) {
-                case "IftttFailureValue1":
+                case nameof(IftttFailureValue1):
                     IftttFailureValue1 = Properties.Settings.Default.IftttFailureValue1;
                     break;
 
-                case "IftttFailureValue2":
+                case nameof(IftttFailureValue2):
                     IftttFailureValue2 = Properties.Settings.Default.IftttFailureValue2;
                     break;
 
-                case "IftttFailureValue3":
+                case nameof(IftttFailureValue3):
                     IftttFailureValue3 = Properties.Settings.Default.IftttFailureValue3;
                     break;
             }

diff --git a/IFTTT/IftttCommon.cs b/IFTTT/IftttCommon.cs
@@ -52,7 +52,7 @@ public IList<string> ValidateSettings() {
 
         private void SettingsChanged(object sender, PropertyChangedEventArgs e) {
             switch (e.PropertyName) {
-                case "IFTTTWebhookKey":
+                case nameof(IFTTTWebhookKey):
                     IFTTTWebhookKey = Security.Decrypt(Properties.Settings.Default.IFTTTWebhookKey);
                     break;
             }

diff --git a/IpProtocols/IpCommon.cs b/IpProtocols/IpCommon.cs
@@ -1,8 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+#region "copyright"
+
+/*
+    Copyright Dale Ghent <[email protected]>
+
+    This Source Code Form is subject to the terms of the Mozilla Public
+    License, v. 2.0. If a copy of the MPL was not distributed with this
+    file, You can obtain one at http://mozilla.org/MPL/2.0/
+*/
+
+#endregion "copyright"
 
 namespace DaleGhent.NINA.GroundStation.IpProtocols
 {

diff --git a/IpProtocols/SendUdp.cs b/IpProtocols/SendUdp.cs
@@ -11,14 +11,12 @@ This Source Code Form is subject to the terms of the Mozilla Public
 #endregion "copyright"
 
 using DaleGhent.NINA.GroundStation.MetadataClient;
-using Microsoft.AspNetCore.Mvc.Routing;
 using Newtonsoft.Json;
 using NINA.Core.Model;
 using NINA.Core.Utility;
 using NINA.Equipment.Interfaces.Mediator;
 using NINA.Sequencer.SequenceItem;
 using NINA.Sequencer.Validations;
-using NmeaParser.Gnss.Ntrip;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -45,7 +43,6 @@ public partial class SendUdp : SequenceItem, IValidatable, INotifyPropertyChange
         private string address = string.Empty;
         private ushort port = 0;
         private string payload = string.Empty;
-        private bool addressIsOk = true;
         private short payloadType;
         private short lineTermination;
 

diff --git a/MQTT/MqttCommon.cs b/MQTT/MqttCommon.cs
@@ -74,19 +74,19 @@ public IList<string> ValidateSettings() {
 
         private void SettingsChanged(object sender, PropertyChangedEventArgs e) {
             switch (e.PropertyName) {
-                case "MqttBrokerHost":
+                case nameof(MqttBrokerHost):
                     MqttBrokerHost = Properties.Settings.Default.MqttBrokerHost;
                     break;
 
-                case "MqttBrokerPort":
+                case nameof(MqttBrokerPort):
                     MqttBrokerPort = Properties.Settings.Default.MqttBrokerPort;
                     break;
 
-                case "MqttBrokerUseTls":
+                case nameof(MqttBrokerUseTls):
                     MqttBrokerUseTls = Properties.Settings.Default.MqttBrokerUseTls;
                     break;
 
-                case "MqttClientId":
+                case nameof(MqttClientId):
                     MqttClientId = Properties.Settings.Default.MqttClientId;
                     break;
             }

diff --git a/Pushover/FailuresToPushoverTrigger.cs b/Pushover/FailuresToPushoverTrigger.cs
@@ -268,11 +268,11 @@ public override string ToString() {
 
         private void SettingsChanged(object sender, PropertyChangedEventArgs e) {
             switch (e.PropertyName) {
-                case "PushoverFailureTitleText":
+                case nameof(PushoverFailureTitleText):
                     PushoverFailureTitleText = Properties.Settings.Default.PushoverFailureTitleText;
                     break;
 
-                case "PushoverFailureBodyText":
+                case nameof(PushoverFailureBodyText):
                     PushoverFailureBodyText = Properties.Settings.Default.PushoverFailureBodyText;
                     break;
             }

diff --git a/PushoverClient/PushoverClient.cs b/PushoverClient/PushoverClient.cs
@@ -17,7 +17,6 @@ This Source Code Form is subject to the terms of the Mozilla Public
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Net.Http.Headers;
 using System.Threading;
 using System.Threading.Tasks;
 

diff --git a/Telegram/FailuresToTelegramTrigger.cs b/Telegram/FailuresToTelegramTrigger.cs
@@ -234,7 +234,7 @@ public override string ToString() {
 
         private void SettingsChanged(object sender, PropertyChangedEventArgs e) {
             switch (e.PropertyName) {
-                case "TelegramFailureBodyText":
+                case nameof(TelegramFailureBodyText):
                     TelegramFailureBodyText = Properties.Settings.Default.TelegramFailureBodyText;
                     break;
             }

diff --git a/Telegram/TelegramCommon.cs b/Telegram/TelegramCommon.cs
@@ -62,11 +62,11 @@ public IList<string> ValidateSettings() {
 
         private void SettingsChanged(object sender, PropertyChangedEventArgs e) {
             switch (e.PropertyName) {
-                case "TelegramAccessToken":
+                case nameof(TelegramAccessToken):
                     TelegramAccessToken = Security.Decrypt(Properties.Settings.Default.TelegramAccessToken);
                     break;
 
-                case "TelegramChatId":
+                case nameof(TelegramChatId):
                     TelegramChatId = Security.Decrypt(Properties.Settings.Default.TelegramChatId);
                     break;
             }

diff --git a/Utilities/BackgroundQueueWorker.cs b/Utilities/BackgroundQueueWorker.cs
@@ -1,4 +1,16 @@
-using NINA.Core.Utility;
+#region "copyright"
+
+/*
+    Copyright 2023 Dale Ghent <[email protected]>
+
+    This Source Code Form is subject to the terms of the Mozilla Public
+    License, v. 2.0. If a copy of the MPL was not distributed with this
+    file, You can obtain one at http://mozilla.org/MPL/2.0/
+*/
+
+#endregion "copyright"
+
+using NINA.Core.Utility;
 using Nito.AsyncEx;
 using System;
 using System.Threading;