Skip to content

Commit f11d053

Browse files
sevenelevenseveneleven
committed
Apply remarks from pull request
1 parent f3e6bf8 commit f11d053

File tree

14 files changed

+118
-134
lines changed

14 files changed

+118
-134
lines changed

‎src/Moryx.Cli.Commands/AddModule.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public static CommandResult Exec(Template template, string moduleName)
1717
SolutionName = template.AppName,
1818
ThingName = moduleName,
1919
Thing = "module",
20-
ThingPlaceholders = [Template.ModulePlaceholder],
2120
},
2221
template.Module(moduleName),
2322
s => s.AddProjectsToSolution(template.Settings)

‎src/Moryx.Cli.Commands/AddProducts.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,8 @@ private static CommandResult Add(Template template, IEnumerable<string> products
2828
var files = template.WriteFilesToDisk(dictionary);
2929
Template.ReplacePlaceHoldersInsideFiles(
3030
files,
31-
new Dictionary<string, string>
32-
{
33-
{ Template.AppPlaceholder, template.AppName },
34-
{ Template.ProductPlaceholder, product },
35-
});
31+
template.ReplaceVariables(template.Configuration.Add.Product, product)
32+
);
3633

3734
UpdateProductConfig(template.Settings, product);
3835

‎src/Moryx.Cli.Commands/AddResources.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ public static CommandResult Exec(Template template, IEnumerable<string> resource
1616
SolutionName = template.AppName,
1717
ThingName = $"{resource}Resource",
1818
Thing = "resource",
19-
ThingPlaceholders =
20-
[
21-
Template.ResourcePlaceholder,
22-
Template.ResourcePlaceholder2
23-
],
2419
};
2520
return AddThing.Exec(
2621
template,

‎src/Moryx.Cli.Commands/AddStates.cs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ private static CommandResult Add(Template template, string resource, IEnumerable
3030
var targetPath = Path.Combine(Path.GetDirectoryName(resourceFile)!, "States");
3131
var newStateBaseFileName = Path.Combine(
3232
targetPath,
33-
Path.GetFileName(dictionary.Single().Value));
33+
Path.GetFileName(dictionary.FirstOrDefault().Value));
3434

3535
dictionary = new Dictionary<string, string> { { dictionary.FirstOrDefault().Key, newStateBaseFileName } };
36-
36+
3737
if (!File.Exists(newStateBaseFileName))
3838
{
3939
var files = template.WriteFilesToDisk(dictionary);
@@ -71,11 +71,13 @@ private static CommandResult Add(Template template, string resource, IEnumerable
7171
{
7272
var stateFiles = template.StateFile(state, resource);
7373
stateFiles = stateFiles
74-
.Select(file => new { file.Key, Value = Path.Combine(targetPath, $"{stateType}.cs")})
75-
.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
76-
74+
.ToDictionary(
75+
file => file.Key,
76+
file => Path.Combine(targetPath, $"{stateType}.cs")
77+
);
78+
7779

78-
var filename = Path.Combine(targetPath, $"{stateType}.cs");
80+
var filename = Path.Combine(targetPath, $"{stateType}.cs");
7981
if (!File.Exists(filename))
8082
{
8183
var files = template.WriteFilesToDisk(stateFiles);

‎src/Moryx.Cli.Commands/AddStep.cs‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,8 @@ public static CommandResult Exec(Template template, string step)
1616
SolutionName = template.AppName,
1717
ThingName = step,
1818
Thing = "step",
19-
ThingPlaceholders = [Template.StepPlaceholder],
2019
};
21-
var namespacePlaceholder = new Dictionary<string, string> {
22-
23-
{ $"{Template.AppPlaceholder}.Resources", $"{template.AppName}.Resources.{step}" },
24-
{ $"{template.AppName}.Resources", $"{template.AppName}.Resources.{step}" }
25-
};
26-
var replacements = new StringReplacements(addConfig)
27-
.AddFileNamePatterns(namespacePlaceholder)
28-
.AddContentPatterns(namespacePlaceholder)
29-
;
20+
var namespacePlaceholder = template.ReplaceVariables(template.Configuration.Add.Step, step);
3021

3122
return AddThing.Exec(
3223
template,
@@ -37,7 +28,7 @@ public static CommandResult Exec(Template template, string step)
3728
createdFiles.AddProjectsToSolution(template.Settings);
3829
AddProjectsTests(createdFiles, template.Settings);
3930
},
40-
replacements
31+
namespacePlaceholder
4132
);
4233
});
4334
}

‎src/Moryx.Cli.Commands/AddThing.cs‎

