From e4dde1181cf0f6884dcc1d91f67c93a41e986ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81d=C3=A1m=20Kov=C3=A1cs?= Date: Fri, 7 Jan 2022 11:08:56 +0100 Subject: [PATCH] Style, small fixes, Windows single file --- .vscode/tasks.json | 17 +++++++++++++++++ src/FileTime.ConsoleUI.App/UI/Render.cs | 1 + src/FileTime.ConsoleUI.App/UI/Styles.cs | 2 +- src/FileTime.ConsoleUI/Program.cs | 2 +- .../LocalContentProvider.cs | 1 - 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index d4fa6c2..c49b360 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -42,6 +42,23 @@ ], "problemMatcher": "$msCompile" }, + { + "label": "publish singlefile windows", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "${workspaceFolder}/src/FileTime.ConsoleUI/FileTime.ConsoleUI.csproj", + "-p:PublishSingleFile=true", + "-c", + "Release", + "-r", + "win-x64", + "--self-contained", + "true" + ], + "problemMatcher": "$msCompile" + }, { "label": "watch", "command": "dotnet", diff --git a/src/FileTime.ConsoleUI.App/UI/Render.cs b/src/FileTime.ConsoleUI.App/UI/Render.cs index 7bc5fc6..0aa4597 100644 --- a/src/FileTime.ConsoleUI.App/UI/Render.cs +++ b/src/FileTime.ConsoleUI.App/UI/Render.cs @@ -237,6 +237,7 @@ namespace FileTime.ConsoleUI.App.UI Console.SetCursorPosition(startX, startY + currentY++); _coloredRenderer.Write($"{{0,-{elementWidth}}}", _paddingLeft + "" + _paddingRight); + printedItemsCount++; } var padding = new string(' ', elementWidth); diff --git a/src/FileTime.ConsoleUI.App/UI/Styles.cs b/src/FileTime.ConsoleUI.App/UI/Styles.cs index 2160e36..e43caea 100644 --- a/src/FileTime.ConsoleUI.App/UI/Styles.cs +++ b/src/FileTime.ConsoleUI.App/UI/Styles.cs @@ -37,7 +37,7 @@ namespace FileTime.ConsoleUI.App.UI ElementBackground = new BasicColor(Console.BackgroundColor); ElementForeground = new BasicColor(Console.ForegroundColor); ElementSpecialForeground = new BasicColor(ConsoleColor.DarkGreen); - SelectedItemForeground = new BasicColor(ConsoleColor.DarkCyan); + SelectedItemForeground = new BasicColor(ConsoleColor.DarkYellow); ErrorColor = new BasicColor(ConsoleColor.Red); AccentForeground = new BasicColor(ConsoleColor.Green); diff --git a/src/FileTime.ConsoleUI/Program.cs b/src/FileTime.ConsoleUI/Program.cs index b2edccf..d730e86 100644 --- a/src/FileTime.ConsoleUI/Program.cs +++ b/src/FileTime.ConsoleUI/Program.cs @@ -100,7 +100,7 @@ namespace FileTime.ConsoleUI private static ServiceProvider CreateServiceProvider() { return new ServiceCollection() - .AddLogging((builder) => builder.AddConsole().AddDebug()) + .AddLogging(/* (builder) => builder.AddConsole().AddDebug() */) .AddSingleton() .AddSingleton(new Styles(IsAnsiColorSupported())) .AddSingleton() diff --git a/src/Providers/FileTime.Providers.Local/LocalContentProvider.cs b/src/Providers/FileTime.Providers.Local/LocalContentProvider.cs index 6ac049e..3f18629 100644 --- a/src/Providers/FileTime.Providers.Local/LocalContentProvider.cs +++ b/src/Providers/FileTime.Providers.Local/LocalContentProvider.cs @@ -48,7 +48,6 @@ namespace FileTime.Providers.Local var pathParts = (IsCaseInsensitive ? path.ToLower() : path).TrimStart(Constants.SeparatorChar).Split(Constants.SeparatorChar); var rootContainer = RootContainers.FirstOrDefault(c => NormalizePath(c.Name) == NormalizePath(pathParts[0])); - _logger.LogError("No root container found with name '{0}'", path[0]); if (rootContainer == null) { _logger.LogWarning("No root container found with name '{0}'", path[0]);