Skip to content

A Swiss Army knife for developers.

Refactoring on Base64 Text Encoder / Decoder (#907)

Etienne BAUDOUX722e3ba2eccb
diff --git a/src/app/dev/DevToys.Tools/Models/EncodingConversion.cs b/src/app/dev/DevToys.Tools/Models/EncodingConversion.cs
new file mode 100644
index 000000000..0b328c1c2
--- /dev/null
+++ b/src/app/dev/DevToys.Tools/Models/EncodingConversion.cs
@@ -0,0 +1,7 @@
+namespace DevToys.Tools.Models;
+
+internal enum EncodingConversion
+{
+ Encode = 0,
+ Decode = 1
+}
diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderCommandLineTool.cs
index e6a282037..41a4beb1e 100644
--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderCommandLineTool.cs
+++ b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderCommandLineTool.cs
@@ -13,12 +13,6 @@ namespace DevToys.Tools.Tools.EncodersDecoders.Base64Text;
DescriptionResourceName = nameof(Base64TextEncoderDecoder.Description))]
internal sealed class Base64TextEncoderDecoderCommandLineTool : ICommandLineTool
{
- private enum Conversion
- {
- Encode,
- Decode
- }
-
[CommandLineOption(
Name = "input",
Alias = "i",
@@ -30,7 +24,7 @@ internal sealed class Base64TextEncoderDecoderCommandLineTool : ICommandLineTool
Name = "conversion",
Alias = "c",
DescriptionResourceName = nameof(Base64TextEncoderDecoder.ConversionOptionDescription))]
- private Conversion ConversionMode { get; set; } = Conversion.Encode;
+ private EncodingConversion ConversionMode { get; set; } = EncodingConversion.Encode;
[CommandLineOption(
Name = "encoding",
@@ -41,20 +35,25 @@ internal sealed class Base64TextEncoderDecoderCommandLineTool : ICommandLineTool
public ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)
{
string output;
- if (ConversionMode == Conversion.Encode)
+ switch (ConversionMode)
{
- output = Base64Helper.FromTextToBase64(Input, EncodingMode, logger, cancellationToken);
- }
- else
- {
- if (!Base64Helper.IsBase64DataStrict(Input))
- {
- cancellationToken.ThrowIfCancellationRequested();
- Console.Error.WriteLine(Base64TextEncoderDecoder.InvalidBase64);
- return new ValueTask<int>(-1);
- }
+ case EncodingConversion.Encode:
+ output = Base64Helper.FromTextToBase64(Input, EncodingMode, logger, cancellationToken);
+ break;
+
+ case EncodingConversion.Decode:
+ if (!Base64Helper.IsBase64DataStrict(Input))
+ {
+ cancellationToken.ThrowIfCancellationRequested();
+ Console.Error.WriteLine(Base64TextEncoderDecoder.InvalidBase64);
+ return new ValueTask<int>(-1);
+ }
+
+ output = Base64Helper.FromBase64ToText(Input, EncodingMode, logger, cancellationToken);
+ break;
- output = Base64Helper.FromBase64ToText(Input, EncodingMode, logger, cancellationToken);
+ default:
+ throw new NotSupportedException();
}
cancellationToken.ThrowIfCancellationRequested();
diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderGuiTool.cs
index c088c8c80..f81125c7f 100644
--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderGuiTool.cs
+++ b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderGuiTool.cs
@@ -21,12 +21,12 @@ namespace DevToys.Tools.Tools.EncodersDecoders.Base64Text;
internal sealed partial class Base64TextEncoderDecoderGuiTool : IGuiTool, IDisposable
{
/// <summary>
- /// Whether the tool should encode or decode Base64. True is encode, false is decode.
+ /// Whether the tool should encode or decode Base64.
/// </summary>
- private static readonly SettingDefinition<bool> conversionMode
+ private static readonly SettingDefinition<EncodingConversion> conversionMode
= new(
name: $"{nameof(Base64TextEncoderDecoderGuiTool)}.{nameof(conversionMode)}",
- defaultValue: true);
+ defaultValue: EncodingConversion.Encode);
/// <summary>
/// Whether the tool should encode/decode in Unicode or ASCII.
@@ -64,18 +64,21 @@ internal sealed partial class Base64TextEncoderDecoderGuiTool : IGuiTool, IDispo
_logger = this.Log();
_settingsProvider = settingsProvider;
- if (_settingsProvider.GetSetting(conversionMode))
+ switch (_settingsProvider.GetSetting(conversionMode))
{
- // Encode
- _conversionModeSwitch.On();
- _inputText.AutoWrap();
- _outputText.AlwaysWrap();
- }
- else
- {
- // Decode
- _inputText.AlwaysWrap();
- _outputText.AutoWrap();
+ case EncodingConversion.Encode:
+ _conversionModeSwitch.On();
+ _inputText.AutoWrap();
+ _outputText.AlwaysWrap();
+ break;
+
+ case EncodingConversion.Decode:
+ _inputText.AlwaysWrap();
+ _outputText.AutoWrap();
+ break;
+
+ default:
+ throw new NotSupportedException();
}
}
@@ -162,20 +165,23 @@ internal sealed partial class Base64TextEncoderDecoderGuiTool : IGuiTool, IDispo
private void OnConversionModeChanged(bool conversionMode)
{
- _settingsProvider.SetSetting(Base64TextEncoderDecoderGuiTool.conversionMode, conversionMode);
+ _settingsProvider.SetSetting(Base64TextEncoderDecoderGuiTool.conversionMode, conversionMode ? EncodingConversion.Encode : EncodingConversion.Decode);
_inputText.Text(_outputText.Text); // This will trigger a conversion.
- if (conversionMode)
- {
- // Encode
- _inputText.AutoWrap();
- _outputText.AlwaysWrap();
- }
- else
+ switch (_settingsProvider.GetSetting(Base64TextEncoderDecoderGuiTool.conversionMode))
{
- // Decode
- _inputText.AlwaysWrap();
- _outputText.AutoWrap();
+ case EncodingConversion.Encode:
+ _inputText.AutoWrap();
+ _outputText.AlwaysWrap();
+ break;
+
+ case EncodingConversion.Decode:
+ _inputText.AlwaysWrap();
+ _outputText.AutoWrap();
+ break;
+
+ default:
+ throw new NotSupportedException();
}
}
@@ -203,30 +209,36 @@ internal sealed partial class Base64TextEncoderDecoderGuiTool : IGuiTool, IDispo
await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);
string conversionResult;
- if (_settingsProvider.GetSetting(conversionMode))
- {
- conversionResult
- = Base64Helper.FromTextToBase64(
- input,
- _settingsProvider.GetSetting(encoder),
- _logger,
- cancellationToken);
- }
- else
+
+ switch (_settingsProvider.GetSetting(conversionMode))
{
- if (!string.IsNullOrEmpty(input) && !Base64Helper.IsBase64DataStrict(input))
- {
- cancellationToken.ThrowIfCancellationRequested();
- _outputText.Text(Base64TextEncoderDecoder.InvalidBase64);
- return;
- }
-
- conversionResult
- = Base64Helper.FromBase64ToText(
- input,
- _settingsProvider.GetSetting(encoder),
- _logger,
- cancellationToken);
+ case EncodingConversion.Encode:
+ conversionResult
+ = Base64Helper.FromTextToBase64(
+ input,
+ _settingsProvider.GetSetting(encoder),
+ _logger,
+ cancellationToken);
+ break;
+
+ case EncodingConversion.Decode:
+ if (!string.IsNullOrEmpty(input) && !Base64Helper.IsBase64DataStrict(input))
+ {
+ cancellationToken.ThrowIfCancellationRequested();
+ _outputText.Text(Base64TextEncoderDecoder.InvalidBase64);
+ return;
+ }
+
+ conversionResult
+ = Base64Helper.FromBase64ToText(
+ input,
+ _settingsProvider.GetSetting(encoder),
+ _logger,
+ cancellationToken);
+ break;
+
+ default:
+ throw new NotSupportedException();
}
cancellationToken.ThrowIfCancellationRequested();