Lines changed: 3 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@ public static class AddThing
1717
/// <param name="resourceNames"></param>
1818
/// <param name="onAddedFiles"></param>
1919
/// <returns></returns>
20-
public static CommandResult Exec(Template template, AddConfig config, Dictionary<string, string> fileStructure, Action<IEnumerable<string>>? onAddedFiles = null, StringReplacements? replacements = null)
20+
public static CommandResult Exec(Template template, AddConfig config, Dictionary<string, string> fileStructure, Action<IEnumerable<string>>? onAddedFiles = null, Dictionary<string, string>? replacements = null)
2121
{
2222
return CommandBase.Exec(template, () =>
2323
{
2424
try
2525
{
26-
replacements ??= new StringReplacements(config);
26+
replacements ??= [];
2727

2828
var files = template.WriteFilesToDisk(
2929
fileStructure
3030
);
3131

3232
Template.ReplacePlaceHoldersInsideFiles(
3333
files,
34-
replacements.FileContentPatterns);
34+
replacements);
3535

3636
onAddedFiles?.Invoke(files);
3737
}
@@ -61,56 +61,5 @@ public class AddConfig
6161
/// Actual name identifiere of the *thing* to be added
6262
/// </summary>
6363
public required string ThingName { get; set; }
64-
65-
/// <summary>
66-
/// *Thing*s placeholder
67-
/// </summary>
68-
public required IEnumerable<string> ThingPlaceholders { get; set; }
69-
}
70-
71-
public class StringReplacements
72-
{
73-
public Dictionary<string, string> FileNamePatterns { get; }
74-
public Dictionary<string, string> FileContentPatterns { get; }
75-
76-
public StringReplacements(AddConfig config)
77-
{
78-
FileNamePatterns = CreateDictionary(config);
79-
FileContentPatterns = CreateDictionary(config);
80-
}
81-
82-
public Dictionary<string, string> CreateDictionary(AddConfig config)
83-
{
84-
var result = config.ThingPlaceholders
85-
.ToDictionary(s => s, s => config.ThingName);
86-
87-
result.TryAdd(Template.AppPlaceholder, config.SolutionName);
88-
return result;
89-
}
90-
91-
92-
public StringReplacements AddFileNamePatterns(Dictionary<string, string> patterns)
93-
{
94-
foreach (var pattern in patterns)
95-
{
96-
if (!FileNamePatterns.ContainsKey(pattern.Key))
97-
{
98-
FileNamePatterns.Add(pattern.Key, pattern.Value);
99-
}
100-
}
101-
return this;
102-
}
103-
104-
public StringReplacements AddContentPatterns(Dictionary<string, string> patterns)
105-
{
106-
foreach (var pattern in patterns)
107-
{
108-
if (!FileContentPatterns.ContainsKey(pattern.Key))
109-
{
110-
FileContentPatterns.Add(pattern.Key, pattern.Value);
111-
}
112-
}
113-
return this;
114-
}
11564
}
11665
}

‎src/Moryx.Cli.Remotes/Add.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public static CommandResult Remote(AddOptions options)
99
{
1010
CommandResult result = new();
1111
var dir = Directory.GetCurrentDirectory();
12-
Solution.AssertSolution(
12+
Solution.Assert(
1313
dir,
1414
then => result = AddRemote(dir, options),
1515
error => result = CommandResult.WithError(error)

‎src/Moryx.Cli.Remotes/List.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public static CommandResult Get(Action<string> onStatus)
99
{
1010
CommandResult result = new();
1111
var currentDir = Environment.CurrentDirectory;
12-
Templates.Solution.AssertSolution(
12+
Templates.Solution.Assert(
1313
currentDir,
1414
then => result = ListRemotes(currentDir, onStatus),
1515
error => result = CommandResult.WithError(error)

‎src/Moryx.Cli.Remotes/Pull.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public static CommandResult Remote(PullOptions options, Action<string> onStatus)
1010
{
1111
CommandResult result = new();
1212
var dir = Directory.GetCurrentDirectory();
13-
Templates.Solution.AssertSolution(
13+
Templates.Solution.Assert(
1414
dir,
1515
then => result = PullRemote(dir, options, onStatus),
1616
error => result = CommandResult.WithError(error)

‎src/Moryx.Cli.Remotes/Remove.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public static CommandResult Remote(RemoveOptions options, Action<string> onStatu
1010
CommandResult result = new();
1111
var dir = Directory.GetCurrentDirectory();
1212
var solutionNameError = string.Empty;
13-
Templates.Solution.AssertSolution(
13+
Templates.Solution.Assert(
1414
dir,
1515
then => result = RemoveRemote(dir, options, onStatus),
1616
error => result = CommandResult.WithError(error)

0 commit comments

Comments
 (0)