fix: lines with asian chars sometimes not rendered in live progress mode

Author: fiso64

Sockseek.Cli.Tests/ProgressReporterTests.cs

@@ -99,6 +99,20 @@ public void EventLogger_LiveMode_RoutesActivityLogsToNonConsoleOnly()
         StringAssert.StartsWith(sinkMessages[0], @"[jobs] [9] SongJob: downloading: Artist - Song: user\Music\Artist\Song.flac");
     }
 
+    [TestMethod]
+    public void TerminalLiveRenderer_WrapsWideUnicodeByCellWidth()
+    {
+        var text = "failed [No suitable file found]: サン";
+
+        Assert.IsTrue(TerminalLiveRenderer.CellCount(text) > text.Length,
+            "Japanese kana should count wider than one terminal cell per UTF-16 char.");
+
+        var wrapped = TerminalLiveRenderer.WrapContentForWidth(text, text.Length + 1);
+
+        Assert.IsTrue(wrapped.Count > 1,
+            "Live log wrapping must use terminal cell width, not string.Length, so wide Unicode does not wrap underneath Spectre.Live.");
+    }
+
     [TestMethod]
     public void EventLogger_NoProgressMode_RoutesActivityLogsToConsoleAndNonConsole()
     {

Sockseek.Cli/Utilities/TerminalRendering.cs

@@ -1,4 +1,6 @@
 using System.Collections.Concurrent;
+using System.Globalization;
+using System.Text;
 using Spectre.Console;
 using Spectre.Console.Rendering;
 
@@ -291,7 +293,7 @@ private void FlushLogs()
             {
                 _printedLogHistory.Add(new PrintedLogLine.Structured(line));
                 var markup = FormatLogMarkup(line);
-                var visualLength = Markup.Remove(markup).Length;
+                var visualLength = CellCount(Markup.Remove(markup));
                 int width = LogLineWidth();
                 if (markup.Contains('\n') || (!Console.IsOutputRedirected && visualLength >= width))
                 {
@@ -328,7 +330,7 @@ private void ReplayPrintedLogHistory()
     private static void WriteStructuredLogLine(TerminalLogLine line)
     {
         var markup = FormatLogMarkup(line);
-        var visualLength = Markup.Remove(markup).Length;
+        var visualLength = CellCount(Markup.Remove(markup));
         int width = LogLineWidth();
         if (markup.Contains('\n') || (!Console.IsOutputRedirected && visualLength >= width))
         {
@@ -345,7 +347,7 @@ private static void WritePlainLogLines(string text)
         foreach (var line in normalized.Split('\n'))
         {
             foreach (var visualLine in WrapPlainLogLine(line))
-                AnsiConsole.WriteLine(visualLine + PaddingFor(visualLine.Length));
+                AnsiConsole.WriteLine(visualLine + PaddingFor(CellCount(visualLine)));
         }
     }
 
@@ -388,7 +390,7 @@ void WriteWrappedMarkupContent(
             string contPrefixText = continuationPrefixText ?? continuationPrefix;
             string contPrefixMarkup = Markup.Escape(contPrefixText);
 
-            int lineWidth = LogLineWidth() - firstPrefixText.Length;
+            int lineWidth = LogLineWidth() - CellCount(firstPrefixText);
             var chunks = WrapContent(content, lineWidth).ToList();
 
             for (int i = 0; i < chunks.Count; i++)
@@ -399,7 +401,7 @@ void WriteWrappedMarkupContent(
                 var prefixMarkupForChunk = isFirst ? firstPrefixMarkup : contPrefixMarkup;
 
                 string contentMarkup = (isFirst ? first : continuation)(chunk);
-                AnsiConsole.MarkupLine(prefixMarkupForChunk + contentMarkup + PaddingFor(prefixTextForChunk.Length + chunk.Length));
+                AnsiConsole.MarkupLine(prefixMarkupForChunk + contentMarkup + PaddingFor(CellCount(prefixTextForChunk) + CellCount(chunk)));
             }
         }
     }
@@ -421,13 +423,34 @@ private static IEnumerable<string> WrapContent(string content, int availableWidt
         if (Console.IsOutputRedirected)
             return [content];
 
+        return WrapContentByCellWidth(content, availableWidth);
+    }
+
+    private static IEnumerable<string> WrapContentByCellWidth(string content, int availableWidth)
+    {
         int width = Math.Max(1, availableWidth);
-        if (content.Length < width)
+        if (CellCount(content) < width)
             return [content];
 
         var wrapped = new List<string>();
-        for (int offset = 0; offset < content.Length; offset += width)
-            wrapped.Add(content.Substring(offset, Math.Min(width, content.Length - offset)));
+        var current = new StringBuilder();
+        var currentWidth = 0;
+        foreach (var element in TextElements(content))
+        {
+            var elementWidth = CellCount(element);
+            if (current.Length > 0 && currentWidth + elementWidth > width)
+            {
+                wrapped.Add(current.ToString());
+                current.Clear();
+                currentWidth = 0;
+            }
+
+            current.Append(element);
+            currentWidth += elementWidth;
+        }
+
+        if (current.Length > 0)
+            wrapped.Add(current.ToString());
         return wrapped;
     }
 
@@ -437,18 +460,28 @@ private static IEnumerable<string> WrapPlainLogLine(string line)
             return [line];
 
         int width = LogLineWidth();
-        if (line.Length < width)
+        if (CellCount(line) < width)
             return [line];
 
-        var wrapped = new List<string>();
-        for (int offset = 0; offset < line.Length; offset += width)
-            wrapped.Add(line.Substring(offset, Math.Min(width, line.Length - offset)));
-        return wrapped;
+        return WrapContent(line, width);
     }
 
     private static string PaddingFor(int visualLength)
         => Console.IsOutputRedirected ? "" : new string(' ', Math.Max(0, LogLineWidth() - visualLength));
 
+    internal static int CellCount(string text)
+        => new Segment(text).CellCount();
+
+    internal static IReadOnlyList<string> WrapContentForWidth(string content, int availableWidth)
+        => WrapContentByCellWidth(content, availableWidth).ToList();
+
+    private static IEnumerable<string> TextElements(string text)
+    {
+        var enumerator = StringInfo.GetTextElementEnumerator(text);
+        while (enumerator.MoveNext())
+            yield return enumerator.GetTextElement();
+    }
+
     private static int LogLineWidth()
     {
         if (Console.IsOutputRedirected)

Sockseek.Server.Tests/OpenApiContractTests.cs

@@ -1,5 +1,6 @@
 using System.Net;
 using System.Net.Sockets;
+using System.Reflection;
 using System.Text.Json;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Sockseek.Core;
@@ -55,7 +56,7 @@ public async Task OpenApiDocument_ContainsCoreServerContractSchemas()
                 .GetProperty("version")
                 .GetString();
 
-            Assert.AreEqual("3.0.0-dev.10", version);
+            Assert.AreEqual(ExpectedOpenApiVersion(), version);
 
             StringAssert.Contains(json, nameof(JobSummaryDto));
             StringAssert.Contains(json, nameof(SubmitAlbumJobRequestDto));
@@ -76,6 +77,16 @@ public async Task OpenApiDocument_ContainsCoreServerContractSchemas()
         }
     }
 
+    private static string ExpectedOpenApiVersion()
+    {
+        var assemblyVersion = typeof(ServerHost).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion
+            ?? typeof(ServerHost).Assembly.GetName().Version?.ToString()
+            ?? "0.0.0";
+
+        var metadataIndex = assemblyVersion.IndexOf('+', StringComparison.Ordinal);
+        return metadataIndex >= 0 ? assemblyVersion[..metadataIndex] : assemblyVersion;
+    }
+
     [TestMethod]
     public void SockseekApiJsonContext_CoversApiDtoContracts()
     {