Merge pull request #47 from CatLib/feature/1.2.11

Feature/1.2.11

Author: 喵喵大人

src/CatLib.Core.NetStandard/CatLib.Core.NetStandard.csproj

@@ -121,6 +121,7 @@
     <Compile Include="..\CatLib.Core\Support\Util\Enum.cs" Link="Support\Util\Enum.cs" />
     <Compile Include="..\CatLib.Core\Support\Util\Extension\IntExtension.cs" Link="Support\Util\Extension\IntExtension.cs" />
     <Compile Include="..\CatLib.Core\Support\Util\Extension\StreamExtension.cs" Link="Support\Util\Extension\StreamExtension.cs" />
+    <Compile Include="..\CatLib.Core\Support\Util\Extension\StringExtension.cs" Link="Support\Util\Extension\StringExtension.cs" />
     <Compile Include="..\CatLib.Core\Support\Util\IAwait.cs" Link="Support\Util\IAwait.cs" />
     <Compile Include="..\CatLib.Core\Support\Util\Str.cs" Link="Support\Util\Str.cs" />
     <Compile Include="..\CatLib.Core\Support\Util\SystemTime.cs" Link="Support\Util\SystemTime.cs" />

src/CatLib.Core.Tests/CatLib.Core.Tests.csproj

@@ -60,6 +60,7 @@
     <Compile Include="Support\Util\DictTests.cs" />
     <Compile Include="Support\Util\EnumTests.cs" />
     <Compile Include="Support\Util\StreamExtensionTests.cs" />
+    <Compile Include="Support\Util\StringExtensionTests.cs" />
     <Compile Include="Support\Util\StrTests.cs" />
     <Compile Include="Support\Util\SystemTimeTests.cs" />
     <Compile Include="Support\VersionTests.cs" />

src/CatLib.Core.Tests/Properties/AssemblyInfo.cs

@@ -26,4 +26,4 @@
 [assembly: Guid("3c9f4024-910c-4881-a04d-34a6c3a09019")]
 
 [assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.10.0")]
+[assembly: AssemblyFileVersion("1.2.11.0")]

src/CatLib.Core.Tests/Support/Stream/PipelineStreamTests.cs

@@ -28,10 +28,10 @@ public void TestPipeline()
             stream = new PipelineStream(256);
             ThreadPool.QueueUserWorkItem(WriteThread);
 
-            var wrote = false;
-            stream.OnWrote += (_) =>
+            var readed = false;
+            stream.OnRead += (_) =>
             {
-                wrote = true;
+                readed = true;
             };
             var data = new byte[100];
             int read;
@@ -52,7 +52,7 @@ public void TestPipeline()
             }
 
             Assert.AreEqual(expected.ToString(), actual.ToString());
-            Assert.AreEqual(true, wrote);
+            Assert.AreEqual(true, readed);
         }
 
         public void WriteThread(object obj)
@@ -118,7 +118,6 @@ public void TestSeek()
         }
 
         [TestMethod]
-        [ExpectedException(typeof(NotSupportedException))]
         public void TestSetLength()
         {
             var stream = new PipelineStream(256);
@@ -134,19 +133,17 @@ public void TestSetPosition()
         }
 
         [TestMethod]
-        [ExpectedException(typeof(NotSupportedException))]
         public void TestGetPosition()
         {
             var stream = new PipelineStream(256);
-            var pos = stream.Position;
+            Assert.AreEqual(0, stream.Position);
         }
 
         [TestMethod]
-        [ExpectedException(typeof(NotSupportedException))]
         public void TestGetLength()
         {
             var stream = new PipelineStream(256);
-            var length = stream.Length;
+            Assert.AreEqual(0, stream.Length);
         }
     }
 }

src/CatLib.Core.Tests/Support/Util/StringExtensionTests.cs

@@ -0,0 +1,25 @@
+/*
+ * This file is part of the CatLib package.
+ *
+ * (c) Yu Bin <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * Document: http://catlib.io/
+ */
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace CatLib.Core.Tests.Support.Util
+{
+    [TestClass]
+    public class StringExtensionTests
+    {
+        [TestMethod]
+        public void TestToStream()
+        {
+            Assert.AreNotEqual(null, "hello world".ToStream());
+        } 
+    }
+}

src/CatLib.Core/CatLib.Core.csproj

@@ -103,6 +103,7 @@
     <Compile Include="Support\Util\Arr.cs" />
     <Compile Include="Support\Util\Enum.cs" />
     <Compile Include="Support\Util\Extension\IntExtension.cs" />
+    <Compile Include="Support\Util\Extension\StringExtension.cs" />
     <Compile Include="Support\Util\IAwait.cs" />
     <Compile Include="Support\Util\Str.cs" />
     <Compile Include="Support\Util\Extension\StreamExtension.cs" />

src/CatLib.Core/CatLib/Application.cs

