Skip to content

Refactor generic parsing #114

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
PrzemyslawKlys merged 1 commit into from
Jul 2, 2025
Merged

Refactor generic parsing #114

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
12 changes: 6 additions & 6 deletions Sources/EventViewerX/EventObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,10 @@ public EventObject(EventRecord eventRecord, string queriedMachine) {

XMLData = eventRecord.ToXml();
// Create a dictionary to hold the xml data
Data = ParseXML(XMLData);
Data = ParseXML<Dictionary<string, string>>(XMLData);
// Create a dictionary to hold the message data
try {
MessageData = ParseMessage(eventRecord.FormatDescription());
MessageData = ParseMessage<Dictionary<string, string>>(eventRecord.FormatDescription());
} catch {
MessageData = new Dictionary<string, string>();
//_logger.WriteError("Error parsing message");
Expand All @@ -169,8 +169,8 @@ public EventObject(EventRecord eventRecord, string queriedMachine) {
/// </summary>
/// <param name="message"></param>
/// <returns></returns>
private Dictionary<string, string> ParseMessage(string message) {
Dictionary<string, string> data = new Dictionary<string, string>();
private T ParseMessage<T>(string message) where T : IDictionary<string, string>, new() {
T data = new();

// Split the message into lines
string[] lines = Regex.Split(message, "\r?\n");
Expand Down Expand Up @@ -242,8 +242,8 @@ private static Dictionary<string, string> ParseColonSeparatedLines(string text)
/// </summary>
/// <param name="xmlData">The XML data.</param>
/// <returns></returns>
private Dictionary<string, string> ParseXML(string xmlData) {
Dictionary<string, string> data = new Dictionary<string, string>();
private T ParseXML<T>(string xmlData) where T : IDictionary<string, string>, new() {
T data = new();

// Parse the XML data into an XElement
XElement root;
Expand Down
Loading