feat: a new hope

BoBoBaSs84 · Mar 10, 2024 · 31ee16e · 31ee16e
1 parent 5f06d7e
commit 31ee16e
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 87 deletions.
diff --git a/src/DDS.Tools/Commands/Base/ConvertCommandBase.cs b/src/DDS.Tools/Commands/Base/ConvertCommandBase.cs
@@ -0,0 +1,43 @@
+using DDS.Tools.Enumerators;
+using DDS.Tools.Exceptions;
+using DDS.Tools.Interfaces.Services;
+using DDS.Tools.Models;
+using DDS.Tools.Settings.Base;
+
+using Spectre.Console;
+using Spectre.Console.Cli;
+
+namespace DDS.Tools.Commands.Base;
+
+/// <summary>
+/// The convert command base class.
+/// </summary>
+/// <inheritdoc/>
+internal abstract class ConvertCommandBase<TSettings>(ITodoService todoService) : Command<TSettings> where TSettings : CommandSettings
+{
+	private readonly ITodoService _todoService = todoService;
+
+	protected int Action(ConvertSettings settings, ImageType imageType)
+	{
+		TodoCollection todos;
+
+		if (!Directory.Exists(settings.SourceFolder))
+			throw new CommandException($"Directory '{settings.SourceFolder}' not found.");
+
+		string jsonFilePath = Path.Combine(settings.SourceFolder, "Result.json");
+
+		todos = File.Exists(jsonFilePath)
+			? _todoService.GetTodosFromJson(settings, imageType, jsonFilePath)
+			: _todoService.GetTodos(settings, imageType);
+
+		if (todos.Count.Equals(0))
+		{
+			AnsiConsole.MarkupLine($"[yellow]There is nothing todo![/]");
+			return 1;
+		}
+
+		_todoService.GetTodosDone(todos, settings, imageType);
+
+		return 0;
+	}
+}
diff --git a/src/DDS.Tools/Commands/DdsConvertCommand.cs b/src/DDS.Tools/Commands/DdsConvertCommand.cs
@@ -1,9 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
 
+using DDS.Tools.Commands.Base;
 using DDS.Tools.Enumerators;
-using DDS.Tools.Exceptions;
 using DDS.Tools.Interfaces.Services;
-using DDS.Tools.Models;
 using DDS.Tools.Settings;
 
 using Microsoft.Extensions.Logging;
@@ -18,47 +17,22 @@ namespace DDS.Tools.Commands;
 /// </summary>
 /// <param name="loggerService">The logger service instance to use.</param>
 /// <param name="todoService">The todo service instance to use.</param>
