Skip to content

fix(data): UniqueId content as CHAR Array #14

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

Merged
Preliy merged 1 commit into from
Jan 30, 2025
Merged

fix(data): UniqueId content as CHAR Array #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 43 additions & 16 deletions Runtime/Scripts/Data/ProductDataFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public static void CreateProductData(this PayloadTag payloadTag, Dictionary<stri
{
if (!ProductDataDirectoryManager.Instance.Contains(directoryId))
{
Logging.Logger.Log(LogType.Warning, $"{TAG} DirectoryId [{directoryId}] isn't contains in Directory Manager! Payload Product Data isn't created!");
Logging.Logger.Log(LogType.Warning, $"DirectoryId [{directoryId}] isn't contains in Directory Manager! Payload Product Data isn't created!");
continue;
}
string directory;
Expand All @@ -46,7 +46,7 @@ public static void CreateProductData(this PayloadTag payloadTag, Dictionary<stri
}
catch (Exception exception)
{
Logging.Logger.Log(LogType.Error, exception.Message);
Logging.Logger.Log(LogType.Error, $"{TAG}: {exception.Message}");
}
}

Expand Down Expand Up @@ -85,7 +85,7 @@ public static void CreateTemplate(string path, List<EntryData> content)
}

new XDocument(elem).Save(path);
Logging.Logger.Log(LogType.Log, $"{TAG} Template saved as {path}");
Logging.Logger.Log(LogType.Log, $"{TAG}: Template saved as {path}");
}

public static List<EntryData> GetTemplateContent(string path)
Expand Down Expand Up @@ -118,11 +118,11 @@ private static List<EntryData> GetProductDataContent(this PayloadTag payloadTag,
try
{
var templatePath = Path.Combine(directory, $"{TEMPLATE_NAME}{payloadTag.Payload.TypeId}.xml");
if (!File.Exists(templatePath)) throw new Exception($"{TAG} Template Data {templatePath} cannot be found!");
if (!File.Exists(templatePath)) throw new Exception($"Template Data {templatePath} cannot be found!");

var template = XDocument.Load(templatePath);
var file = Path.Combine(directory, $"{DATA_NAME}{payloadTag.Payload.UniqueId}.{DATA_EXTENSION}");
if (!File.Exists(file)) throw new Exception($"{TAG} Product Data {file} cannot be found!");
if (!File.Exists(file)) throw new Exception($"Product Data {file} cannot be found!");

var bytes = File.ReadAllBytes(file);
var document = ReadDataBytes(template, bytes);
Expand Down Expand Up @@ -162,15 +162,15 @@ private static void CreateProductDataFile(PayloadTag payloadTag, string director

try
{
if (!File.Exists(path)) throw new Exception($"{TAG} Product data template not found! {path}");
if (!File.Exists(path)) throw new Exception($"Product data template not found! {path}");
var template = XDocument.Load(path);
var bytes = CreateTemplate(template, content);
var file = Path.Combine(directory, payloadTag.GetProductDataPath());
File.WriteAllBytes(file, bytes);
}
catch (Exception exception)
{
Logging.Logger.Log(LogType.Error, exception.Message, payloadTag);
Logging.Logger.Log(LogType.Error, $"{TAG}: {exception.Message}", payloadTag);
}
}

Expand All @@ -190,17 +190,17 @@ private static void Overwrite(PayloadTag payloadTag, string directory, List<Entr

try
{
if (!File.Exists(path)) throw new Exception($"{TAG} Product Data {path} cannot be found!");
if (!File.Exists(path)) throw new Exception($"Product Data {path} cannot be found!");
var template = new XDocument(elem);
var dictinary = new Dictionary<string, string> { { "Number", payloadTag.Payload.UniqueId.ToString() } };
var bytes = CreateTemplate(template, dictinary);
File.WriteAllBytes(path, bytes);
Logging.Logger.Log(LogType.Log, $"{TAG} Product Data {path} successfully overwritten!");
Logging.Logger.Log(LogType.Log, $"Product Data {path} successfully overwritten!");

}
catch (Exception exception)
{
Logging.Logger.Log(LogType.Error, exception.Message);
Logging.Logger.Log(LogType.Error, $"{TAG}: {exception.Message}");
}
}

Expand Down Expand Up @@ -273,15 +273,42 @@ private static byte[] CreateTemplate(XDocument template, Dictionary<string, stri
var type = (EntryDataType)Enum.Parse(typeof(EntryDataType), entry.Attribute("Type")?.Value.ToUpper() ?? string.Empty);
var bytes = new byte[1];

if (entry.Attribute("Key") != null)
var key = entry.Attribute("Key");
if (key != null && content.TryGetValue(key.Value, out var value))
{
var key = entry.Attribute("Key")?.Value;
if (key != null && content.ContainsKey(key))
if (content[key].Length == entry.Value.Length || type != EntryDataType.CHARS)
entry.Value = content[key];
if (type == EntryDataType.CHARS)
{
var byteOffset = entry.Value.Length - value.Length;
if (byteOffset >= 0)
{
var entryBytes = Encoding.ASCII.GetBytes(entry.Value);
var contentBytes = Encoding.ASCII.GetBytes(value);
for (var i = 0; i < contentBytes.Length; i++)
{
entryBytes[byteOffset + i] = contentBytes[i];
}

entry.Value = Encoding.ASCII.GetString(entryBytes);
}
else
{
throw new Exception($"Product Data [Name:{key.Name} Value:{key.Value} Length: {key.Value.Length}] can't be written in template [Name:{entry.Name} Value:{entry.Value} Length: {entry.Value.Length}]");
}
}
else
{
if (value.Length == entry.Value.Length)
{
entry.Value = value;
}
else
{
throw new Exception($"Product Data [Name:{key.Name} Value:{key.Value} Length: {key.Value.Length}] can't be written in template [Name:{entry.Name} Value:{entry.Value} Length: {entry.Value.Length}]");
}
}
}

entry.Value = entry.Value == "" ? "0" : entry.Value;
if (string.IsNullOrEmpty(entry.Value)) entry.Value = "0";

bytes = type switch
{
Expand Down