@@ -23,7 +23,7 @@ public class Application : Container, IApplication, IOriginalDispatcher
         /// <summary>
         /// 版本号
         /// </summary>
-        private readonly Version version = new Version("1.2.10");
+        private readonly Version version = new Version("1.2.11");
 
         /// <summary>
         /// 框架启动流程

src/CatLib.Core/Properties/AssemblyInfo.cs

@@ -27,7 +27,7 @@
 [assembly: Guid("4204658e-81fd-4106-a347-890cd369c8a4")]
 
 [assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.10.0")]
+[assembly: AssemblyFileVersion("1.2.11.0")]
 
 [assembly: InternalsVisibleTo("Assembly-CSharp-Editor"),
            InternalsVisibleTo("Assembly-CSharp-Editor-firstpass"),

src/CatLib.Core/Support/Stream/PipelineStream.cs

@@ -42,9 +42,9 @@ public class PipelineStream : Stream
         private readonly RingBuffer ringBuffer;
 
         /// <summary>
-        /// 当写入完成后触发
+        /// 当完成读取后触发
         /// </summary>
-        public event Action<Stream> OnWrote;
+        public event Action<Stream> OnRead;
 
         /// <summary>
         /// 是否已经被释放了
@@ -56,11 +56,6 @@ public class PipelineStream : Stream
         /// </summary>
         private volatile bool closed;
 
-        /// <summary>
-        /// 总流量
-        /// </summary>
-        public long TotalFlow { get; private set; }
-
         /// <summary>
         /// 是否可以被读取
         /// </summary>
@@ -78,20 +73,30 @@ public override bool CanWrite
         }
 
         /// <summary>
-        /// 偏移位置（不支持）
+        /// 当前流的位置
+        /// </summary>
+        private long position;
+
+        /// <summary>
+        /// 流位置
         /// </summary>
         public override long Position
         {
-            get { throw new NotSupportedException(); }
+            get { return position; }
             set { throw new NotSupportedException(); }
         }
 
+        /// <summary>
+        /// 流的长度
+        /// </summary>
+        private long length;
+
         /// <summary>
         /// 流的长度
         /// </summary>
         public override long Length
         {
-            get { throw new NotSupportedException(); }
+            get { return length; }
         }
 
         /// <summary>
@@ -119,7 +124,6 @@ public PipelineStream(int capacity = 4096, int sleep = 1)
         {
             this.capacity = capacity.ToPrime();
             this.sleep = Math.Max(0, sleep);
-            TotalFlow = 0;
             ringBuffer = new RingBuffer(this.capacity, false);
         }
 
@@ -132,7 +136,7 @@ public PipelineStream(int capacity = 4096, int sleep = 1)
         }
 
         /// <summary>
-        /// 偏移位置（不支持）
+        /// 设定流位置（不支持）
         /// </summary>
         /// <param name="offset">偏移量</param>
         /// <param name="origin">偏移方向</param>
@@ -143,12 +147,12 @@ public override long Seek(long offset, SeekOrigin origin)
         }
 
         /// <summary>
-        /// 设定流的长度（不支持）
+        /// 设定流的长度
         /// </summary>
         /// <param name="value">长度</param>
         public override void SetLength(long value)
         {
-            throw new NotSupportedException();
+            length = Math.Max(0, value);
         }
 
         /// <summary>
@@ -198,7 +202,13 @@ public override int Read(byte[] buffer, int offset, int count)
                     {
                         var read = ringBuffer.Read(buffer, offset, count);
                         this.count -= read;
-                        TotalFlow += read;
+                        position += read;
+
+                        if (OnRead != null)
+                        {
+                            OnRead(this);
+                        }
+
                         return read;
                     }
                     finally
@@ -242,12 +252,6 @@ public override void Write(byte[] buffer, int offset, int count)
 
                     Guard.Requires<AssertException>(ringBuffer.Write(buffer, offset, count) == count);
                     this.count += count;
-
-                    if (OnWrote != null)
-                    {
-                        OnWrote(this);
-                    }
-
                     return;
                 }
             }

src/CatLib.Core/Support/Util/Extension/StreamExtension.cs

@@ -20,14 +20,6 @@ namespace CatLib
     /// </summary>
     public static class StreamExtension
     {
-        /// <summary>
-        /// 编码
-        /// </summary>
-        private static Encoding Encoding
-        {
-            get { return Encoding.UTF8; }
-        }
-
         /// <summary>
         /// 将当前流追加到目标流中
         /// </summary>
@@ -73,7 +65,7 @@ public static string ToText(this Stream source, Encoding encoding = null, bool c
         {
             try
             {
-                encoding = encoding ?? Encoding;
+                encoding = encoding ?? Util.Encoding;
                 if (source is MemoryStream)
                 {
                     var memoryStream = (MemoryStream) source;