Skip to content

Commit 74c6b9e

Browse files
BoBoBaSs84BoBoBaSs84
committed
feat: a new hope
1 parent ef3f9bc commit 74c6b9e

File tree

16 files changed

+328
-56
lines changed

16 files changed

+328
-56
lines changed

‎src/DDS.Tools/Commands/Base/ConvertCommandBase.cs‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using DDS.Tools.Enumerators;
1+
using DDS.Tools.Common;
2+
using DDS.Tools.Enumerators;
23
using DDS.Tools.Exceptions;
34
using DDS.Tools.Interfaces.Services;
45
using DDS.Tools.Models;
@@ -15,33 +16,40 @@ namespace DDS.Tools.Commands.Base;
1516
/// <inheritdoc/>
1617
internal abstract class ConvertCommandBase<TSettings>(ITodoService todoService) : Command<TSettings> where TSettings : CommandSettings
1718
{
18-
private const string ResultFileName = "Result.json";
19-
2019
protected int Action(ConvertSettingsBase settings, ImageType imageType)
2120
{
2221
TodoCollection todos;
2322

2423
if (!Directory.Exists(settings.SourceFolder))
2524
throw new CommandException($"Directory '{settings.SourceFolder}' not found.");
2625

27-
string jsonFilePath = Path.Combine(settings.SourceFolder, ResultFileName);
28-
bool resultFileExists = File.Exists(jsonFilePath);
26+
string jsonFilePath = Path.Combine(settings.SourceFolder, Constants.ResultFileName);
27+
bool jsonExists = ResultJsonExists(jsonFilePath);
2928

30-
todos = resultFileExists
31-
? todoService.GetTodosFromJson(settings, imageType, jsonFilePath)
32-
: todoService.GetTodos(settings, imageType);
29+
if (!jsonExists)
30+
{
31+
todos = todoService.GetTodos(settings, imageType);
32+
return GetItDone(todoService, todos, settings, imageType, jsonExists);
33+
}
34+
else
35+
{
36+
string jsonFileContent = File.ReadAllText(jsonFilePath);
37+
todos = todoService.GetTodos(settings, imageType, jsonFileContent);
38+
return GetItDone(todoService, todos, settings, imageType, jsonExists);
39+
}
40+
}
41+
42+
private static bool ResultJsonExists(string jsonFilePath) => File.Exists(jsonFilePath);
3343

44+
private static int GetItDone(ITodoService todoService, TodoCollection todos, ConvertSettingsBase settings, ImageType imageType, bool jsonExists)
45+
{
3446
if (todos.Count.Equals(0))
3547
{
3648
AnsiConsole.MarkupLine($"[yellow]There is nothing todo![/]");
3749
return 1;
3850
}
3951

40-
if (resultFileExists)
41-
todoService.GetTodosDoneFromJson(todos, settings, imageType);
42-
else
43-
todoService.GetTodosDone(todos, settings, imageType);
44-
52+
todoService.GetTodosDone(todos, settings, imageType, jsonExists);
4553
return 0;
4654
}
4755
}

‎src/DDS.Tools/Common/Constants.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
namespace DDS.Tools.Common;
2+
3+
/// <summary>
4+
/// The constants class.
5+
/// </summary>
6+
internal static class Constants
7+
{
8+
/// <summary>
9+
/// The result json file name.
10+
/// </summary>
11+
internal const string ResultFileName = "Result.json";
12+
}

‎src/DDS.Tools/DDS.Tools.csproj‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,21 @@
1414
<PackageReference Include="Spectre.Console.Cli" />
1515
</ItemGroup>
1616

17+
<ItemGroup>
18+
<Compile Update="Properties\Resources.Designer.cs">
19+
<DesignTime>True</DesignTime>
20+
<AutoGen>True</AutoGen>
21+
<DependentUpon>Resources.resx</DependentUpon>
22+
</Compile>
23+
</ItemGroup>
24+
25+
<ItemGroup>
26+
<EmbeddedResource Update="Properties\Resources.resx">
27+
<Generator>ResXFileCodeGenerator</Generator>
28+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
29+
</EmbeddedResource>
30+
</ItemGroup>
31+
1732
<ItemGroup>
1833
<None Update="appsettings.json">
1934
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

‎src/DDS.Tools/Interfaces/Services/ITodoService.cs‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,20 @@ internal interface ITodoService
1919

2020
/// <summary>
2121
/// Returns a collection of todos depending on the provided <see cref="ConvertSettingsBase"/>
22-
/// and the <paramref name="jsonContent"/>.
22+
/// and the <paramref name="jsonFileContent"/>.
2323
/// </summary>
2424
/// <param name="settings">The settings that need to be considered.</param>
2525
/// <param name="imageType">The image type to work with.</param>
26-
/// <param name="jsonContent">The json content to work with.</param>
26+
/// <param name="jsonFileContent">The json content to work with.</param>
2727
/// <returns>A collection of todos.</returns>
28-
TodoCollection GetTodosFromJson(ConvertSettingsBase settings, ImageType imageType, string jsonContent);
28+
TodoCollection GetTodos(ConvertSettingsBase settings, ImageType imageType, string jsonFileContent);
2929

3030
/// <summary>
3131
/// Get the todos done.
3232
/// </summary>
3333
/// <param name="todos">The collection of todos.</param>
3434
/// <param name="settings">The settings that need to be considered.</param>
3535
/// <param name="imageType">The image type to work with.</param>
36-
void GetTodosDone(TodoCollection todos, ConvertSettingsBase settings, ImageType imageType);
37-
38-
/// <summary>
39-
/// Get the todos done in a different way.
40-
/// </summary>
41-
/// <param name="todos">The collection of todos.</param>
42-
/// <param name="settings">The settings that need to be considered.</param>
43-
/// <param name="imageType">The image type to work with.</param>
44-
void GetTodosDoneFromJson(TodoCollection todos, ConvertSettingsBase settings, ImageType imageType);
36+
/// <param name="jsonExists">Do the todos come from a json result file?</param>
37+
void GetTodosDone(TodoCollection todos, ConvertSettingsBase settings, ImageType imageType, bool jsonExists = false);
4538
}

‎src/DDS.Tools/Properties/Resources.Designer.cs‎

Lines changed: 72 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/DDS.Tools/Properties/Resources.resx‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="ServiceException.Message" xml:space="preserve">
121+
<value>Something went wrong in {0}!</value>
122+
</data>
123+
</root>

0 commit comments

Comments
 (0)