From 0b1d513f50690e5336277984df5e3f4f45e5dc17 Mon Sep 17 00:00:00 2001
From: Michael Bucari-Tovo <mbucari1@gmail.com>
Date: Tue, 10 Aug 2021 00:18:43 -0600
Subject: [PATCH] Reorganized.

---
 LibationWinForms/Form1.cs | 70 +++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 36 deletions(-)

diff --git a/LibationWinForms/Form1.cs b/LibationWinForms/Form1.cs
index 10387143..b48abc32 100644
--- a/LibationWinForms/Form1.cs
+++ b/LibationWinForms/Form1.cs
@@ -337,6 +337,40 @@ namespace LibationWinForms
 
             scanLibraries(scanAccountsDialog.CheckedAccounts);
         }
+        private void removeThisAccountToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+            var firstAccount = persister.AccountsSettings.GetAll().FirstOrDefault();
+            scanLibrariesRemovedBooks(firstAccount);
+        }
+
+        private void removeAllAccountsToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+            var allAccounts = persister.AccountsSettings.GetAll();
+            scanLibrariesRemovedBooks(allAccounts.ToArray());
+        }
+
+        private void removeSomeAccountsToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            using var scanAccountsDialog = new ScanAccountsDialog(this);
+
+            if (scanAccountsDialog.ShowDialog() != DialogResult.OK)
+                return;
+
+            if (!scanAccountsDialog.CheckedAccounts.Any())
+                return;
+
+            scanLibrariesRemovedBooks(scanAccountsDialog.CheckedAccounts.ToArray());
+        }
+        private void scanLibrariesRemovedBooks(params Account[] accounts)
+        {
+            using var dialog = new RemoveBooksDialog(accounts);
+            dialog.ShowDialog();
+
+            if (dialog.BooksRemoved)
+                reloadGrid();
+        }
 
         private void scanLibraries(IEnumerable<Account> accounts) => scanLibraries(accounts.ToArray());
         private void scanLibraries(params Account[] accounts)
@@ -458,41 +492,5 @@ namespace LibationWinForms
 
         private void basicSettingsToolStripMenuItem_Click(object sender, EventArgs e) => new SettingsDialog().ShowDialog();
         #endregion
-
-
-        private void removeThisAccountToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-            var firstAccount = persister.AccountsSettings.GetAll().FirstOrDefault();
-            scanLibrariesRemovedBooks(firstAccount);
-        }
-
-        private void removeAllAccountsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-            var allAccounts = persister.AccountsSettings.GetAll();
-            scanLibrariesRemovedBooks(allAccounts.ToArray());
-        }
-
-        private void removeSomeAccountsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            using var scanAccountsDialog = new ScanAccountsDialog(this);
-
-            if (scanAccountsDialog.ShowDialog() != DialogResult.OK)
-                return;
-
-            if (!scanAccountsDialog.CheckedAccounts.Any())
-                return;
-
-            scanLibrariesRemovedBooks(scanAccountsDialog.CheckedAccounts.ToArray());
-        }
-        private void scanLibrariesRemovedBooks(params Account[] accounts)
-        {
-            using var dialog = new RemoveBooksDialog(accounts);
-            dialog.ShowDialog();
-
-            if (dialog.BooksRemoved)
-                reloadGrid();
-        }
     }
 }