wip

Author: shweaver-MSFT

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

@@ -282,12 +282,26 @@ 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);
             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 items = await targetFolder.GetItemsAsync();
 
@@ -301,13 +315,27 @@ public Task<bool> TryRenameItemAsync(string itemPath, string newName)
             });
         }
 
-        private Task<StorageFile> CreateFileAsync<T>(StorageFolder folder, string filePath, T value)
+        private async Task<StorageFile> CreateFileAsync<T>(StorageFolder folder, string filePath, T value)
         {
-            return StorageFileHelper.WriteTextToFileAsync(folder, this.Serializer.Serialize(value)?.ToString(), filePath, CreationCollisionOption.ReplaceExisting);
+            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);
         }
 
         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);
         }
 

UnitTests/UnitTests.UWP/Helpers/Test_ApplicationDataStorageHelper.cs

@@ -171,6 +171,81 @@ public void Test_StorageHelper_NewPersonTest()
             Assert.AreEqual(input.Age, output.Age);
         }
 
+        [TestCategory("Helpers")]
+        [TestMethod]
+        public async Task Test_StorageHelper_FileCRUDTest()
+        {
+            var fileName = "TestFile.txt";
+            var fileName2 = "TestFile2.txt";
+            var fileContents = "this is a test";
+            var fileContents2 = "this is also a test";
+            var storageHelper = ApplicationDataStorageHelper.GetCurrent();
+
+            // Create a file
+            await storageHelper.CreateFileAsync(fileName, fileContents);
+
+            // Read a file
+            var readContents = await storageHelper.ReadFileAsync<string>(fileName);
+            Assert.AreEqual(fileContents, readContents);
+
+            // Update a file
+            await storageHelper.CreateFileAsync(fileName, fileContents2);
+            var readContents2 = await storageHelper.ReadFileAsync<string>(fileName);
+            Assert.AreEqual(fileContents2, readContents2);
+
+            // Rename a file
+            var itemRenamed = await storageHelper.TryRenameItemAsync(fileName, fileName2);
+            Assert.IsTrue(itemRenamed);
+
+            // Delete a file
+            var itemDeleted = await storageHelper.TryDeleteItemAsync(fileName2);
+            Assert.IsTrue(itemDeleted);
+        }
+
+        [TestCategory("Helpers")]
+        [TestMethod]
+        public async Task Test_StorageHelper_SubFolderCRUDTest()
+        {
+            var folderName = "TestFolder";
+            var subFolderName = "TestSubFolder";
+            var subFolderName2 = "TestSubFolder2";
+            var subFolderPath = $"{folderName}/{subFolderName}";
+            var subFolderPath2 = $"{folderName}/{subFolderName2}";
+            var fileName = "TestFile.txt";
+            var filePath = $"{subFolderPath}/{fileName}";
+
+            var fileContents = "this is a test";
+            var storageHelper = ApplicationDataStorageHelper.GetCurrent();
+
+            // Create a folder
+            await storageHelper.CreateFolderAsync(folderName);
+
+            // Create a subfolder
+            await storageHelper.CreateFolderAsync(subFolderPath);
+
+            // Create a file in the subfolder
+            await storageHelper.CreateFileAsync(filePath, fileContents);
+
+            // Read a file from the subfolder
+            var readContents = await storageHelper.ReadFileAsync<string>(filePath);
+            Assert.AreEqual(fileContents, readContents);
+
+            // List subfolder contents
+            var folderItems = await storageHelper.ReadFolderAsync(subFolderPath);
+            var folderItemsList = folderItems.ToList();
+            Assert.AreEqual(1, folderItemsList.Count());
+            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);
+            Assert.IsTrue(itemRenamed);
+
+            // Delete a subfolder
+            var itemDeleted = await storageHelper.TryDeleteItemAsync(subFolderPath2);
+            Assert.IsTrue(itemDeleted);
+        }
+
         public class Person
         {
             public string Name { get; set; }