feat: a new hope

Author: BoBoBaSs84

src/DDS.Tools/Services/TodoService.cs

@@ -161,7 +161,7 @@ private void SaveImage(ConvertSettingsBase settings, TodoModel todo, ImageType i
 		IImageModel image = _serviceProvider.GetRequiredKeyedService<IImageModel>(imageType);
 		image.Load(todo.FullPathName);
 
-		string targetFolder = PrepareTargetFolder(settings, image, todo.TargetFolder);
+		string targetFolder = PrepareTargetFolder(settings, image, todo);
 		_ = Directory.CreateDirectory(targetFolder);
 
 		string newFileName = $"{GetTargetFileName(settings, todo)}.{GetTargetFileExtensions(imageType)}";
@@ -170,9 +170,9 @@ private void SaveImage(ConvertSettingsBase settings, TodoModel todo, ImageType i
 		image.Save(newFilePath);
 	}
 
-	private static string PrepareTargetFolder(ConvertSettingsBase settings, IImageModel image, string targetFolder)
+	private static string PrepareTargetFolder(ConvertSettingsBase settings, IImageModel image, TodoModel todo)
 	{
-		string newTargetFolder = targetFolder;
+		string newTargetFolder = todo.TargetFolder;
 
 		if (settings.ConvertMode.Equals(ConvertModeType.Automatic))
 		{
@@ -181,7 +181,7 @@ private static string PrepareTargetFolder(ConvertSettingsBase settings, IImageMo
 		}
 
 		if (settings.RetainStructure)
-			return newTargetFolder;
+			return $"{newTargetFolder}{todo.RelativePath}";
 
 		if (settings.SeparateBySize)
 			newTargetFolder = Path.Combine(newTargetFolder, $"{image.Width}");

tests/DDS.ToolsTests/Services/TodoServiceTests.GetTodosDone.cs

@@ -19,7 +19,7 @@ public void GetTodosDoneTest()
 		PngConvertSettings settings = new()
 		{
 			SourceFolder = TestConstants.PngResourcePath,
-			TargetFolder = TestConstants.PngResultPath
+			TargetFolder = TestConstants.DdsResultPath
 		};
 
 		TodoCollection todos = s_todoService.GetTodos(settings, imageType);
@@ -34,7 +34,7 @@ public void GetTodosDoneManualTest()
 		PngConvertSettings settings = new()
 		{
 			SourceFolder = TestConstants.DdsResourcePath,
-			TargetFolder = TestConstants.DdsResultPath,
+			TargetFolder = TestConstants.PngResultPath,
 			ConvertMode = ConvertModeType.Manual,
 			RetainStructure = true
 		};