Skip to content

Free, open-source Windows optimization tool for performance, privacy, and simplicity.

Move DecodeBase64 to ShellService.cs

itsfatduck4ffd17cefa1c
diff --git a/optimizerDuck/Program.cs b/optimizerDuck/Program.cs
index ef261a8..9d42fa2 100644
--- a/optimizerDuck/Program.cs
+++ b/optimizerDuck/Program.cs
@@ -1,5 +1,4 @@
-using System.Text;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
using optimizerDuck.Core;
using optimizerDuck.Core.Extensions;
using optimizerDuck.Core.Helpers;
@@ -9,6 +8,7 @@ using optimizerDuck.UI;
using optimizerDuck.UI.Components;
using optimizerDuck.UI.Logger;
using Spectre.Console;
+using System.Text;
namespace optimizerDuck;
@@ -151,7 +151,7 @@ internal class Program
Theme.Accent,
CustomBoxBorder.UnderlineBorder).Build()
)
- { Expand = false }
+ { Expand = false }
);
AnsiConsole.Write(start);
AnsiConsole.Write(middlePanels);
diff --git a/optimizerDuck/src/Core/Extensions/TextExtensions.cs b/optimizerDuck/src/Core/Extensions/TextExtensions.cs
index 055998f..c14c133 100644
--- a/optimizerDuck/src/Core/Extensions/TextExtensions.cs
+++ b/optimizerDuck/src/Core/Extensions/TextExtensions.cs
@@ -39,17 +39,6 @@ public static class TextExtensions
return sb.ToString();
}
- public static string DecodeBase64(this string value)
- {
- if (string.IsNullOrWhiteSpace(value))
- return value;
-
- Span<byte> buffer = new byte[value.Length];
- return Convert.TryFromBase64String(value, buffer, out var bytesWritten)
- ? Encoding.Unicode.GetString(buffer[..bytesWritten])
- : string.Empty;
- }
-
public static string ParseCliXml(this string? cliXml)
{
if (string.IsNullOrWhiteSpace(cliXml))
diff --git a/optimizerDuck/src/Core/Services/ShellService.cs b/optimizerDuck/src/Core/Services/ShellService.cs
index c1f8b6b..78954ac 100644
--- a/optimizerDuck/src/Core/Services/ShellService.cs
+++ b/optimizerDuck/src/Core/Services/ShellService.cs
@@ -1,9 +1,9 @@
-using System.Diagnostics;
-using System.Text;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
using optimizerDuck.Core.Extensions;
using optimizerDuck.UI.Logger;
using Spectre.Console;
+using System.Diagnostics;
+using System.Text;
namespace optimizerDuck.Core.Services;
@@ -19,7 +19,7 @@ public static class ShellService
private static ShellResult Run(string fileName, string arguments, string command, string serviceName)
{
var fullCommand =
- $"{fileName} {arguments.Replace("-EncodedCommand", "-Command")} {command.DecodeBase64()}"; // let user see the real command
+ $"{fileName} {arguments.Replace("-EncodedCommand", "-Command")} {DecodeBase64(command)}"; // let user see the real command
var psi = new ProcessStartInfo
{
@@ -108,4 +108,17 @@ public static class ShellService
var bytes = Encoding.Unicode.GetBytes(command);
return Convert.ToBase64String(bytes);
}
+
+ private static string DecodeBase64(string value)
+ {
+ try
+ {
+ var bytes = Convert.FromBase64String(value);
+ return Encoding.Unicode.GetString(bytes);
+ }
+ catch
+ {
+ return string.Empty;
+ }
+ }
}
\ No newline at end of file