Updated AppDataStorageHelper to better support items in sub-folders.

Author: shweaver-MSFT

Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Helpers;
@@ -282,27 +283,13 @@ public Task<bool> TryRenameItemAsync(string itemPath, string newName)
 
         private async Task<T?> ReadFileAsync<T>(StorageFolder folder, string filePath, T? @default = default)
         {
-            var dirName = System.IO.Path.GetDirectoryName(filePath);
-            if (!string.IsNullOrEmpty(dirName))
-            {
-                folder = await folder.GetFolderAsync(dirName);
-                filePath = System.IO.Path.GetFileName(filePath);
-            }
-
-            string value = await StorageFileHelper.ReadTextFromFileAsync(folder, filePath);
+            string value = await StorageFileHelper.ReadTextFromFileAsync(folder, NormalizePath(filePath));
             return (value != null) ? this.Serializer.Deserialize<T>(value) : @default;
         }
 
         private async Task<IEnumerable<(DirectoryItemType, string)>> ReadFolderAsync(StorageFolder folder, string folderPath)
         {
-            var dirName = System.IO.Path.GetDirectoryName(folderPath);
-            if (!string.IsNullOrEmpty(dirName))
-            {
-                folder = await folder.GetFolderAsync(dirName);
-                folderPath = System.IO.Path.GetFileName(folderPath);
-            }
-
-            var targetFolder = await folder.GetFolderAsync(folderPath);
+            var targetFolder = await folder.GetFolderAsync(NormalizePath(folderPath));
             var items = await targetFolder.GetItemsAsync();
 
             return items.Select((item) =>
@@ -317,33 +304,19 @@ public Task<bool> TryRenameItemAsync(string itemPath, string newName)
 
         private async Task<StorageFile> CreateFileAsync<T>(StorageFolder folder, string filePath, T value)
         {
-            var dirName = System.IO.Path.GetDirectoryName(filePath);
-            if (!string.IsNullOrEmpty(dirName))
-            {
-                folder = await folder.GetFolderAsync(dirName);
-                filePath = System.IO.Path.GetFileName(filePath);
-            }
-
-            return await StorageFileHelper.WriteTextToFileAsync(folder, this.Serializer.Serialize(value)?.ToString(), filePath, CreationCollisionOption.ReplaceExisting);
+            return await StorageFileHelper.WriteTextToFileAsync(folder, this.Serializer.Serialize(value)?.ToString(), NormalizePath(filePath), CreationCollisionOption.ReplaceExisting);
         }
 
         private async Task CreateFolderAsync(StorageFolder folder, string folderPath)
         {
-            var dirName = System.IO.Path.GetDirectoryName(folderPath);
-            if (!string.IsNullOrEmpty(dirName))
-            {
-                folder = await folder.GetFolderAsync(dirName);
-                folderPath = System.IO.Path.GetFileName(folderPath);
-            }
-
-            await folder.CreateFolderAsync(folderPath, CreationCollisionOption.OpenIfExists);
+            await folder.CreateFolderAsync(NormalizePath(folderPath), CreationCollisionOption.OpenIfExists);
         }
 
         private async Task<bool> TryDeleteItemAsync(StorageFolder folder, string itemPath)
         {
             try
             {
-                var item = await folder.GetItemAsync(itemPath);
+                var item = await folder.GetItemAsync(NormalizePath(itemPath));
                 await item.DeleteAsync();
                 return true;
             }
@@ -357,7 +330,7 @@ private async Task<bool> TryRenameItemAsync(StorageFolder folder, string itemPat
         {
             try
             {
-                var item = await folder.GetItemAsync(itemPath);
+                var item = await folder.GetItemAsync(NormalizePath(itemPath));
                 await item.RenameAsync(newName, NameCollisionOption.FailIfExists);
                 return true;
             }
@@ -366,5 +339,10 @@ private async Task<bool> TryRenameItemAsync(StorageFolder folder, string itemPat
                 return false;
             }
         }
+
+        private string NormalizePath(string path)
+        {
+            return Path.Combine(Path.GetDirectoryName(path), Path.GetFileName(path));
+        }
     }
 }

UnitTests/UnitTests.UWP/Helpers/Test_ApplicationDataStorageHelper.cs

@@ -206,19 +206,21 @@ public async Task Test_StorageHelper_FileCRUDTest()
         [TestMethod]
         public async Task Test_StorageHelper_SubFolderCRUDTest()
         {
-            var folderName = "TestFolder";
+            var folderName = "TestFolder1";
             var subFolderName = "TestSubFolder";
             var subFolderName2 = "TestSubFolder2";
             var subFolderPath = $"{folderName}/{subFolderName}";
             var subFolderPath2 = $"{folderName}/{subFolderName2}";
             var fileName = "TestFile.txt";
+            var fileName2 = "TestFile2.txt";
             var filePath = $"{subFolderPath}/{fileName}";
-
+            var filePath2 = $"{subFolderPath2}/{fileName2}";
             var fileContents = "this is a test";
+
             var storageHelper = ApplicationDataStorageHelper.GetCurrent();
 
-            // Create a folder
-            await storageHelper.CreateFolderAsync(folderName);
+            // Attempt to delete the folder to clean up from any previously failed test runs.
+            await storageHelper.TryDeleteItemAsync(folderName);
 
             // Create a subfolder
             await storageHelper.CreateFolderAsync(subFolderPath);
@@ -237,13 +239,25 @@ public async Task Test_StorageHelper_SubFolderCRUDTest()
             Assert.AreEqual(fileName, folderItemsList[0].Name);
             Assert.AreEqual(Microsoft.Toolkit.Helpers.DirectoryItemType.File, folderItemsList[0].ItemType);
 
-            // Rename a subfolder
-            var itemRenamed = await storageHelper.TryRenameItemAsync(subFolderPath, subFolderName2);
+            // Rename a file in a subfolder
+            var itemRenamed = await storageHelper.TryRenameItemAsync(filePath, fileName2);
             Assert.IsTrue(itemRenamed);
 
+            // Rename a subfolder
+            var folderRenamed = await storageHelper.TryRenameItemAsync(subFolderPath, subFolderName2);
+            Assert.IsTrue(folderRenamed);
+
+            // Delete a file in a subfolder
+            var fileDeleted = await storageHelper.TryDeleteItemAsync(filePath2);
+            Assert.IsTrue(fileDeleted);
+
             // Delete a subfolder
-            var itemDeleted = await storageHelper.TryDeleteItemAsync(subFolderPath2);
-            Assert.IsTrue(itemDeleted);
+            var subFolderDeleted = await storageHelper.TryDeleteItemAsync(subFolderPath2);
+            Assert.IsTrue(subFolderDeleted);
+
+            // Delete the folder to clean up.
+            var folderDeleted = await storageHelper.TryDeleteItemAsync(folderName);
+            Assert.IsTrue(folderDeleted);
         }
 
         public class Person