Small code cleanup

Brian Gentry · Brian Gentry · commit ba2f76af4c9f · 2025-02-23T07:09:13.000-05:00
diff --git a/RetroWarden/Config/ConfigurationManager.cs b/RetroWarden/Config/ConfigurationManager.cs
@@ -1,6 +1,6 @@
-using Microsoft.Extensions.Configuration;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Microsoft.Extensions.Configuration;
 
 namespace Retrowarden.Config
 {
diff --git a/RetroWarden/Config/RetrowardenConfig.cs b/RetroWarden/Config/RetrowardenConfig.cs
@@ -1,11 +1,12 @@
-namespace Retrowarden.Config;
-
-public sealed class RetrowardenConfig
+namespace Retrowarden.Config
 {
-    public RetrowardenConfig(string? cliLocation = "")
+    public sealed class RetrowardenConfig
     {
-        CLILocation = cliLocation;
-    }
+        public RetrowardenConfig(string? cliLocation = "")
+        {
+            CLILocation = cliLocation;
+        }
 
-    public string? CLILocation { get; set; }
+        public string? CLILocation { get; set; }
+    }
 }
diff --git a/RetroWarden/Controls/CustomFieldScrollView.cs b/RetroWarden/Controls/CustomFieldScrollView.cs
@@ -1,7 +1,7 @@
 using System.Collections.ObjectModel;
-using Terminal.Gui;
-using RetrowardenSDK.Models;
 using Retrowarden.Utils;
