Revert "PooledMemoryStream"

This reverts commit 3de49cdd08eebb48fc4996215f8e076bafb29737.

Masuit.Tools.Abstractions/Security/Encrypt.cs

@@ -37,7 +37,7 @@ namespace Masuit.Tools.Security
             using var cs = new CryptoStream(ms, des.CreateEncryptor(), CryptoStreamMode.Write);
             cs.Write(inputByteArray, 0, inputByteArray.Length);
             cs.FlushFinalBlock();
-            foreach (var b in ms)
+            foreach (byte b in ms.ToArray())
             {
                 ret.AppendFormat($"{b:X2}");
             }

Masuit.Tools.Abstractions/Systems/LargeMemoryStream.cs

@@ -33,10 +33,9 @@ public class LargeMemoryStream : Stream
     private int GetPageCount(long length)
     {
         int pageCount = (int)(length / PageSize) + 1;
-        if (length % PageSize == 0)
-        {
+
+        if ((length % PageSize) == 0)
             pageCount--;
-        }
 
         return pageCount;
     }
@@ -50,7 +49,7 @@ public class LargeMemoryStream : Stream
         else
         {
             var streamBuffers = new byte[_streamBuffers.Length + AllocStep][];
-            Buffer.BlockCopy(_streamBuffers, 0, streamBuffers, 0, _streamBuffers.Length);
+            Array.Copy(_streamBuffers, streamBuffers, _streamBuffers.Length);
             _streamBuffers = streamBuffers;
         }
 
