escape filepaths in markup'ed lines

xboxoneresearch · Aug 18, 2024 · 7a8ba7d · 7a8ba7d
1 parent 7c0c12b
commit 7a8ba7d
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/Twodump/Program.cs b/Twodump/Program.cs
@@ -80,16 +80,19 @@ string ReplacePathSeparators(string path) =>
                     }
                     else
                     {
+
+                        var escapedFilename = Markup.Escape(filename);
+
                         if ((info.Flags & FileFlags.FailedToRead) != 0)
                         {
-                            AnsiConsole.MarkupLine($"[red bold]Failed to transfer {filename}.[/]");
+                            AnsiConsole.MarkupLine($"[red bold]Failed to transfer {escapedFilename}.[/]");
                             continue;
                         }
 
                         fileCount++;
                         totalFileSize += info.FileSize;
 
-                        var task = ctx.AddTask($"[white bold]{filename}[/]", true, info.FileSize);
+                        var task = ctx.AddTask($"[white bold]{escapedFilename}[/]", true, info.FileSize);
 
                         // Just for good measure
                         var fullPath = Path.GetFullPath(filename);
@@ -116,15 +119,15 @@ string ReplacePathSeparators(string path) =>
                         // but upstream spectre.console does not currently provide an API for this.
                         // task.RemoveTask(task); I implemented this myself and it did solve the issue
 
-                        AnsiConsole.MarkupLine($@"[white bold]Transferred[/] [grey italic]{filename}[/] [white bold]in[/] [green bold]{task.ElapsedTime:mm\m\ ss\s}.[/]");
+                        AnsiConsole.MarkupLineInterpolated($@"[white bold]Transferred[/] [grey italic]{escapedFilename}[/] [white bold]in[/] [green bold]{task.ElapsedTime:mm\m\ ss\s}.[/]");
 
                         File.SetCreationTime(filename, DateTime.FromFileTime(info.LastWriteTime));
                     }
                 }
 
                 stopwatch.Stop();
 
-                AnsiConsole.MarkupLine($@"[green bold]Successfully[/] transferred {fileCount} files, totalling {totalFileSize} bytes, in {stopwatch.Elapsed:h\h\ mm\m\ ss\s}.");
+                AnsiConsole.MarkupLineInterpolated($@"[green bold]Successfully[/] transferred {fileCount} files, totalling {totalFileSize} bytes, in {stopwatch.Elapsed:h\h\ mm\m\ ss\s}.");
 
                 ctx.Refresh();
             }