+using RetrowardenSDK.Models;
+using Terminal.Gui;
 
 namespace Retrowarden.Controls
 {
diff --git a/RetroWarden/Controls/UriScrollView.cs b/RetroWarden/Controls/UriScrollView.cs
@@ -1,8 +1,8 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics;
-using Terminal.Gui;
 using Retrowarden.Utils;
 using RetrowardenSDK.Models;
+using Terminal.Gui;
 
 namespace Retrowarden.Controls
 {
diff --git a/RetroWarden/Dialogs/AddCollectionDialog.cs b/RetroWarden/Dialogs/AddCollectionDialog.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
-using Terminal.Gui;
 using RetrowardenSDK.Models;
+using Terminal.Gui;
 
 namespace Retrowarden.Dialogs
 {
diff --git a/RetroWarden/Dialogs/GeneratePassphraseDialog.cs b/RetroWarden/Dialogs/GeneratePassphraseDialog.cs
@@ -1,8 +1,8 @@
 using System.ComponentModel;
 using System.Text.RegularExpressions;
-using Terminal.Gui;
-using RetrowardenSDK.Repositories;
 using Retrowarden.Workers;
+using RetrowardenSDK.Repositories;
+using Terminal.Gui;
 
 namespace Retrowarden.Dialogs 
 { 
diff --git a/RetroWarden/Dialogs/GeneratePasswordDialog.cs b/RetroWarden/Dialogs/GeneratePasswordDialog.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
-using Terminal.Gui;
-using RetrowardenSDK.Repositories;
 using Retrowarden.Workers;
+using RetrowardenSDK.Repositories;
+using Terminal.Gui;
 
 namespace Retrowarden.Dialogs 
 {
diff --git a/RetroWarden/Dialogs/SelectOrganizationAndCollectionDialog.cs b/RetroWarden/Dialogs/SelectOrganizationAndCollectionDialog.cs
@@ -3,7 +3,6 @@
 using RetrowardenSDK.Models;
 using Terminal.Gui;
 
-
 namespace Retrowarden.Dialogs
 {
     public sealed class SelectOrganizationAndCollectionDialog : BaseDialog
diff --git a/RetroWarden/Dialogs/StatusDialog.cs b/RetroWarden/Dialogs/StatusDialog.cs
@@ -1,5 +1,5 @@
-using Terminal.Gui;
 using RetrowardenSDK.Models;
+using Terminal.Gui;
 
 namespace Retrowarden.Dialogs
 {
diff --git a/RetroWarden/Utils/ItemListDataSource.cs b/RetroWarden/Utils/ItemListDataSource.cs
@@ -3,6 +3,7 @@
 using System.Text;
 using Terminal.Gui;
 using RetrowardenSDK.Models;
+
 namespace Retrowarden.Utils
 {
     public class ItemListDataSource : IListDataSource
diff --git a/RetroWarden/Utils/NodeData.cs b/RetroWarden/Utils/NodeData.cs
@@ -3,10 +3,9 @@
 namespace Retrowarden.Utils
 {
     public class NodeData
-    {
+    { 
         public string? Id { get; set; }
         public NodeType NodeType { get; set; }
-        
         public NodeItemGroupType ItemGroupType { get; set; }
         public ITreeNode? Parent { get; set; }
         public string? Text { get; set; }
diff --git a/RetroWarden/Views/CardDetailView.cs b/RetroWarden/Views/CardDetailView.cs
@@ -1,8 +1,8 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using Terminal.Gui;
-using RetrowardenSDK.Models;
 using Retrowarden.Utils;
+using RetrowardenSDK.Models;
+using Terminal.Gui;
 
 namespace Retrowarden.Views 
 {
@@ -30,7 +30,7 @@ public CardDetailView(VaultItem item, List<VaultFolder> folders, VaultItemDetail
             InitializeLists();
             
             // Base setup what kind of view state we are in.
-            if (_viewState == VaultItemDetailViewState.View || _viewState == VaultItemDetailViewState.Edit)
+            if (_viewState is VaultItemDetailViewState.View or VaultItemDetailViewState.Edit)
             {
                 // Load controls with current data only.
                 LoadView();
diff --git a/RetroWarden/Views/IdentityDetailView.cs b/RetroWarden/Views/IdentityDetailView.cs
@@ -1,8 +1,8 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using Terminal.Gui;
-using RetrowardenSDK.Models;
 using Retrowarden.Utils;
+using RetrowardenSDK.Models;
+using Terminal.Gui;
 
 namespace Retrowarden.Views 
 {
@@ -28,7 +28,7 @@ public IdentityDetailView(VaultItem item, List<VaultFolder> folders, VaultItemDe
             InitializeLists();
             
             // Base setup what kind of view state we are in.
-            if (_viewState == VaultItemDetailViewState.View || _viewState == VaultItemDetailViewState.Edit)
+            if (_viewState is VaultItemDetailViewState.View or VaultItemDetailViewState.Edit)
             {
                 // Load controls with current data only.
                 LoadView();
diff --git a/RetroWarden/Views/LoginDetailView.cs b/RetroWarden/Views/LoginDetailView.cs
@@ -1,11 +1,11 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using Terminal.Gui;
 using Retrowarden.Controls;
 using Retrowarden.Dialogs;
-using RetrowardenSDK.Models;
 using Retrowarden.Utils;
+using RetrowardenSDK.Models;
 using RetrowardenSDK.Repositories;
+using Terminal.Gui;
 
 namespace Retrowarden.Views 
 {
@@ -33,7 +33,7 @@ public LoginDetailView(VaultItem item, List<VaultFolder> folders, VaultItemDetai
             InitializeLists();
             
             // Base setup what kind of view state we are in.
-            if (_viewState == VaultItemDetailViewState.View || _viewState == VaultItemDetailViewState.Edit)
+            if (_viewState is VaultItemDetailViewState.View or VaultItemDetailViewState.Edit)
             {
                 // Load controls with current data only.
                 LoadView();
diff --git a/RetroWarden/Views/MainView.cs b/RetroWarden/Views/MainView.cs
@@ -647,7 +647,7 @@ private void GetCurrentOrgForNode(ITreeNode node)
             NodeData data = (NodeData) node.Tag;
             
             // Check to see the current node type.
-            if (data.NodeType != NodeType.Organization || data.NodeType != NodeType.Organization)
+            if (data.NodeType != NodeType.Organization)
             {
                 // Get the parent.
                 ITreeNode? parent = data.Parent;
diff --git a/RetroWarden/Views/SecureNoteDetailView.cs b/RetroWarden/Views/SecureNoteDetailView.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
-using Terminal.Gui;
 using RetrowardenSDK.Models;
+using Terminal.Gui;
 
 namespace Retrowarden.Views 
 {
@@ -18,7 +18,7 @@ public SecureNoteDetailView(VaultItem item, List<VaultFolder> folders, VaultItem
         private new void SetupView()
         {
             // Base setup what kind of view state we are in.
-            if (_viewState == VaultItemDetailViewState.View || _viewState == VaultItemDetailViewState.Edit)
+            if (_viewState is VaultItemDetailViewState.View or VaultItemDetailViewState.Edit)
             {
                 // Load controls with current data only.
                 LoadView();
diff --git a/RetroWarden/Workers/CreateFolderWorker.cs b/RetroWarden/Workers/CreateFolderWorker.cs
@@ -1,5 +1,5 @@
-using RetrowardenSDK.Repositories;
 using RetrowardenSDK.Models;
+using RetrowardenSDK.Repositories;
 
 namespace Retrowarden.Workers
 {
diff --git a/RetroWarden/Workers/GetCollectionsWorker.cs b/RetroWarden/Workers/GetCollectionsWorker.cs
@@ -1,5 +1,5 @@
-using RetrowardenSDK.Repositories;
 using RetrowardenSDK.Models;
+using RetrowardenSDK.Repositories;
 
 namespace Retrowarden.Workers;
 
diff --git a/RetroWarden/Workers/GetFoldersWorker.cs b/RetroWarden/Workers/GetFoldersWorker.cs
@@ -1,5 +1,5 @@
-using RetrowardenSDK.Repositories;
 using RetrowardenSDK.Models;
+using RetrowardenSDK.Repositories;
 
 namespace Retrowarden.Workers;
 
diff --git a/RetroWarden/Workers/GetItemsWorker.cs b/RetroWarden/Workers/GetItemsWorker.cs
@@ -1,5 +1,5 @@
-using RetrowardenSDK.Repositories;
 using RetrowardenSDK.Models;
+using RetrowardenSDK.Repositories;
 
 namespace Retrowarden.Workers;
 
diff --git a/RetroWarden/Workers/GetOrganizationsWorker.cs b/RetroWarden/Workers/GetOrganizationsWorker.cs
@@ -1,5 +1,5 @@
-using RetrowardenSDK.Repositories;
 using RetrowardenSDK.Models;
+using RetrowardenSDK.Repositories;
 
 namespace Retrowarden.Workers;
 
diff --git a/RetroWarden/Workers/RetrowardenWorker.cs b/RetroWarden/Workers/RetrowardenWorker.cs
@@ -1,6 +1,6 @@
-using RetrowardenSDK.Repositories;
-using Retrowarden.Dialogs;
 using System.ComponentModel;
+using Retrowarden.Dialogs;
+using RetrowardenSDK.Repositories;
 
 namespace Retrowarden.Workers
 {
diff --git a/RetroWarden/Workers/SaveItemWorker.cs b/RetroWarden/Workers/SaveItemWorker.cs
@@ -1,6 +1,7 @@
+using System.Text;
 using Newtonsoft.Json;
-using RetrowardenSDK.Repositories;
 using RetrowardenSDK.Models;
+using RetrowardenSDK.Repositories;
 
 namespace Retrowarden.Workers
 {
@@ -146,7 +147,7 @@ private void HandleItemOrgMove()
                     {
                         // Get encoded collection id string.
                         string itemJSON = JsonConvert.SerializeObject(item.CollectionIds);
-                        byte[] itemBytes = System.Text.Encoding.UTF8.GetBytes(itemJSON);
+                        byte[] itemBytes = Encoding.UTF8.GetBytes(itemJSON);
                         string encodedCollection = Convert.ToBase64String(itemBytes);
                         
                         // Check to see if values are present.
diff --git a/RetrowardenSDK/Repositories/DebugVaultRepository.cs b/RetrowardenSDK/Repositories/DebugVaultRepository.cs
@@ -1,11 +1,10 @@
-using RetrowardenSDK.Models;
 using Newtonsoft.Json;
+using RetrowardenSDK.Models;
 
 namespace RetrowardenSDK.Repositories;
 
 public sealed class DebugVaultRepository : IVaultRepository
 {
-        private string _response;
         private string _error;
         private bool _isLocked;
         private bool _isLoggedIn;
@@ -16,7 +15,6 @@ public sealed class DebugVaultRepository : IVaultRepository
         public DebugVaultRepository()
         {
             // Set defaults.
-            _response = "";
             _orgEnabled = false;
             _isLocked = true;
             _cmdExitCode = "0";
diff --git a/RetrowardenSDK/Repositories/IVaultRepository.cs b/RetrowardenSDK/Repositories/IVaultRepository.cs
@@ -1,6 +1,5 @@
 using RetrowardenSDK.Models;
 
-
 namespace RetrowardenSDK.Repositories
 {
     public interface IVaultRepository

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-using Microsoft.Extensions.Configuration;`
`2`	`1`	`using System.Text.Json;`
`3`	`2`	`using System.Text.Json.Serialization;`
	`3`	`+using Microsoft.Extensions.Configuration;`
`4`	`4`
`5`	`5`	`namespace Retrowarden.Config`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,12 @@`
`1`		`-namespace Retrowarden.Config;`
`2`		`-`
`3`		`-public sealed class RetrowardenConfig`
	`1`	`+namespace Retrowarden.Config`
`4`	`2`	`{`
`5`		`- public RetrowardenConfig(string? cliLocation = "")`
	`3`	`+ public sealed class RetrowardenConfig`
`6`	`4`	`{`
`7`		`- CLILocation = cliLocation;`
`8`		`- }`
	`5`	`+ public RetrowardenConfig(string? cliLocation = "")`
	`6`	`+ {`
	`7`	`+ CLILocation = cliLocation;`
	`8`	`+ }`
`9`	`9`
`10`		`- public string? CLILocation { get; set; }`
	`10`	`+ public string? CLILocation { get; set; }`
	`11`	`+ }`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System.Collections.ObjectModel;`
`2`		`-using Terminal.Gui;`
`3`		`-using RetrowardenSDK.Models;`
`4`	`2`	`using Retrowarden.Utils;`
	`3`	`+using RetrowardenSDK.Models;`
	`4`	`+using Terminal.Gui;`
`5`	`5`
`6`	`6`	`namespace Retrowarden.Controls`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`using System.Collections.ObjectModel;`
`2`	`2`	`using System.Diagnostics;`
`3`		`-using Terminal.Gui;`
`4`	`3`	`using Retrowarden.Utils;`
`5`	`4`	`using RetrowardenSDK.Models;`
	`5`	`+using Terminal.Gui;`
`6`	`6`
`7`	`7`	`namespace Retrowarden.Controls`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System.ComponentModel;`
`2`		`-using Terminal.Gui;`
`3`	`2`	`using RetrowardenSDK.Models;`
	`3`	`+using Terminal.Gui;`
`4`	`4`
`5`	`5`	`namespace Retrowarden.Dialogs`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`using RetrowardenSDK.Models;`
`4`	`4`	`using Terminal.Gui;`
`5`	`5`
`6`		`-`
`7`	`6`	`namespace Retrowarden.Dialogs`
`8`	`7`	`{`
`9`	`8`	`public sealed class SelectOrganizationAndCollectionDialog : BaseDialog`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-using Terminal.Gui;`
`2`	`1`	`using RetrowardenSDK.Models;`
	`2`	`+using Terminal.Gui;`
`3`	`3`
`4`	`4`	`namespace Retrowarden.Dialogs`
`5`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.Text;`
`4`	`4`	`using Terminal.Gui;`
`5`	`5`	`using RetrowardenSDK.Models;`
	`6`	`+`
`6`	`7`	`namespace Retrowarden.Utils`
`7`	`8`	`{`
`8`	`9`	`public class ItemListDataSource : IListDataSource`