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

DEV-29934: Enable template helper to read formatversion G1.0a etc. #115

Merged
merged 3 commits into from
Jul 31, 2023
Merged

DEV-29934: Enable template helper to read formatversion G1.0a etc. #115

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79757f0
enable template helper to read formatversion G1.0a etc.
hf-fvesely Jul 31, 2023
f377a03
Merge branch 'master' into Update_template_helper
hf-fvesely Jul 31, 2023
5f5a6c6
Add Tests for `RetrieveFormatVersionFromInputFileName` (#116)
hf-kklein Jul 31, 2023
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
33 changes: 24 additions & 9 deletions EDILibrary/TemplateHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,19 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
using System.Xml.Linq;

using Newtonsoft.Json;
using Newtonsoft.Json.Linq;

namespace EDILibrary
{
public class TemplateHelper
{
// Todo @JoschaMetze: Add a docstring
protected static void ParseAPERAKString(string aperak, out string dataType, out int length,

private const string FormatVersionPattern = "^(?<format>[A-Z]{6,7})(?<version>[A-Z]?\\d+\\.\\d+[a-z]?)$";

private static void ParseAPERAKString(string aperak, out string dataType, out int length,
out List<string> list)
{
dataType = null;
Expand Down Expand Up @@ -44,8 +46,8 @@ protected static void ParseAPERAKString(string aperak, out string dataType, out
}
}

// Todo @JoschaMetze: Add a docstring
protected static void Recurse(XElement cur, JArray refObj, TreeElement tree)

private static void Recurse(XElement cur, JArray refObj, TreeElement tree)
{
var i = cur.Descendants("field").Count(d => d.Parent == cur);
var hasClass = cur.Descendants("class").Any(d => d.Parent == cur);
Expand Down Expand Up @@ -442,17 +444,30 @@ public string ConvertFilesToJSON(string inputFileName, string outputFileName, st
{
tree = new GenericEDILoader().LoadTree(File.ReadAllText(treeFileName));
}

var tmp = new JArray();
Recurse(srcXml, tmp, tree);
//retriev version information from inputFileName
var part = inputFileName.Split(new[] { ".template" }, StringSplitOptions.None)[0].Split(System.IO.Path.DirectorySeparatorChar).Last();
var version = part.Substring(part.IndexOf('.') - 1);
string version = RetrieveFormatVersionFromInputFileName(inputFileName);
((tmp[0] as JObject)["_meta"] as JObject).Add("version", version);
File.WriteAllText(outputFileName, JsonConvert.SerializeObject(tmp));
return JsonConvert.SerializeObject(tmp);

}

private static string RetrieveFormatVersionFromInputFileName(string inputFileName)
{
var formatVersionRegex = new Regex(FormatVersionPattern);
var part = inputFileName.Split(new[] { ".template" }, StringSplitOptions.None)[0].Split(System.IO.Path.DirectorySeparatorChar).Last();
var match = formatVersionRegex.Match(part);
if (match.Success)
{
return match.Groups["version"].Value;
}
else
{
throw new ArgumentException($"Format version could not be determined: {part}", nameof(inputFileName));
}
}

// the format version will be written to the json template file, thus needs to be passed
public string ConvertToJSON(string xmlTemplate, string treeTemplate, string formatVersion)
{
Expand Down
Loading