Fixes a bug that would throw PlatformNotSupportedException under net6 (…

…#186)
Tewr · Dec 26, 2021 · ce7eb63 · ce7eb63
1 parent 696c3bb
commit ce7eb63
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 1 deletion.
diff --git a/src/Blazor.FileReader/FileReaderJsInterop.InteropFileStream.cs b/src/Blazor.FileReader/FileReaderJsInterop.InteropFileStream.cs
@@ -55,6 +55,11 @@ public override void Flush()
             public override async Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
             {
                 ThrowIfDisposed();
+                if (Position >= length)
+                {
+                    return 0;
+                }
+
                 var bytesRead = await fileReaderJsInterop.ReadFileAsync(fileRef, buffer, Position, offset, count, cancellationToken);
                 Position += bytesRead;
                 return bytesRead;

diff --git a/src/Blazor.FileReader/FileReaderJsInterop.cs b/src/Blazor.FileReader/FileReaderJsInterop.cs
@@ -45,10 +45,13 @@ internal void Initialize()
                     UnmarshalledRuntime = new JSUnmarshalledRuntime(CurrentJSRuntime);
                 }
 #endif
+
+#if NET5 || NETSTANDARD20
                 if (UnmarshalledRuntime is null)
                 {
                     throw new PlatformNotSupportedException($"{nameof(_options.UseWasmSharedBuffer)}=true is not supported on this platform: Unable to acquire {nameof(IJSUnmarshalledRuntime)}.");
                 }
+#endif
             }
         }
 

diff --git a/src/Blazor.FileReader/Tewr.Blazor.FileReader.md b/src/Blazor.FileReader/Tewr.Blazor.FileReader.md
@@ -67,9 +67,13 @@
   - [CreateMemoryStreamAsync()](#M-Tewr-Blazor-FileReader-IFileReference-CreateMemoryStreamAsync-System-Threading-CancellationToken- 'Tewr.Blazor.FileReader.IFileReference.CreateMemoryStreamAsync(System.Threading.CancellationToken)')
   - [CreateMemoryStreamAsync()](#M-Tewr-Blazor-FileReader-IFileReference-CreateMemoryStreamAsync-System-Int32- 'Tewr.Blazor.FileReader.IFileReference.CreateMemoryStreamAsync(System.Int32)')
   - [CreateMemoryStreamAsync()](#M-Tewr-Blazor-FileReader-IFileReference-CreateMemoryStreamAsync-System-Int32,System-Threading-CancellationToken- 'Tewr.Blazor.FileReader.IFileReference.CreateMemoryStreamAsync(System.Int32,System.Threading.CancellationToken)')
+  - [GetJSObjectReferenceAsync()](#M-Tewr-Blazor-FileReader-IFileReference-GetJSObjectReferenceAsync 'Tewr.Blazor.FileReader.IFileReference.GetJSObjectReferenceAsync')
+  - [GetObjectUrlAsync()](#M-Tewr-Blazor-FileReader-IFileReference-GetObjectUrlAsync 'Tewr.Blazor.FileReader.IFileReference.GetObjectUrlAsync')
   - [OpenReadAsync()](#M-Tewr-Blazor-FileReader-IFileReference-OpenReadAsync 'Tewr.Blazor.FileReader.IFileReference.OpenReadAsync')
   - [OpenReadBase64Async()](#M-Tewr-Blazor-FileReader-IFileReference-OpenReadBase64Async 'Tewr.Blazor.FileReader.IFileReference.OpenReadBase64Async')
   - [ReadFileInfoAsync()](#M-Tewr-Blazor-FileReader-IFileReference-ReadFileInfoAsync 'Tewr.Blazor.FileReader.IFileReference.ReadFileInfoAsync')
+- [IObjectUrl](#T-Tewr-Blazor-FileReader-IObjectUrl 'Tewr.Blazor.FileReader.IObjectUrl')
+  - [Url](#P-Tewr-Blazor-FileReader-IObjectUrl-Url 'Tewr.Blazor.FileReader.IObjectUrl.Url')
 - [PasteEventOptions](#T-Tewr-Blazor-FileReader-DropEvents-PasteEventOptions 'Tewr.Blazor.FileReader.DropEvents.PasteEventOptions')
   - [Additive](#P-Tewr-Blazor-FileReader-DropEvents-PasteEventOptions-Additive 'Tewr.Blazor.FileReader.DropEvents.PasteEventOptions.Additive')
 - [PlatformConfig](#T-Tewr-Blazor-FileReader-PlatformConfig 'Tewr.Blazor.FileReader.PlatformConfig')
@@ -775,6 +779,36 @@ The length of the resulting [MemoryStream](http://msdn.microsoft.com/query/dev14
 
 A [MemoryStream](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.IO.MemoryStream 'System.IO.MemoryStream') representing the full file, with [Position](http://msdn.microsoft.com/query/dev14.query?appId=Dev14IDEF1&l=EN-US&k=k:System.IO.MemoryStream.Position 'System.IO.MemoryStream.Position') set to 0.
 
+##### Parameters
+
+This method has no parameters.
+
+<a name='M-Tewr-Blazor-FileReader-IFileReference-GetJSObjectReferenceAsync'></a>
+### GetJSObjectReferenceAsync() `method`
+
+##### Summary
+
+Returns the underlying file object as an [IJSObjectReference](#T-Microsoft-JSInterop-IJSObjectReference 'Microsoft.JSInterop.IJSObjectReference')
+
+##### Returns
+
+
+
+##### Parameters
+
+This method has no parameters.
+
+<a name='M-Tewr-Blazor-FileReader-IFileReference-GetObjectUrlAsync'></a>
+### GetObjectUrlAsync() `method`
+
+##### Summary
+
+Returns an object url for a file.
+
+##### Returns
+
+
+
 ##### Parameters
 
 This method has no parameters.
@@ -824,6 +858,28 @@ An object containing the file metadata
 
 This method has no parameters.
 
+<a name='T-Tewr-Blazor-FileReader-IObjectUrl'></a>
+## IObjectUrl `type`
+
+##### Namespace
+
+Tewr.Blazor.FileReader
+
+##### Summary
+
+Represents an object url for a file.
+
+##### Remarks
+
+https://developer.mozilla.org/en-US/docs/Web/API/URL/createObjectURL
+
+<a name='P-Tewr-Blazor-FileReader-IObjectUrl-Url'></a>
+### Url `property`
+
+##### Summary
+
+Returns the Object Url.
+
 <a name='T-Tewr-Blazor-FileReader-DropEvents-PasteEventOptions'></a>
 ## PasteEventOptions `type`
 

diff --git a/src/Blazor.FileReader/Tewr.Blazor.FileReader.xml b/src/Blazor.FileReader/Tewr.Blazor.FileReader.xml
diff --git a/src/Demo/Net6/Blazor.FileReader.Wasm.Demo/Program.cs b/src/Demo/Net6/Blazor.FileReader.Wasm.Demo/Program.cs
@@ -8,6 +8,6 @@
 builder.RootComponents.Add<HeadOutlet>("head::after");
 
 builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
-builder.Services.AddFileReaderService();
+builder.Services.AddFileReaderService(x => x.UseWasmSharedBuffer = true);
 
 await builder.Build().RunAsync();