Remove CopyToAsync from IImageStream

d2dyno1 · d2dyno1 · commit accb60ffe4b2 · 2026-04-03T19:43:43.000+02:00
diff --git a/src/Platforms/SecureFolderFS.Maui/AppModels/ImageStream.cs b/src/Platforms/SecureFolderFS.Maui/AppModels/ImageStream.cs
diff --git a/src/Platforms/SecureFolderFS.Maui/AppModels/ImageStreamSource.cs b/src/Platforms/SecureFolderFS.Maui/AppModels/ImageStreamSource.cs
@@ -0,0 +1,33 @@
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Storage.Streams;
+
+namespace SecureFolderFS.Maui.AppModels
+{
+    /// <inheritdoc cref="IImageStream"/>
+    internal sealed class ImageStreamSource : IImageStream
+    {
+        /// <summary>
+        /// Gets the streamed image source.
+        /// </summary>
+        public StreamImageSource Source { get; }
+
+        /// <inheritdoc/>
+        public Stream Inner { get; }
+
+        public ImageStreamSource(Stream inner)
+        {
+            Inner = inner;
+            Source = new();
+            Source.Stream = _ => Task.FromResult(inner);
+        }
+
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            if (Inner is NonDisposableStream nonDisposableStream)
+                nonDisposableStream.ForceClose();
+            else
+                Inner.Dispose();
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/Platforms/Android/ServiceImplementation/AndroidMediaService.cs b/src/Platforms/SecureFolderFS.Maui/Platforms/Android/ServiceImplementation/AndroidMediaService.cs
@@ -28,15 +28,15 @@ public override async Task<IImageStream> GenerateThumbnailAsync(IFile file, Type
                     await using var stream = await file.OpenReadAsync(cancellationToken).ConfigureAwait(false);
                     var imageStream = await ThumbnailHelpers.GenerateImageThumbnailAsync(stream, Constants.Browser.IMAGE_THUMBNAIL_MAX_SIZE).ConfigureAwait(false);
 
-                    return new ImageStream(imageStream);
+                    return new ImageStreamSource(imageStream);
                 }
 
                 case TypeHint.Media:
                 {
                     await using var stream = await file.OpenReadAsync(cancellationToken).ConfigureAwait(false);
                     var imageStream = await GenerateVideoThumbnailAsync(stream, TimeSpan.FromSeconds(0)).ConfigureAwait(false);
 
-                    return new ImageStream(imageStream);
+                    return new ImageStreamSource(imageStream);
                 }
 
                 default: throw new InvalidOperationException("The provided file type is invalid.");
diff --git a/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/ServiceImplementation/IOSMediaService.cs b/src/Platforms/SecureFolderFS.Maui/Platforms/iOS/ServiceImplementation/IOSMediaService.cs
@@ -77,7 +77,7 @@ private static async Task<IImageStream> GenerateImageThumbnailAsync(Stream strea
             await jpegData.AsStream().CopyToAsync(memoryStream).ConfigureAwait(false);
             memoryStream.Position = 0L;
 
-            return new ImageStream(new NonDisposableStream(memoryStream));
+            return new ImageStreamSource(new NonDisposableStream(memoryStream));
         }
 
         private static async Task<IImageStream> GenerateVideoThumbnailAsync(Stream stream, string extension, TimeSpan captureTime)
@@ -132,7 +132,7 @@ private static async Task<IImageStream> GenerateVideoThumbnailAsync(Stream strea
                 await jpegData.AsStream().CopyToAsync(memoryStream).ConfigureAwait(false);
                 memoryStream.Position = 0L;
 
-                return new ImageStream(new NonDisposableStream(memoryStream));
+                return new ImageStreamSource(new NonDisposableStream(memoryStream));
             }
             finally
             {
diff --git a/src/Platforms/SecureFolderFS.Maui/ServiceImplementation/BaseMauiMediaService.cs b/src/Platforms/SecureFolderFS.Maui/ServiceImplementation/BaseMauiMediaService.cs
@@ -51,7 +51,7 @@ public virtual Task<IImage> GetImageFromUrlAsync(string url, CancellationToken c
         public virtual async Task<IImage> ReadImageFileAsync(IFile file, CancellationToken cancellationToken)
         {
             var stream = await file.OpenStreamAsync(FileAccess.Read, FileShare.Read, cancellationToken);
-            return new ImageStream(stream);
+            return new ImageStreamSource(stream);
         }
 
         /// <inheritdoc/>
diff --git a/src/Platforms/SecureFolderFS.Maui/ValueConverters/FileIconConverter.cs b/src/Platforms/SecureFolderFS.Maui/ValueConverters/FileIconConverter.cs
@@ -47,24 +47,24 @@ internal sealed class FileIconConverter : IValueConverter
             {
                 switch (image)
                 {
-                    case StreamImageModel { Stream.CanRead: true } streamImageModel:
+                    case StreamImageModel { Inner.CanRead: true } streamImageModel:
                     {
-                        streamImageModel.Stream.TrySetPositionOrAdvance(0L);
+                        streamImageModel.Inner.TrySetPositionOrAdvance(0L);
                         return new Image()
                         {
                             Source = new StreamImageSource()
                             {
-                                Stream = _ => Task.FromResult(streamImageModel.Stream)
+                                Stream = _ => Task.FromResult(streamImageModel.Inner)
                             },
                             Aspect = Aspect.AspectFill,
                             HorizontalOptions = LayoutOptions.Fill,
                             VerticalOptions = LayoutOptions.Fill
                         };
                     }
 
-                    case ImageStream { Stream.CanRead: true } imageStream:
+                    case ImageStreamSource { Inner.CanRead: true } imageStream:
                     {
-                        imageStream.Stream.TrySetPositionOrAdvance(0L);
+                        imageStream.Inner.TrySetPositionOrAdvance(0L);
                         return new Image()
                         {
                             Source = imageStream.Source,
diff --git a/src/Platforms/SecureFolderFS.Maui/ValueConverters/ImageToSourceConverter.cs b/src/Platforms/SecureFolderFS.Maui/ValueConverters/ImageToSourceConverter.cs
@@ -14,7 +14,7 @@ internal sealed class ImageToSourceConverter : IValueConverter
         {
             return value switch
             {
-                ImageStream imageStream => imageStream.Source,
+                ImageStreamSource imageStream => imageStream.Source,
                 ImageIcon iconImage => new FontImageSource()
                 {
                     Glyph = GetDescription(iconImage.MauiIcon.Icon),
diff --git a/src/Platforms/SecureFolderFS.Uno/ValueConverters/ImageToSourceConverter.cs b/src/Platforms/SecureFolderFS.Uno/ValueConverters/ImageToSourceConverter.cs
@@ -15,7 +15,7 @@ public sealed class ImageToSourceConverter : IValueConverter
             return value switch
             {
                 ImageBitmap imageBitmap => imageBitmap.Source,
-                StreamImageModel imageStream => StreamToImageSource(imageStream.Stream),
+                StreamImageModel imageStream => StreamToImageSource(imageStream.Inner),
                 ImageResource resourceImage => new BitmapImage(resourceImage.IsResource
                     ? new Uri($"ms-appx:///{resourceImage.Name}")
                     : new Uri(resourceImage.Name)),
diff --git a/src/Sdk/SecureFolderFS.Sdk/AppModels/ThumbnailCacheModel.cs b/src/Sdk/SecureFolderFS.Sdk/AppModels/ThumbnailCacheModel.cs
@@ -56,7 +56,7 @@ public ThumbnailCacheModel(int maxEntries)
                 if (cachedData is null || cachedData.Length == 0)
                     return null;
 
-                return new MemoryStream(cachedData);
+                return new MemoryStream(cachedData, writable: false);
             }
             catch
             {
@@ -77,9 +77,13 @@ public async Task CacheThumbnailAsync(string cacheKey, IImageStream thumbnailStr
             try
             {
                 // Copy thumbnail to byte array
-                using var memoryStream = new MemoryStream();
-                await thumbnailStream.CopyToAsync(memoryStream, cancellationToken);
-                var data = memoryStream.ToArray();
+                var data = new byte[thumbnailStream.Inner.Length];
+                var savedPosition = thumbnailStream.Inner.Position;
+                thumbnailStream.Inner.Position = 0L;
+                var read = await thumbnailStream.Inner.ReadAsync(data, cancellationToken);
+                thumbnailStream.Inner.Position = savedPosition;
+                if (read != data.Length)
+                    return;
 
                 await _database.SetValueAsync(cacheKey, data, cancellationToken);
             }
diff --git a/src/Shared/SecureFolderFS.Shared/ComponentModel/IImageStream.cs b/src/Shared/SecureFolderFS.Shared/ComponentModel/IImageStream.cs
@@ -1,11 +1,11 @@
 using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace SecureFolderFS.Shared.ComponentModel
 {
-    public interface IImageStream : IImage
+    /// <summary>
+    /// Represents an image that can be read from a <see cref="Stream"/>.
+    /// </summary>
+    public interface IImageStream : IImage, IWrapper<Stream>
     {
-        Task CopyToAsync(Stream destination, CancellationToken cancellationToken = default);
     }
 }
diff --git a/src/Shared/SecureFolderFS.Shared/Models/StreamImageModel.cs b/src/Shared/SecureFolderFS.Shared/Models/StreamImageModel.cs
@@ -1,43 +1,27 @@
 using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
 using SecureFolderFS.Shared.ComponentModel;
 
 namespace SecureFolderFS.Shared.Models
 {
-    /// <summary>
-    /// A simple implementation of <see cref="IImageStream"/> that wraps a <see cref="System.IO.Stream"/>.
-    /// </summary>
+    /// <inheritdoc cref="IImageStream"/>
     public sealed class StreamImageModel : IImageStream
     {
-        /// <summary>
-        /// Gets the stream containing image data.
-        /// </summary>
-        public Stream Stream { get; }
+        /// <inheritdoc/>
+        public Stream Inner { get; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="StreamImageModel"/> class.
         /// </summary>
-        /// <param name="stream">The stream containing image data.</param>
-        public StreamImageModel(Stream stream)
-        {
-            Stream = stream;
-        }
-
-        /// <inheritdoc/>
-        public async Task CopyToAsync(Stream destination, CancellationToken cancellationToken = default)
+        /// <param name="inner">The stream containing image data.</param>
+        public StreamImageModel(Stream inner)
         {
-            var savedPosition = Stream.Position;
-            await Stream.CopyToAsync(destination, cancellationToken);
-
-            if (Stream.CanSeek)
-                Stream.Position = savedPosition;
+            Inner = inner;
         }
 
         /// <inheritdoc/>
         public void Dispose()
         {
-            Stream.Dispose();
+            Inner.Dispose();
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -28,15 +28,15 @@ public override async Task<IImageStream> GenerateThumbnailAsync(IFile file, Type`
`28`	`28`	`await using var stream = await file.OpenReadAsync(cancellationToken).ConfigureAwait(false);`
`29`	`29`	`var imageStream = await ThumbnailHelpers.GenerateImageThumbnailAsync(stream, Constants.Browser.IMAGE_THUMBNAIL_MAX_SIZE).ConfigureAwait(false);`
`30`	`30`
`31`		`- return new ImageStream(imageStream);`
	`31`	`+ return new ImageStreamSource(imageStream);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`case TypeHint.Media:`
`35`	`35`	`{`
`36`	`36`	`await using var stream = await file.OpenReadAsync(cancellationToken).ConfigureAwait(false);`
`37`	`37`	`var imageStream = await GenerateVideoThumbnailAsync(stream, TimeSpan.FromSeconds(0)).ConfigureAwait(false);`
`38`	`38`
`39`		`- return new ImageStream(imageStream);`
	`39`	`+ return new ImageStreamSource(imageStream);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`default: throw new InvalidOperationException("The provided file type is invalid.");`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ private static async Task<IImageStream> GenerateImageThumbnailAsync(Stream strea`
`77`	`77`	`await jpegData.AsStream().CopyToAsync(memoryStream).ConfigureAwait(false);`
`78`	`78`	`memoryStream.Position = 0L;`
`79`	`79`
`80`		`- return new ImageStream(new NonDisposableStream(memoryStream));`
	`80`	`+ return new ImageStreamSource(new NonDisposableStream(memoryStream));`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`private static async Task<IImageStream> GenerateVideoThumbnailAsync(Stream stream, string extension, TimeSpan captureTime)`
`@@ -132,7 +132,7 @@ private static async Task<IImageStream> GenerateVideoThumbnailAsync(Stream strea`
`132`	`132`	`await jpegData.AsStream().CopyToAsync(memoryStream).ConfigureAwait(false);`
`133`	`133`	`memoryStream.Position = 0L;`
`134`	`134`
`135`		`- return new ImageStream(new NonDisposableStream(memoryStream));`
	`135`	`+ return new ImageStreamSource(new NonDisposableStream(memoryStream));`
`136`	`136`	`}`
`137`	`137`	`finally`
`138`	`138`	`{`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public virtual Task<IImage> GetImageFromUrlAsync(string url, CancellationToken c`
`51`	`51`	`public virtual async Task<IImage> ReadImageFileAsync(IFile file, CancellationToken cancellationToken)`
`52`	`52`	`{`
`53`	`53`	`var stream = await file.OpenStreamAsync(FileAccess.Read, FileShare.Read, cancellationToken);`
`54`		`- return new ImageStream(stream);`
	`54`	`+ return new ImageStreamSource(stream);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/// <inheritdoc/>`
Original file line number	Diff line number	Diff line change
`@@ -47,24 +47,24 @@ internal sealed class FileIconConverter : IValueConverter`
`47`	`47`	`{`
`48`	`48`	`switch (image)`
`49`	`49`	`{`
`50`		`- case StreamImageModel { Stream.CanRead: true } streamImageModel:`
	`50`	`+ case StreamImageModel { Inner.CanRead: true } streamImageModel:`
`51`	`51`	`{`
`52`		`- streamImageModel.Stream.TrySetPositionOrAdvance(0L);`
	`52`	`+ streamImageModel.Inner.TrySetPositionOrAdvance(0L);`
`53`	`53`	`return new Image()`
`54`	`54`	`{`
`55`	`55`	`Source = new StreamImageSource()`
`56`	`56`	`{`
`57`		`- Stream = _ => Task.FromResult(streamImageModel.Stream)`
	`57`	`+ Stream = _ => Task.FromResult(streamImageModel.Inner)`
`58`	`58`	`},`
`59`	`59`	`Aspect = Aspect.AspectFill,`
`60`	`60`	`HorizontalOptions = LayoutOptions.Fill,`
`61`	`61`	`VerticalOptions = LayoutOptions.Fill`
`62`	`62`	`};`
`63`	`63`	`}`
`64`	`64`
`65`		`- case ImageStream { Stream.CanRead: true } imageStream:`
	`65`	`+ case ImageStreamSource { Inner.CanRead: true } imageStream:`
`66`	`66`	`{`
`67`		`- imageStream.Stream.TrySetPositionOrAdvance(0L);`
	`67`	`+ imageStream.Inner.TrySetPositionOrAdvance(0L);`
`68`	`68`	`return new Image()`
`69`	`69`	`{`
`70`	`70`	`Source = imageStream.Source,`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ internal sealed class ImageToSourceConverter : IValueConverter`
`14`	`14`	`{`
`15`	`15`	`return value switch`
`16`	`16`	`{`
`17`		`- ImageStream imageStream => imageStream.Source,`
	`17`	`+ ImageStreamSource imageStream => imageStream.Source,`
`18`	`18`	`ImageIcon iconImage => new FontImageSource()`
`19`	`19`	`{`
`20`	`20`	`Glyph = GetDescription(iconImage.MauiIcon.Icon),`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public sealed class ImageToSourceConverter : IValueConverter`
`15`	`15`	`return value switch`
`16`	`16`	`{`
`17`	`17`	`ImageBitmap imageBitmap => imageBitmap.Source,`
`18`		`- StreamImageModel imageStream => StreamToImageSource(imageStream.Stream),`
	`18`	`+ StreamImageModel imageStream => StreamToImageSource(imageStream.Inner),`
`19`	`19`	`ImageResource resourceImage => new BitmapImage(resourceImage.IsResource`
`20`	`20`	`? new Uri($"ms-appx:///{resourceImage.Name}")`
`21`	`21`	`: new Uri(resourceImage.Name)),`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public ThumbnailCacheModel(int maxEntries)`
`56`	`56`	`if (cachedData is null \|\| cachedData.Length == 0)`
`57`	`57`	`return null;`
`58`	`58`
`59`		`- return new MemoryStream(cachedData);`
	`59`	`+ return new MemoryStream(cachedData, writable: false);`
`60`	`60`	`}`
`61`	`61`	`catch`
`62`	`62`	`{`
`@@ -77,9 +77,13 @@ public async Task CacheThumbnailAsync(string cacheKey, IImageStream thumbnailStr`
`77`	`77`	`try`
`78`	`78`	`{`
`79`	`79`	`// Copy thumbnail to byte array`
`80`		`- using var memoryStream = new MemoryStream();`
`81`		`- await thumbnailStream.CopyToAsync(memoryStream, cancellationToken);`
`82`		`- var data = memoryStream.ToArray();`
	`80`	`+ var data = new byte[thumbnailStream.Inner.Length];`
	`81`	`+ var savedPosition = thumbnailStream.Inner.Position;`
	`82`	`+ thumbnailStream.Inner.Position = 0L;`
	`83`	`+ var read = await thumbnailStream.Inner.ReadAsync(data, cancellationToken);`
	`84`	`+ thumbnailStream.Inner.Position = savedPosition;`
	`85`	`+ if (read != data.Length)`
	`86`	`+ return;`
`83`	`87`
`84`	`88`	`await _database.SetValueAsync(cacheKey, data, cancellationToken);`
`85`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`using System.IO;`
`2`		`-using System.Threading;`
`3`		`-using System.Threading.Tasks;`
`4`	`2`
`5`	`3`	`namespace SecureFolderFS.Shared.ComponentModel`
`6`	`4`	`{`
`7`		`- public interface IImageStream : IImage`
	`5`	`+ /// <summary>`
	`6`	`+ /// Represents an image that can be read from a <see cref="Stream"/>.`
	`7`	`+ /// </summary>`
	`8`	`+ public interface IImageStream : IImage, IWrapper<Stream>`
`8`	`9`	`{`
`9`		`- Task CopyToAsync(Stream destination, CancellationToken cancellationToken = default);`
`10`	`10`	`}`
`11`	`11`	`}`