-internal sealed class DdsConvertCommand(ILoggerService<DdsConvertCommand> loggerService, ITodoService todoService) : Command<DdsConvertSettings>
+internal sealed class DdsConvertCommand(ILoggerService<DdsConvertCommand> loggerService, ITodoService todoService) : ConvertCommandBase<DdsConvertSettings>(todoService)
 {
 	private const ImageType Type = ImageType.DDS;
 	private readonly ILoggerService<DdsConvertCommand> _loggerService = loggerService;
-	private readonly ITodoService _todoService = todoService;
 
 	private static readonly Action<ILogger, Exception?> LogException =
 		LoggerMessage.Define(LogLevel.Error, 0, "Exception occured.");
 
 	/// <inheritdoc/>
 	public override int Execute([NotNull] CommandContext context, [NotNull] DdsConvertSettings settings)
-	{
-		return AnsiConsole.Status()
-			.Spinner(Spinner.Known.Line)
-			.Start("Processing..", action => Action(settings));
-	}
-
-	private int Action(DdsConvertSettings settings)
 	{
 		try
 		{
-			TodoCollection todos = [];
-
-			if (!Directory.Exists(settings.SourceFolder))
-				throw new CommandException($"Directory '{settings.SourceFolder}' not found.");
-
-			string jsonFilePath = Path.Combine(settings.SourceFolder, "Result.json");
-
-			todos = File.Exists(jsonFilePath)
-				? _todoService.GetTodosFromJson(settings, Type, jsonFilePath)
-				: _todoService.GetTodos(settings, Type);
-
-			if (todos.Count.Equals(0))
-			{
-				AnsiConsole.MarkupLine($"[yellow]There is nothing todo![/]");
-				return 1;
-			}
-
-			_todoService.GetTodosDone(todos, settings, Type);
-
-			return 0;
+			return AnsiConsole.Status()
+				.Spinner(Spinner.Known.Line)
+				.Start("Processing..", action => Action(settings, Type));
 		}
 		catch (Exception ex)
 		{

diff --git a/src/DDS.Tools/Commands/PngConvertCommand.cs b/src/DDS.Tools/Commands/PngConvertCommand.cs
@@ -1,9 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
 
+using DDS.Tools.Commands.Base;
 using DDS.Tools.Enumerators;
-using DDS.Tools.Exceptions;
 using DDS.Tools.Interfaces.Services;
-using DDS.Tools.Models;
 using DDS.Tools.Settings;
 
 using Microsoft.Extensions.Logging;
@@ -18,47 +17,22 @@ namespace DDS.Tools.Commands;
 /// </summary>
 /// <param name="loggerService">The logger service instance to use.</param>
 /// <param name="todoService">The todo service instance to use.</param>
-internal sealed class PngConvertCommand(ILoggerService<DdsConvertCommand> loggerService, ITodoService todoService) : Command<PngConvertSettings>
+internal sealed class PngConvertCommand(ILoggerService<DdsConvertCommand> loggerService, ITodoService todoService) : ConvertCommandBase<PngConvertSettings>(todoService)
 {
 	private const ImageType Type = ImageType.PNG;
 	private readonly ILoggerService<DdsConvertCommand> _loggerService = loggerService;
-	private readonly ITodoService _todoService = todoService;
 
 	private static readonly Action<ILogger, Exception?> LogException =
 		LoggerMessage.Define(LogLevel.Error, 0, "Exception occured.");
 
 	/// <inheritdoc/>
 	public override int Execute([NotNull] CommandContext context, [NotNull] PngConvertSettings settings)
-	{
-		return AnsiConsole.Status()
-			.Spinner(Spinner.Known.Line)
-			.Start("Processing..", action => Action(settings));
-	}
-
-	private int Action(PngConvertSettings settings)
 	{
 		try
 		{
-			TodoCollection todos = [];
-
-			if (!Directory.Exists(settings.SourceFolder))
-				throw new CommandException($"Directory '{settings.SourceFolder}' not found.");
-
-			string jsonFilePath = Path.Combine(settings.SourceFolder, "Result.json");
-
-			todos = File.Exists(jsonFilePath)
-				? _todoService.GetTodosFromJson(settings, Type, jsonFilePath)
-				: _todoService.GetTodos(settings, Type);
-
-			if (todos.Count.Equals(0))
-			{
-				AnsiConsole.MarkupLine($"[yellow]There is nothing todo![/]");
-				return 1;
-			}
-
-			_todoService.GetTodosDone(todos, settings, Type);
-
-			return 0;
+			return AnsiConsole.Status()
+				.Spinner(Spinner.Known.Line)
+				.Start("Processing..", action => Action(settings, Type));
 		}
 		catch (Exception ex)
 		{

diff --git a/src/DDS.Tools/Extensions/StreamExtensions.cs b/src/DDS.Tools/Extensions/StreamExtensions.cs
diff --git a/src/DDS.Tools/Models/DdsImageModel.cs b/src/DDS.Tools/Models/DdsImageModel.cs
@@ -2,7 +2,6 @@
 
 using BCnEncoder.ImageSharp;
 
-using DDS.Tools.Extensions;
 using DDS.Tools.Interfaces.Models;
 using DDS.Tools.Interfaces.Services;
 using DDS.Tools.Models.Base;

diff --git a/src/DDS.Tools/Models/PngImageModel.cs b/src/DDS.Tools/Models/PngImageModel.cs
@@ -4,7 +4,6 @@
 using BCnEncoder.Shared;
 using BCnEncoder.Shared.ImageFiles;
 
-using DDS.Tools.Extensions;
 using DDS.Tools.Interfaces.Models;
 using DDS.Tools.Interfaces.Services;
 using DDS.Tools.Models.Base;