refactoring changes

aayushpandya · Apr 4, 2023 · ff46f12 · ff46f12
1 parent 622594c
commit ff46f12
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 34 deletions.
diff --git a/src/Notepads/Core/BackupSessionUtility.cs b/src/Notepads/Core/BackupSessionUtility.cs
@@ -0,0 +1,31 @@
+namespace Notepads.Utilities
+{
+    using System;
+    using System.Collections.Concurrent;
+    using System.Collections.Generic;
+    using System.Threading.Tasks;
+    using Microsoft.Toolkit.Uwp.Helpers;
+    using Notepads.Core;
+    using Notepads.Services;
+    using Windows.Storage;
+    using Microsoft.AppCenter.Analytics;
+    internal static class BackupSessionUtility
+    {
+        public static async Task<StorageFolder> GetBackupFolderAsync(string backupFolderName)
+        {
+            return await FileSystemUtility.GetOrCreateAppFolder(backupFolderName);
+        }
+
+        public static async Task<IReadOnlyList<StorageFile>> GetAllBackupFilesAsync(string backupFolderName)
+        {
+            StorageFolder backupFolder = await GetBackupFolderAsync(backupFolderName);
+            return await backupFolder.GetFilesAsync();
+        }
+
+        public static async Task<StorageFile> CreateNewFileInBackupFolderAsync(string fileName, CreationCollisionOption collisionOption, string backupFolderName)
+        {
+            StorageFolder backupFolder = await GetBackupFolderAsync(backupFolderName);
+            return await backupFolder.CreateFileAsync(fileName, collisionOption);
+        }
+    }
+}
diff --git a/src/Notepads/Core/SessionManager.cs b/src/Notepads/Core/SessionManager.cs
@@ -273,7 +273,7 @@ private async Task<TextEditorSessionDataV1> BuildTextEditorSessionData(ITextEdit
                 if (textEditor.EditingFile != null)
                 {
                     // Persist the last save known to the app, which might not be up-to-date (if the file was modified outside the app)
-                    var lastSavedBackupFile = await SessionUtility.CreateNewFileInBackupFolderAsync(
+                    var lastSavedBackupFile = await BackupSessionUtility.CreateNewFileInBackupFolderAsync(
                         ToToken(textEditor.Id) + "-LastSaved",
                         CreationCollisionOption.ReplaceExisting,
                         _backupFolderName);
@@ -293,7 +293,7 @@ private async Task<TextEditorSessionDataV1> BuildTextEditorSessionData(ITextEdit
                     !string.Equals(textEditor.LastSavedSnapshot.Content, textEditor.GetText()))
                 {
                     // Persist pending changes relative to the last save
-                    var pendingBackupFile = await SessionUtility.CreateNewFileInBackupFolderAsync(
+                    var pendingBackupFile = await BackupSessionUtility.CreateNewFileInBackupFolderAsync(
                         ToToken(textEditor.Id) + "-Pending",
                         CreationCollisionOption.ReplaceExisting,
                         _backupFolderName);
@@ -470,7 +470,7 @@ private async Task DeleteOrphanedBackupFilesAsync(NotepadsSessionDataV1 sessionD
                 .Where(path => path != null)
                 .ToHashSet(StringComparer.OrdinalIgnoreCase);
 
-            foreach (StorageFile backupFile in await SessionUtility.GetAllBackupFilesAsync(_backupFolderName))
+            foreach (StorageFile backupFile in await BackupSessionUtility.GetAllBackupFilesAsync(_backupFolderName))
             {
                 if (!backupPaths.Contains(backupFile.Path))
                 {

diff --git a/src/Notepads/Notepads.csproj b/src/Notepads/Notepads.csproj
@@ -175,6 +175,7 @@
     <Compile Include="Controls\TextEditor\TextEditorCore.LineHighlighter.cs" />
     <Compile Include="Controls\TextEditor\TextEditorCore.LineNumbers.cs" />
     <Compile Include="Controls\TextEditor\TextEditorCore.MoveText.cs" />
+    <Compile Include="Core\BackupSessionUtility.cs" />
     <Compile Include="Extensions\DispatcherExtensions.cs" />
     <Compile Include="Extensions\ScrollViewerExtensions.cs" />
     <Compile Include="Utilities\FutureAccessListUtility.cs" />

diff --git a/src/Notepads/Services/MRUService.cs b/src/Notepads/Services/MRUService.cs
@@ -62,19 +62,5 @@ public static async Task<IList<IStorageItem>> Get(int top = 10)
             return items;
         }
 
-        public static void ClearAll()
-        {
-            try
-            {
-                Windows.Storage.AccessCache.StorageApplicationPermissions.MostRecentlyUsedList.Clear();
-            }
-            catch (Exception ex)
-            {
-                Analytics.TrackEvent("MRUService_FailedToClearMRU", new Dictionary<string, string>()
-                {
-                    { "Exception", ex.ToString() }
-                });
-            }
-        }
     }
 }
diff --git a/src/Notepads/Utilities/SessionUtility.cs b/src/Notepads/Utilities/SessionUtility.cs
@@ -45,17 +45,6 @@ public static ISessionManager GetSessionManager(INotepadsCore notepadCore, strin
             return sessionManager;
         }
 
-        public static async Task<StorageFolder> GetBackupFolderAsync(string backupFolderName)
-        {
-            return await FileSystemUtility.GetOrCreateAppFolder(backupFolderName);
-        }
-
-        public static async Task<IReadOnlyList<StorageFile>> GetAllBackupFilesAsync(string backupFolderName)
-        {
-            StorageFolder backupFolder = await GetBackupFolderAsync(backupFolderName);
-            return await backupFolder.GetFilesAsync();
-        }
-
         public static async Task<string> GetSerializedSessionMetaDataAsync(string sessionMetaDataFileName)
         {
             try
@@ -108,10 +97,7 @@ public static async Task DeleteSerializedSessionMetaDataAsync(string sessionMeta
             }
         }
 
-        public static async Task<StorageFile> CreateNewFileInBackupFolderAsync(string fileName, CreationCollisionOption collisionOption, string backupFolderName)
-        {
-            StorageFolder backupFolder = await GetBackupFolderAsync(backupFolderName);
-            return await backupFolder.CreateFileAsync(fileName, collisionOption);
-        }
+
     }
+
 }
diff --git a/src/Notepads/Views/MainPage/NotepadsMainPage.MainMenu.cs b/src/Notepads/Views/MainPage/NotepadsMainPage.MainMenu.cs
@@ -11,6 +11,8 @@
     using Windows.UI.Xaml.Controls.Primitives;
     using Windows.UI.Xaml.Media;
     using Notepads.Services;
+    using System;
+    using Microsoft.AppCenter.Analytics;
 
     public sealed partial class NotepadsMainPage
     {
@@ -156,7 +158,7 @@ private async Task BuildOpenRecentButtonSubItems()
 
                 clearRecentlyOpenedSubItem.Click += async (sender, args) =>
                 {
-                    MRUService.ClearAll();
+                    ClearAll();
                     await BuildOpenRecentButtonSubItems();
                 };
                 openRecentSubItem.Items?.Add(clearRecentlyOpenedSubItem);
@@ -169,5 +171,20 @@ private async Task BuildOpenRecentButtonSubItems()
                 MainMenuButtonFlyout.Items.Insert(indexToInsert, openRecentSubItem);
             }
         }
+        private static void ClearAll()
+        {
+            try
+            {
+                Windows.Storage.AccessCache.StorageApplicationPermissions.MostRecentlyUsedList.Clear();
+            }
+            catch (Exception ex)
+            {
+                Analytics.TrackEvent("MRUService_FailedToClearMRU", new Dictionary<string, string>()
+                {
+                    { "Exception", ex.ToString() }
+                });
+            }
+        }
     }
+
 }