@@ -59,16 +58,15 @@ public class LargeMemoryStream : Stream
 
     private void AllocSpaceIfNeeded(long value)
     {
-        switch (value)
-        {
-            case < 0:
-                throw new InvalidOperationException("AllocSpaceIfNeeded < 0");
-            case 0:
-                return;
-        }
+        if (value < 0)
+            throw new InvalidOperationException("AllocSpaceIfNeeded < 0");
+
+        if (value == 0)
+            return;
 
         int currentPageCount = GetPageCount(_allocatedBytes);
         int neededPageCount = GetPageCount(value);
+
         while (currentPageCount < neededPageCount)
         {
             if (currentPageCount == _pageCount)
@@ -140,6 +138,7 @@ public class LargeMemoryStream : Stream
         int currentOffset = (int)(_position % PageSize);
         int currentLength = PageSize - currentOffset;
         long startPosition = _position;
+
         if (startPosition + count > _length)
         {
             count = (int)(_length - startPosition);
@@ -152,7 +151,7 @@ public class LargeMemoryStream : Stream
                 currentLength = count;
             }
 
-            Buffer.BlockCopy(_streamBuffers[currentPage++], currentOffset, buffer, offset, currentLength);
+            Array.Copy(_streamBuffers[currentPage++], currentOffset, buffer, offset, currentLength);
             offset += currentLength;
             _position += currentLength;
             count -= currentLength;
@@ -201,6 +200,7 @@ public class LargeMemoryStream : Stream
 
         int currentPageCount = GetPageCount(_allocatedBytes);
         int neededPageCount = GetPageCount(value);
+
         while (currentPageCount > neededPageCount)
         {
             ArrayPool<byte>.Shared.Return(_streamBuffers[--currentPageCount], true);
@@ -228,7 +228,7 @@ public class LargeMemoryStream : Stream
                 currentLength = count;
             }
 
-            Buffer.BlockCopy(buffer, offset, _streamBuffers[currentPage++], currentOffset, currentLength);
+            Array.Copy(buffer, offset, _streamBuffers[currentPage++], currentOffset, currentLength);
             offset += currentLength;
             _position += currentLength;
             count -= currentLength;
@@ -245,6 +245,7 @@ public class LargeMemoryStream : Stream
             _isDisposed = true;
             Position = 0;
             _length = 0;
+
             if (_streamBuffers != null)
             {
                 foreach (var bytes in _streamBuffers)

Masuit.Tools.Abstractions/Systems/PooledMemoryStream.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Buffers;
-using System.Collections;
-using System.Collections.Generic;
 using System.IO;
 using System.Runtime.CompilerServices;
 
@@ -10,7 +8,7 @@ namespace Masuit.Tools.Systems;
 /// <summary>
 /// 池化内存流
 /// </summary>
-public sealed class PooledMemoryStream : Stream, IEnumerable<byte>
+public sealed class PooledMemoryStream : Stream
 {
     /// <summary>
     /// 终结器
@@ -33,7 +31,7 @@ public sealed class PooledMemoryStream : Stream, IEnumerable<byte>
 
     public PooledMemoryStream(byte[] buffer) : this(ArrayPool<byte>.Shared, buffer.Length)
     {
-        Buffer.BlockCopy(buffer, 0, _data, 0, buffer.Length);
+        Array.Copy(buffer, 0, _data, 0, buffer.Length);
     }
 
     public PooledMemoryStream(ArrayPool<byte> arrayPool, int capacity = 0)
@@ -78,16 +76,10 @@ public sealed class PooledMemoryStream : Stream, IEnumerable<byte>
         AssertNotDisposed();
     }
 
-    /// <summary>
-    /// 读取到字节数组
-    /// </summary>
-    /// <param name="buffer"></param>
-    /// <param name="offset"></param>
-    /// <param name="count"></param>
-    /// <returns></returns>
     public override int Read(byte[] buffer, int offset, int count)
     {
         AssertNotDisposed();
+
         if (count == 0)
         {
             return 0;
@@ -99,17 +91,11 @@ public sealed class PooledMemoryStream : Stream, IEnumerable<byte>
         return (int)available;
     }
 
-    /// <summary>
-    /// 改变游标位置
-    /// </summary>
-    /// <param name="offset"></param>
-    /// <param name="origin"></param>
-    /// <returns></returns>
-    /// <exception cref="ArgumentOutOfRangeException"></exception>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public override long Seek(long offset, SeekOrigin origin)
     {
         AssertNotDisposed();
+
         switch (origin)
         {
             case SeekOrigin.Current:
@@ -152,14 +138,10 @@ public sealed class PooledMemoryStream : Stream, IEnumerable<byte>
         }
     }
 
-    /// <summary>
-    /// 设置内容长度
-    /// </summary>
-    /// <param name="value"></param>
-    /// <exception cref="ArgumentOutOfRangeException"></exception>
     public override void SetLength(long value)
     {
         AssertNotDisposed();
+
         if (value < 0)
         {
             throw new ArgumentOutOfRangeException(nameof(value));
@@ -177,16 +159,11 @@ public sealed class PooledMemoryStream : Stream, IEnumerable<byte>
         }
     }
 
-    /// <summary>
-    /// 写入到字节数组
-    /// </summary>
-    /// <param name="buffer"></param>
-    /// <param name="offset"></param>
-    /// <param name="count"></param>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public override void Write(byte[] buffer, int offset, int count)
     {
         AssertNotDisposed();
+
         if (count == 0)
         {
             return;
@@ -197,16 +174,11 @@ public sealed class PooledMemoryStream : Stream, IEnumerable<byte>
             SetCapacity((int)(OverExpansionFactor * (Position + count)));
         }
 
-        Array.Copy(buffer, offset, _data, Position, count);
+        Buffer.BlockCopy(buffer, offset, _data, (int)Position, count);
         Position += count;
         _length = (int)Math.Max(Position, _length);
     }
 
-    /// <summary>
-    /// 写入到另一个流
-    /// </summary>
-    /// <param name="stream"></param>
-    /// <exception cref="ArgumentNullException"></exception>
     public void WriteTo(Stream stream)
     {
         if (stream == null)
@@ -218,36 +190,6 @@ public sealed class PooledMemoryStream : Stream, IEnumerable<byte>
         stream.Write(_data, 0, (int)Length);
     }
 
-    /// <summary>
-    /// 获取流的字节数组
-    /// </summary>
-    /// <returns></returns>
-    public byte[] GetBuffer()
-    {
-        AssertNotDisposed();
-        if (_data.Length == Length)
-        {
-            return _data;
-        }
-
-        var buffer = new byte[Length];
-        Buffer.BlockCopy(_data, 0, buffer, 0, buffer.Length);
-        return buffer;
-    }
-
-    /// <summary>
-    /// 获取流的字节数组
-    /// </summary>
-    /// <returns></returns>
-    public byte[] ToArray()
-    {
-        return GetBuffer();
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="disposing"></param>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     protected override void Dispose(bool disposing)
     {
@@ -270,9 +212,10 @@ public sealed class PooledMemoryStream : Stream, IEnumerable<byte>
     private void SetCapacity(int newCapacity)
     {
         var newData = _pool.Rent(newCapacity);
+
         if (_data != null)
         {
-            Array.Copy(_data, 0, newData, 0, Position);
+            Buffer.BlockCopy(_data, 0, newData, 0, (int)Position);
             _pool.Return(_data);
         }
 
@@ -287,23 +230,4 @@ public sealed class PooledMemoryStream : Stream, IEnumerable<byte>
             throw new ObjectDisposedException(nameof(PooledMemoryStream));
         }
     }
-
-    /// <summary>Returns an enumerator that iterates through a collection.</summary>
-    /// <returns>An <see cref="T:System.Collections.IEnumerator"></see> object that can be used to iterate through the collection.</returns>
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-        return GetEnumerator();
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <returns></returns>
-    public IEnumerator<byte> GetEnumerator()
-    {
-        for (var i = 0; i < Length; i++)
-        {
-            yield return _data[i];
-        }
-    }
 }

NetCoreTest/Program.cs

@@ -1,8 +1,29 @@
-using Masuit.Tools.Systems;
+using Masuit.Tools.AspNetCore.ModelBinder;
+using Masuit.Tools.Files;
+using Masuit.Tools.Media;
 
-var ms = new PooledMemoryStream();
-ms.Write(new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8 }, 0, 9);
-foreach (var b in ms)
+var stream = File.Open(@"D:\images\QQ½Øͼ20190923195408.jpg", FileMode.Open, FileAccess.ReadWrite);
+var watermarker = new ImageWatermarker(stream);
+var ms = watermarker.AddWatermark(File.OpenRead(@"D:\images\QQ½Øͼ20190923195408_¿´Í¼Íõ.png"), 0.5f);
+ms.SaveFile(@"Y:\1.jpg");
+Console.WriteLine(1);
+Console.ReadKey();
+
+var builder = WebApplication.CreateBuilder(args);
+builder.Services.AddControllers(options => options.ModelBinderProviders.InsertBodyOrDefaultBinding());
+builder.Services.AddEndpointsApiExplorer();
+builder.Services.AddSwaggerGen();
+
+var app = builder.Build();
+
+if (app.Environment.IsDevelopment())
 {
-    Console.WriteLine(b);
-}
+    app.UseSwagger();
+    app.UseSwaggerUI();
+}
+
+app.UseAuthorization();
+
+app.MapControllers();
+
+app.Run();