Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Topic/remove default string maniplulaot #2424

Merged
merged 2 commits into from
Oct 4, 2024
Merged

Topic/remove default string maniplulaot #2424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b96e38c
♻️ (StringManipulatorTool): refactor to add default manipulator if no…
MrHinsh Oct 4, 2024
f468908
Merge branch 'main' into topic/remove-default-string-maniplulaot
MrHinsh Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,15 +150,7 @@
"StringManipulatorTool": {
"Enabled": true,
"MaxStringLength": 1000000,
"Manipulators": [
{
"$type": "RegexStringManipulator",
"Enabled": true,
"Pattern": "[^( -~)\n\r\t]+",
"Replacement": "",
"Description": "Remove invalid characters from the end of the string"
}
]
"Manipulators": []
},
"TfsUserMappingTool": {
"Enabled": false,
Expand Down
17 changes: 14 additions & 3 deletions src/MigrationTools/Tools/StringManipulatorTool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@ public void ProcessorExecutionWithFieldItem(IProcessor processor, FieldItem fiel
}
if (fieldItem.FieldType == "String" && fieldItem.Value != null)
{
if (HasManipulators())
if (!HasManipulators())
{
foreach (var manipulator in Options.Manipulators)
AddDefaultManipulator();
}
foreach (var manipulator in Options.Manipulators)
{
if (manipulator.Enabled)
{
Expand All @@ -49,7 +51,7 @@ public void ProcessorExecutionWithFieldItem(IProcessor processor, FieldItem fiel
Log.LogDebug("{WorkItemProcessorEnricher}::ProcessorExecutionWithFieldItem::Disabled::{Description}", GetType().Name, manipulator.Description);
}
}
}

if (HasStringTooLong(fieldItem))
{
fieldItem.Value = fieldItem.Value.ToString().Substring(0, Math.Min(fieldItem.Value.ToString().Length, Options.MaxStringLength));
Expand All @@ -58,6 +60,15 @@ public void ProcessorExecutionWithFieldItem(IProcessor processor, FieldItem fiel

}

private void AddDefaultManipulator()
{
if (Options.Manipulators == null)
{
Options.Manipulators = new List<RegexStringManipulator>();
}
Options.Manipulators.Add(new RegexStringManipulator() { Enabled = true, Description = "Default: Removes invalid chars!", Pattern = "[^( -~)\n\r\t]+", Replacement = "" });
}

private bool HasStringTooLong(FieldItem fieldItem)
{
return fieldItem.Value.ToString().Length > 0 && fieldItem.Value.ToString().Length > Options.MaxStringLength;
Expand Down
Loading