Merge pull request #9 from mayuki/hotfix/FixTextUpdate

fix: If a text contains non-ASCII chars, some chars remain in a line.
mayuki · Jul 30, 2021 · 138ed86 · 138ed86
2 parents e20232e + a1ab5b4
commit 138ed86
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 4 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -19,7 +19,7 @@ jobs:
     - uses: actions/checkout@v1
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '3.1.x'
+        dotnet-version: '5.0.x'
 
     # Build
     - run: dotnet restore

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
 
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '3.1.x'
+        dotnet-version: '5.0.x'
 
     - name: "dotnet build & pack"
       run: |

diff --git a/Kurukuru.Sample/Kurukuru.Sample.csproj b/Kurukuru.Sample/Kurukuru.Sample.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Kurukuru\Kurukuru.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/Kurukuru.Sample/Program.cs b/Kurukuru.Sample/Program.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Kurukuru.Sample
+{
+    class Program
+    {
+        static async Task Main(string[] args)
+        {
+            System.Console.OutputEncoding = System.Text.Encoding.UTF8;
+
+            using (var spinner = new Spinner("Initializing...", Patterns.Dots12))
+            {
+                spinner.Start();
+                await Task.Delay(2000);
+                spinner.Succeed();
+            }
+
+            await Spinner.StartAsync("ユーザー Alice でログインを試みています…", async spinner =>
+            {
+                await Task.Delay(1000);
+                spinner.Text = "こんにちは Alice!";
+            });
+
+
+            await Spinner.StartAsync("Executing some heavy task...", async () =>
+            {
+                await Task.Delay(3000);
+                throw new Exception();
+            });
+
+        }
+    }
+}
diff --git a/Kurukuru.sln b/Kurukuru.sln
@@ -16,6 +16,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub Actions", "GitHub Ac
 		.github\workflows\release.yml = .github\workflows\release.yml
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kurukuru.Sample", "Kurukuru.Sample\Kurukuru.Sample.csproj", "{6ECE0EE4-88FC-4968-801F-FAFD4BCDE882}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -26,6 +28,10 @@ Global
 		{43150AB2-3041-4EC2-B17D-B8F6D3913561}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{43150AB2-3041-4EC2-B17D-B8F6D3913561}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{43150AB2-3041-4EC2-B17D-B8F6D3913561}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6ECE0EE4-88FC-4968-801F-FAFD4BCDE882}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6ECE0EE4-88FC-4968-801F-FAFD4BCDE882}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6ECE0EE4-88FC-4968-801F-FAFD4BCDE882}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6ECE0EE4-88FC-4968-801F-FAFD4BCDE882}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Kurukuru/ConsoleHelper.cs b/Kurukuru/ConsoleHelper.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Kurukuru
 {
@@ -36,7 +36,7 @@ public static void ClearCurrentConsoleLine(int length)
 
             int currentLineCursor = Console.CursorTop;
             Console.SetCursorPosition(0, Console.CursorTop);
-            Console.Write(new string(' ', length));
+            Console.Write(new string(' ', Console.WindowWidth));
             Console.SetCursorPosition(0, currentLineCursor);
             Console.Out.Flush();
         }