feat(storage): [Perf] allow direct access to the file stream from Fil…

…eIO when possible
unoplatform · Oct 9, 2020 · bc9540e · bc9540e
1 parent b7d58b6
commit bc9540e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Uno.UWP/Storage/StorageFile.Base.cs b/src/Uno.UWP/Storage/StorageFile.Base.cs
@@ -48,7 +48,7 @@ public bool IsEqual(IStorageItem item)
 			public abstract Task<IRandomAccessStreamWithContentType> Open(CancellationToken ct, FileAccessMode accessMode, StorageOpenOptions options);
 
 			public virtual async Task<Stream> OpenStream(CancellationToken ct, FileAccessMode accessMode, StorageOpenOptions options)
-				=> (await Open(ct, accessMode, options)).AsStream();
+				=> (await Open(ct, accessMode, options).AsTask(ct)).AsStream();
 
 			public abstract Task<StorageStreamTransaction> OpenTransactedWrite(CancellationToken ct, StorageOpenOptions option);
 

diff --git a/src/Uno.UWP/System.IO/WindowsRuntimeStorageExtensions.cs b/src/Uno.UWP/System.IO/WindowsRuntimeStorageExtensions.cs
@@ -30,8 +30,15 @@ public static async Task<Stream> OpenStreamForReadAsync(this IStorageFolder root
 
 		public static async Task<Stream> OpenStreamForWriteAsync(this IStorageFile windowsRuntimeFile)
 		{
-			var writeTransaction = await windowsRuntimeFile.OpenTransactedWriteAsync();
-			return writeTransaction.AsAutoCommitStream();
+			if (windowsRuntimeFile is StorageFile file)
+			{
+				return await file.OpenStream(CancellationToken.None, FileAccessMode.ReadWrite, StorageOpenOptions.None);
+			}
+			else
+			{
+				var writeTransaction = await windowsRuntimeFile.OpenTransactedWriteAsync();
+				return writeTransaction.AsAutoCommitStream();
+			}
 		}
 
 		public static async Task<Stream> OpenStreamForWriteAsync(this IStorageFolder rootDirectory, string relativePath, CreationCollisionOption creationCollisionOption)