SabreTools/MPF
1
0
Fork 0
mirror of https://github.com/SabreTools/MPF.git synced 2026-07-02 17:24:48 +00:00
Code Issues 392 Packages Projects Releases 20 Wiki Activity

Make site code formatting helper method

Browse Source
This commit is contained in:
Matt Nadareski
2022-01-27 10:51:27 -08:00
parent 8358692e8d
commit e1df075cde
2 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELIST.md
View File

@@ -54,6 +54,7 @@
- Add support for all ISO language codes
- Add support for all ISO region codes
- Ensure ordering in output site tags
- Make site code formatting helper method
### 2.2 (2021-12-30)
- Fix Saturn header finding

56
MPF.Library/InfoTool.cs
View File

@@ -892,22 +892,7 @@ namespace MPF.Library
"\n", info.CommonDiscInfo.CommentsSpecialFields
.OrderBy(kvp => kvp.Key)
.Where(kvp => !string.IsNullOrWhiteSpace(kvp.Value))
.Select(kvp =>
{
bool isMultiLine = IsMultiLine(kvp.Key);
string line = $"{kvp.Key.ShortName()}{(isMultiLine ? "\n" : " ")}";
// Special case for boolean fields
if (kvp.Key == SiteCode.PostgapType || kvp.Key == SiteCode.VCD)
{
if (kvp.Value != true.ToString())
return string.Empty;
return line.Trim();
}
return $"{line}{kvp.Value}{(isMultiLine ? "\n" : string.Empty)}";
})
.Select(FormatSiteTag)
.Where(s => !string.IsNullOrEmpty(s))
) + "\n" + info.CommonDiscInfo.Comments;
@@ -930,22 +915,7 @@ namespace MPF.Library
"\n", info.CommonDiscInfo.ContentsSpecialFields
.OrderBy(kvp => kvp.Key)
.Where(kvp => !string.IsNullOrWhiteSpace(kvp.Value))
.Select(kvp =>
{
bool isMultiLine = IsMultiLine(kvp.Key);
string line = $"{kvp.Key.ShortName()}{(isMultiLine ? "\n" : " ")}";
// Special case for boolean fields
if (kvp.Key == SiteCode.PostgapType || kvp.Key == SiteCode.VCD)
{
if (kvp.Value != true.ToString())
return string.Empty;
return line.Trim();
}
return $"{line}{kvp.Value}{(isMultiLine ? "\n" : string.Empty)}";
})
.Select(FormatSiteTag)
.Where(s => !string.IsNullOrEmpty(s))
) + "\n" + info.CommonDiscInfo.Contents;
@@ -1090,6 +1060,28 @@ namespace MPF.Library
AddIfExists(output, key, string.Join(", ", value.Select(o => o.ToString())), indent);
}
/// <summary>
/// Format a single site tag to string
/// </summary>
/// <param name="kvp">KeyValuePair representing the site tag and value</param>
/// <returns>String-formatted tag and value</returns>
private static string FormatSiteTag(KeyValuePair<SiteCode?, string> kvp)
{
bool isMultiLine = IsMultiLine(kvp.Key);
string line = $"{kvp.Key.ShortName()}{(isMultiLine ? "\n" : " ")}";
// Special case for boolean fields
if (kvp.Key == SiteCode.PostgapType || kvp.Key == SiteCode.VCD)
{
if (kvp.Value != true.ToString())
return string.Empty;
return line.Trim();
}
return $"{line}{kvp.Value}{(isMultiLine ? "\n" : string.Empty)}";
}
#endregion
#region Normalization