From a08de59a73ca3a2a76cde4ed28bfa257fe956afd Mon Sep 17 00:00:00 2001
From: Dork Normalize <nope>
Date: Wed, 26 Mar 2025 01:23:06 -0700
Subject: [PATCH 01/11] Initial refactor to C# from PS
---
.gitignore | 5 +-
AutoTrackR2/HomePage.xaml.cs | 585 +++++++++---------
AutoTrackR2/LocalPlayerData.cs | 17 +
.../LogEventHandlers/ActorDeathEvent.cs | 59 ++
.../LogEventHandlers/GameVersionEvent.cs | 21 +
.../LogEventHandlers/ILogEventHandler.cs | 10 +
.../LogEventHandlers/InArenaCommanderEvent.cs | 22 +
.../InPersistentUniverseEvent.cs | 22 +
.../InstancedInteriorEvent.cs | 77 +++
AutoTrackR2/LogEventHandlers/LoginEvent.cs | 24 +
.../VehicleDestructionEvent.cs | 59 ++
AutoTrackR2/LogHandler.cs | 101 +++
AutoTrackR2/TrackREventDispatcher.cs | 49 ++
AutoTrackR2/UpdatePage.xaml.cs | 2 +-
AutoTrackR2/WebHandler.cs | 102 +++
15 files changed, 855 insertions(+), 300 deletions(-)
create mode 100644 AutoTrackR2/LocalPlayerData.cs
create mode 100644 AutoTrackR2/LogEventHandlers/ActorDeathEvent.cs
create mode 100644 AutoTrackR2/LogEventHandlers/GameVersionEvent.cs
create mode 100644 AutoTrackR2/LogEventHandlers/ILogEventHandler.cs
create mode 100644 AutoTrackR2/LogEventHandlers/InArenaCommanderEvent.cs
create mode 100644 AutoTrackR2/LogEventHandlers/InPersistentUniverseEvent.cs
create mode 100644 AutoTrackR2/LogEventHandlers/InstancedInteriorEvent.cs
create mode 100644 AutoTrackR2/LogEventHandlers/LoginEvent.cs
create mode 100644 AutoTrackR2/LogEventHandlers/VehicleDestructionEvent.cs
create mode 100644 AutoTrackR2/LogHandler.cs
create mode 100644 AutoTrackR2/TrackREventDispatcher.cs
create mode 100644 AutoTrackR2/WebHandler.cs
diff --git a/.gitignore b/.gitignore
index 9491a2f..ec1bbfc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -360,4 +360,7 @@ MigrationBackup/
.ionide/
# Fody - auto-generated XML schema
-FodyWeavers.xsd
\ No newline at end of file
+FodyWeavers.xsd
+
+### Rider ###
+.idea/
\ No newline at end of file
diff --git a/AutoTrackR2/HomePage.xaml.cs b/AutoTrackR2/HomePage.xaml.cs
index f65af75..73918ca 100644
--- a/AutoTrackR2/HomePage.xaml.cs
+++ b/AutoTrackR2/HomePage.xaml.cs
@@ -3,309 +3,313 @@ using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using System.Windows.Media.Effects;
-using System.IO;
using System.Windows.Documents;
using System.Globalization;
using System.Windows.Media.Imaging;
+using AutoTrackR2.LogEventHandlers;
-namespace AutoTrackR2
+namespace AutoTrackR2;
+
+public struct PlayerData
{
- public partial class HomePage : UserControl
+ public string? PFPURL;
+ public string? UEERecord;
+ public string? OrgURL;
+ public string? OrgName;
+ public string? JoinDate;
+}
+
+public partial class HomePage : UserControl
+{
+ public HomePage()
{
- public HomePage()
+ InitializeComponent();
+
+ // Get the current month
+ string currentMonth = DateTime.Now.ToString("MMMM", CultureInfo.InvariantCulture);
+
+ // Set the TextBlock text
+ KillTallyTitle.Text = $"Kill Tally - {currentMonth}";
+ }
+
+ private Process runningProcess; // Field to store the running process
+ private LogHandler _logHandler;
+ private bool _UIEventsRegistered = false;
+
+
+ // Update Start/Stop button states based on the isRunning flag
+ public void UpdateButtonState(bool isRunning)
+ {
+ var accentColor = (Color)Application.Current.Resources["AccentColor"];
+
+ if (isRunning)
{
- InitializeComponent();
+ // Set Start button to "Running..." and apply glow effect
+ StartButton.Content = "Running...";
+ StartButton.IsEnabled = false; // Disable Start button
+ StartButton.Style = (Style)FindResource("DisabledButtonStyle");
- // Get the current month
- string currentMonth = DateTime.Now.ToString("MMMM", CultureInfo.InvariantCulture);
-
- // Set the TextBlock text
- KillTallyTitle.Text = $"Kill Tally - {currentMonth}";
- }
-
- private Process runningProcess; // Field to store the running process
-
- // Update Start/Stop button states based on the isRunning flag
- public void UpdateButtonState(bool isRunning)
- {
- var accentColor = (Color)Application.Current.Resources["AccentColor"];
-
- if (isRunning)
+ // Add glow effect to the Start button
+ StartButton.Effect = new DropShadowEffect
{
- // Set Start button to "Running..." and apply glow effect
- StartButton.Content = "Running...";
- StartButton.IsEnabled = false; // Disable Start button
- StartButton.Style = (Style)FindResource("DisabledButtonStyle");
+ Color = accentColor,
+ BlurRadius = 30, // Adjust blur radius for desired glow intensity
+ ShadowDepth = 0, // Set shadow depth to 0 for a pure glow effect
+ Opacity = 1, // Set opacity for glow visibility
+ Direction = 0 // Direction doesn't matter for glow
+ };
- // Add glow effect to the Start button
- StartButton.Effect = new DropShadowEffect
- {
- Color = accentColor,
- BlurRadius = 30, // Adjust blur radius for desired glow intensity
- ShadowDepth = 0, // Set shadow depth to 0 for a pure glow effect
- Opacity = 1, // Set opacity for glow visibility
- Direction = 0 // Direction doesn't matter for glow
- };
-
- StopButton.Style = (Style)FindResource("ButtonStyle");
- StopButton.IsEnabled = true; // Enable Stop button
- }
- else
- {
- // Reset Start button back to its original state
- StartButton.Content = "Start";
- StartButton.IsEnabled = true; // Enable Start button
-
- // Remove the glow effect from Start button
- StartButton.Effect = null;
-
- StopButton.Style = (Style)FindResource("DisabledButtonStyle");
- StartButton.Style = (Style)FindResource("ButtonStyle");
- StopButton.IsEnabled = false; // Disable Stop button
- }
+ StopButton.Style = (Style)FindResource("ButtonStyle");
+ StopButton.IsEnabled = true; // Enable Stop button
}
-
- public void StartButton_Click(object sender, RoutedEventArgs e)
+ else
{
- UpdateButtonState(true);
- string scriptPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "KillTrackR_MainScript.ps1");
- TailFileAsync(scriptPath);
+ // Reset Start button back to its original state
+ StartButton.Content = "Start";
+ StartButton.IsEnabled = true; // Enable Start button
+
+ // Remove the glow effect from Start button
+ StartButton.Effect = null;
+
+ StopButton.Style = (Style)FindResource("DisabledButtonStyle");
+ StartButton.Style = (Style)FindResource("ButtonStyle");
+ StopButton.IsEnabled = false; // Disable Stop button
}
+
+ RegisterUIEventHandlers();
+ }
- private async void TailFileAsync(string scriptPath)
- {
- await Task.Run(() =>
+ public void StartButton_Click(object sender, RoutedEventArgs e)
+ {
+ UpdateButtonState(true);
+ //string scriptPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "KillTrackR_MainScript.ps1");
+ // TailFileAsync(scriptPath);
+
+ // _logHandler = new LogHandler(@"U:\\StarCitizen\\StarCitizen\\LIVE\\Game.log");
+ _logHandler = new LogHandler(ConfigManager.LogFile);
+ _logHandler.Initialize();
+ }
+
+ private void RegisterUIEventHandlers()
+ {
+ if (_UIEventsRegistered)
+ return;
+
+ // Username
+ TrackREventDispatcher.PlayerLoginEvent += (username) => {
+ Dispatcher.Invoke(() =>
{
- try
- {
- ProcessStartInfo psi = new ProcessStartInfo
- {
- FileName = "powershell.exe",
- Arguments = $"-NoProfile -ExecutionPolicy Bypass -File \"{scriptPath}\"",
- WorkingDirectory = AppDomain.CurrentDomain.BaseDirectory,
- RedirectStandardOutput = true,
- RedirectStandardError = true,
- UseShellExecute = false,
- CreateNoWindow = true
- };
-
- runningProcess = new Process { StartInfo = psi }; // Store the process in the field
-
- runningProcess.OutputDataReceived += (s, e) =>
- {
- if (!string.IsNullOrEmpty(e.Data))
- {
- Dispatcher.Invoke(() =>
- {
- // Parse and display key-value pairs in the OutputTextBox
- if (e.Data.Contains("PlayerName="))
- {
- string pilotName = e.Data.Split('=')[1].Trim();
- PilotNameTextBox.Text = pilotName; // Update the Button's Content
- AdjustFontSize(PilotNameTextBox);
- }
- else if (e.Data.Contains("PlayerShip="))
- {
- string playerShip = e.Data.Split('=')[1].Trim();
- PlayerShipTextBox.Text = playerShip;
- AdjustFontSize(PlayerShipTextBox);
- }
- else if (e.Data.Contains("GameMode="))
- {
- string gameMode = e.Data.Split('=')[1].Trim();
- GameModeTextBox.Text = gameMode;
- AdjustFontSize(GameModeTextBox);
- }
- else if (e.Data.Contains("KillTally="))
- {
- string killTally = e.Data.Split('=')[1].Trim();
- KillTallyTextBox.Text = killTally;
- AdjustFontSize(KillTallyTextBox);
- }
- else if (e.Data.Contains("NewKill="))
- {
- // Parse the kill data
- var killData = e.Data.Split('=')[1].Trim(); // Assume the kill data follows after "NewKill="
- var killParts = killData.Split(',');
-
- // Fetch the dynamic resource for AltTextColor
- var altTextColorBrush = new SolidColorBrush((Color)Application.Current.Resources["AltTextColor"]);
- var accentColorBrush = new SolidColorBrush((Color)Application.Current.Resources["AccentColor"]);
-
- // Fetch the Orbitron FontFamily from resources
- var orbitronFontFamily = (FontFamily)Application.Current.Resources["Orbitron"];
- var gemunuFontFamily = (FontFamily)Application.Current.Resources["Gemunu"];
-
- // Create a new TextBlock for each kill
- var killTextBlock = new TextBlock
- {
- Margin = new Thickness(0, 10, 0, 10),
- Style = (Style)Application.Current.Resources["RoundedTextBlock"], // Apply style for text
- FontSize = 14,
- FontWeight = FontWeights.Bold,
- FontFamily = gemunuFontFamily,
- };
-
- // Add styled content using Run elements
- killTextBlock.Inlines.Add(new Run("Victim Name: ")
- {
- Foreground = altTextColorBrush,
- FontFamily = orbitronFontFamily,
- });
- killTextBlock.Inlines.Add(new Run($"{killParts[1]}\n"));
-
- // Repeat for other lines
- killTextBlock.Inlines.Add(new Run("Victim Ship: ")
- {
- Foreground = altTextColorBrush,
- FontFamily = orbitronFontFamily,
- });
- killTextBlock.Inlines.Add(new Run($"{killParts[2]}\n"));
-
- killTextBlock.Inlines.Add(new Run("Victim Org: ")
- {
- Foreground = altTextColorBrush,
- FontFamily = orbitronFontFamily,
- });
- killTextBlock.Inlines.Add(new Run($"{killParts[3]}\n"));
-
- killTextBlock.Inlines.Add(new Run("Join Date: ")
- {
- Foreground = altTextColorBrush,
- FontFamily = orbitronFontFamily,
- });
- killTextBlock.Inlines.Add(new Run($"{killParts[4]}\n"));
-
- killTextBlock.Inlines.Add(new Run("UEE Record: ")
- {
- Foreground = altTextColorBrush,
- FontFamily = orbitronFontFamily,
- });
- killTextBlock.Inlines.Add(new Run($"{killParts[5]}\n"));
-
- killTextBlock.Inlines.Add(new Run("Kill Time: ")
- {
- Foreground = altTextColorBrush,
- FontFamily = orbitronFontFamily,
- });
- killTextBlock.Inlines.Add(new Run($"{killParts[6]}"));
-
- // Create a Border and apply the RoundedTextBlockWithBorder style
- var killBorder = new Border
- {
- Style = (Style)Application.Current.Resources["RoundedTextBlockWithBorder"], // Apply border style
- };
-
- // Create a Grid to hold the TextBlock and the Image
- var killGrid = new Grid
- {
- Width = 400, // Adjust the width of the Grid
- Height = 130, // Adjust the height as needed
- };
-
- // Define two columns in the Grid: one for the text and one for the image
- killGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(3, GridUnitType.Star) }); // Text column
- killGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Auto) }); // Image column
-
- // Add the TextBlock to the first column of the Grid
- Grid.SetColumn(killTextBlock, 0);
- killGrid.Children.Add(killTextBlock);
-
- // Create the Image for the profile
- var profileImage = new Image
- {
- Source = new BitmapImage(new Uri(killParts[7])), // Assuming the 8th part contains the profile image URL
- Width = 90,
- Height = 90,
- Stretch = Stretch.Fill, // Adjust how the image fits
- };
-
- // Create a Border around the Image
- var imageBorder = new Border
- {
- BorderBrush = accentColorBrush, // Set the border color
- BorderThickness = new Thickness(2), // Set the border thickness
- Padding = new Thickness(0), // Optional padding inside the border
- CornerRadius = new CornerRadius(5),
- Margin = new Thickness(10,18,15,18),
- Child = profileImage // Set the Image as the content of the Border
- };
-
- // Add the Border (with the image inside) to the Grid
- Grid.SetColumn(imageBorder, 1);
- killGrid.Children.Add(imageBorder);
-
- // Set the Grid as the child of the Border
- killBorder.Child = killGrid;
-
- // Add the new Border to the StackPanel inside the Border
- KillFeedStackPanel.Children.Insert(0, killBorder);
- }
-
- else
- {
- DebugPanel.AppendText(e.Data + Environment.NewLine);
- }
- });
- }
- };
-
- runningProcess.ErrorDataReceived += (s, e) =>
- {
- if (!string.IsNullOrEmpty(e.Data))
- {
- Dispatcher.Invoke(() =>
- {
- DebugPanel.AppendText(e.Data + Environment.NewLine);
- });
- }
- };
-
- runningProcess.Start();
- runningProcess.BeginOutputReadLine();
- runningProcess.BeginErrorReadLine();
-
- runningProcess.WaitForExit();
- }
- catch (Exception ex)
- {
- Dispatcher.Invoke(() =>
- {
- MessageBox.Show($"Error running script: {ex.Message}");
- });
- }
+ PilotNameTextBox.Text = username;
+ AdjustFontSize(PilotNameTextBox);
+ LocalPlayerData.Username = username;
});
- }
-
- public void StopButton_Click(object sender, RoutedEventArgs e)
- {
- if (runningProcess != null && !runningProcess.HasExited)
+ };
+
+ // Ship
+ TrackREventDispatcher.InstancedInteriorEvent += (data) => {
+ if (data.OwnerGEID == LocalPlayerData.Username && data.Ship != null)
{
- // Kill the running process
- runningProcess.Kill();
- runningProcess = null; // Clear the reference to the process
+ Dispatcher.Invoke(() =>
+ {
+ PlayerShipTextBox.Text = data.Ship;
+ AdjustFontSize(PlayerShipTextBox);
+ LocalPlayerData.PlayerShip = data.Ship;
+ });
}
+ };
+
+ // Game Mode
+ TrackREventDispatcher.PlayerChangedGameModeEvent += (mode) => {
+ Dispatcher.Invoke(() =>
+ {
+ GameModeTextBox.Text = mode.ToString();
+ AdjustFontSize(GameModeTextBox);
+ LocalPlayerData.CurrentGameMode = mode;
+ });
+ };
+
+ // Game Version
+ TrackREventDispatcher.GameVersionEvent += (version) => {
+ LocalPlayerData.GameVersion = version;
+ };
+
+ // Actor Death
+ TrackREventDispatcher.ActorDeathEvent += async (data) => {
+ if (data.VictimPilot != LocalPlayerData.Username)
+ {
+ var playerData = await WebHandler.GetPlayerData(data.VictimPilot);
- // Clear the text boxes
- System.Threading.Thread.Sleep(200);
- PilotNameTextBox.Text = string.Empty;
- PlayerShipTextBox.Text = string.Empty;
- GameModeTextBox.Text = string.Empty;
- KillTallyTextBox.Text = string.Empty;
- KillFeedStackPanel.Children.Clear();
- }
+ if (playerData != null)
+ {
+ Dispatcher.Invoke(() => { AddKillToScreen(data, playerData); });
+ await WebHandler.SubmitKill(data, playerData);
+ }
+ }
+ };
+
+ _UIEventsRegistered = true;
+ }
- private void AdjustFontSize(TextBlock textBlock)
+ private void AddKillToScreen(ActorDeathData deathData, PlayerData? playerData)
+ {
+ // Fetch the dynamic resource for AltTextColor
+ var altTextColorBrush = new SolidColorBrush((Color)Application.Current.Resources["AltTextColor"]);
+ var accentColorBrush = new SolidColorBrush((Color)Application.Current.Resources["AccentColor"]);
+
+ // Fetch the Orbitron FontFamily from resources
+ var orbitronFontFamily = (FontFamily)Application.Current.Resources["Orbitron"];
+ var gemunuFontFamily = (FontFamily)Application.Current.Resources["Gemunu"];
+
+ // Create a new TextBlock for each kill
+ var killTextBlock = new TextBlock
{
- // Set a starting font size
- double fontSize = 14;
- double maxWidth = textBlock.Width;
+ Margin = new Thickness(0, 10, 0, 10),
+ Style = (Style)Application.Current.Resources["RoundedTextBlock"], // Apply style for text
+ FontSize = 14,
+ FontWeight = FontWeights.Bold,
+ FontFamily = gemunuFontFamily,
+ };
- if (string.IsNullOrEmpty(textBlock.Text) || double.IsNaN(maxWidth))
- return;
+ // Add styled content using Run elements
+ killTextBlock.Inlines.Add(new Run("Victim Name: ")
+ {
+ Foreground = altTextColorBrush,
+ FontFamily = orbitronFontFamily,
+ });
+ killTextBlock.Inlines.Add(new Run($"{deathData.VictimPilot}\n"));
- // Measure the rendered width of the text
- FormattedText formattedText = new FormattedText(
+ // Repeat for other lines
+ killTextBlock.Inlines.Add(new Run("Victim Ship: ")
+ {
+ Foreground = altTextColorBrush,
+ FontFamily = orbitronFontFamily,
+ });
+ killTextBlock.Inlines.Add(new Run($"{deathData.VictimShip}\n"));
+
+ killTextBlock.Inlines.Add(new Run("Victim Org: ")
+ {
+ Foreground = altTextColorBrush,
+ FontFamily = orbitronFontFamily,
+ });
+ killTextBlock.Inlines.Add(new Run($"{playerData?.OrgName}\n"));
+
+ killTextBlock.Inlines.Add(new Run("Join Date: ")
+ {
+ Foreground = altTextColorBrush,
+ FontFamily = orbitronFontFamily,
+ });
+ killTextBlock.Inlines.Add(new Run($"{playerData?.JoinDate}\n"));
+
+ killTextBlock.Inlines.Add(new Run("UEE Record: ")
+ {
+ Foreground = altTextColorBrush,
+ FontFamily = orbitronFontFamily,
+ });
+
+
+ const string dateFormatString = "dd MMM yyyy HH:mm";
+ var currentTime = DateTime.UtcNow.ToString(dateFormatString);
+
+ killTextBlock.Inlines.Add(new Run("Kill Time: ")
+ {
+ Foreground = altTextColorBrush,
+ FontFamily = orbitronFontFamily,
+ });
+ killTextBlock.Inlines.Add(new Run($"{currentTime}"));
+
+ // Create a Border and apply the RoundedTextBlockWithBorder style
+ var killBorder = new Border
+ {
+ Style = (Style)Application.Current.Resources["RoundedTextBlockWithBorder"], // Apply border style
+ };
+
+ // Create a Grid to hold the TextBlock and the Image
+ var killGrid = new Grid
+ {
+ Width = 400, // Adjust the width of the Grid
+ Height = 130, // Adjust the height as needed
+ };
+
+ // Define two columns in the Grid: one for the text and one for the image
+ killGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(3, GridUnitType.Star) }); // Text column
+ killGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Auto) }); // Image column
+
+ // Add the TextBlock to the first column of the Grid
+ Grid.SetColumn(killTextBlock, 0);
+ killGrid.Children.Add(killTextBlock);
+
+ // Create the Image for the profile
+ var profileImage = new Image
+ {
+ Source = new BitmapImage(new Uri(playerData?.PFPURL)), // Assuming the 8th part contains the profile image URL
+ Width = 90,
+ Height = 90,
+ Stretch = Stretch.Fill, // Adjust how the image fits
+ };
+
+ // Create a Border around the Image
+ var imageBorder = new Border
+ {
+ BorderBrush = accentColorBrush, // Set the border color
+ BorderThickness = new Thickness(2), // Set the border thickness
+ Padding = new Thickness(0), // Optional padding inside the border
+ CornerRadius = new CornerRadius(5),
+ Margin = new Thickness(10,18,15,18),
+ Child = profileImage // Set the Image as the content of the Border
+ };
+
+ // Add the Border (with the image inside) to the Grid
+ Grid.SetColumn(imageBorder, 1);
+ killGrid.Children.Add(imageBorder);
+
+ // Set the Grid as the child of the Border
+ killBorder.Child = killGrid;
+
+ // Add the new Border to the StackPanel inside the Border
+ Dispatcher.Invoke(() =>
+ {
+ KillFeedStackPanel.Children.Insert(0, killBorder);
+ });
+ }
+
+ public void StopButton_Click(object sender, RoutedEventArgs e)
+ {
+ _logHandler.Stop();
+
+ // Clear the text boxes
+ System.Threading.Thread.Sleep(200);
+ PilotNameTextBox.Text = string.Empty;
+ PlayerShipTextBox.Text = string.Empty;
+ GameModeTextBox.Text = string.Empty;
+ KillTallyTextBox.Text = string.Empty;
+ KillFeedStackPanel.Children.Clear();
+ }
+
+ private void AdjustFontSize(TextBlock textBlock)
+ {
+ // Set a starting font size
+ double fontSize = 14;
+ double maxWidth = textBlock.Width;
+
+ if (string.IsNullOrEmpty(textBlock.Text) || double.IsNaN(maxWidth))
+ return;
+
+ // Measure the rendered width of the text
+ FormattedText formattedText = new FormattedText(
+ textBlock.Text,
+ CultureInfo.CurrentCulture,
+ FlowDirection.LeftToRight,
+ new Typeface(textBlock.FontFamily, textBlock.FontStyle, textBlock.FontWeight, textBlock.FontStretch),
+ fontSize,
+ textBlock.Foreground,
+ VisualTreeHelper.GetDpi(this).PixelsPerDip
+ );
+
+ // Reduce font size until text fits within the width
+ while (formattedText.Width > maxWidth && fontSize > 6)
+ {
+ fontSize -= 0.5;
+ formattedText = new FormattedText(
textBlock.Text,
CultureInfo.CurrentCulture,
FlowDirection.LeftToRight,
@@ -314,24 +318,9 @@ namespace AutoTrackR2
textBlock.Foreground,
VisualTreeHelper.GetDpi(this).PixelsPerDip
);
-
- // Reduce font size until text fits within the width
- while (formattedText.Width > maxWidth && fontSize > 6)
- {
- fontSize -= 0.5;
- formattedText = new FormattedText(
- textBlock.Text,
- CultureInfo.CurrentCulture,
- FlowDirection.LeftToRight,
- new Typeface(textBlock.FontFamily, textBlock.FontStyle, textBlock.FontWeight, textBlock.FontStretch),
- fontSize,
- textBlock.Foreground,
- VisualTreeHelper.GetDpi(this).PixelsPerDip
- );
- }
-
- // Apply the adjusted font size
- textBlock.FontSize = fontSize;
}
+
+ // Apply the adjusted font size
+ textBlock.FontSize = fontSize;
}
}
diff --git a/AutoTrackR2/LocalPlayerData.cs b/AutoTrackR2/LocalPlayerData.cs
new file mode 100644
index 0000000..668ebcd
--- /dev/null
+++ b/AutoTrackR2/LocalPlayerData.cs
@@ -0,0 +1,17 @@
+namespace AutoTrackR2;
+
+
+public enum GameMode
+{
+ ArenaCommander,
+ PersistentUniverse
+}
+
+public static class LocalPlayerData
+{
+ public static string? Username;
+ public static string? PlayerShip;
+ public static string? GameVersion;
+ public static GameMode CurrentGameMode;
+ public static string? LastSeenVehicleLocation;
+}
\ No newline at end of file
diff --git a/AutoTrackR2/LogEventHandlers/ActorDeathEvent.cs b/AutoTrackR2/LogEventHandlers/ActorDeathEvent.cs
new file mode 100644
index 0000000..5dee7f3
--- /dev/null
+++ b/AutoTrackR2/LogEventHandlers/ActorDeathEvent.cs
@@ -0,0 +1,59 @@
+using System.Text.RegularExpressions;
+
+namespace AutoTrackR2.LogEventHandlers;
+
+public struct ActorDeathData
+{
+ public string VictimPilot;
+ public string VictimShip;
+ public string Player;
+ public string Weapon;
+ public string Class;
+ public string DamageType;
+ public string Timestamp;
+}
+
+public class ActorDeathEvent : ILogEventHandler
+{
+ public Regex Pattern { get; }
+ public ActorDeathEvent()
+ {
+ Pattern = new Regex(@"<Actor Death> CActor::Kill: '(?<EnemyPilot>[^']+)' \[\d+\] in zone '(?<EnemyShip>[^']+)' killed by '(?<Player>[^']+)' \[[^']+\] using '(?<Weapon>[^']+)' \[Class (?<Class>[^\]]+)\] with damage type '(?<DamageType>[^']+)");
+ }
+
+ Regex cleanUpPattern = new Regex(@"^(.+?)_\d+$");
+
+ public void Handle(LogEntry entry)
+ {
+ if (entry.Message is null) return;
+
+ var match = Pattern.Match(entry.Message);
+ if (!match.Success) return;
+
+ var data = new ActorDeathData {
+ VictimPilot = match.Groups["EnemyPilot"].Value,
+ VictimShip = match.Groups["EnemyShip"].Value,
+ Player = match.Groups["Player"].Value,
+ Weapon = match.Groups["Weapon"].Value,
+ Class = match.Groups["Class"].Value,
+ DamageType = match.Groups["DamageType"].Value,
+ Timestamp = entry.Timestamp.ToString("yyyy-MM-dd HH:mm:ss")
+ };
+
+ if (cleanUpPattern.IsMatch(data.VictimShip))
+ {
+ data.VictimShip = cleanUpPattern.Match(data.VictimShip).Groups[1].Value;
+ }
+
+ if (cleanUpPattern.IsMatch(data.Weapon))
+ {
+ data.Weapon = cleanUpPattern.Match(data.Weapon).Groups[1].Value;
+ }
+
+
+ TrackREventDispatcher.OnActorDeathEvent(data);
+
+ }
+
+
+}
\ No newline at end of file
diff --git a/AutoTrackR2/LogEventHandlers/GameVersionEvent.cs b/AutoTrackR2/LogEventHandlers/GameVersionEvent.cs
new file mode 100644
index 0000000..abeca73
--- /dev/null
+++ b/AutoTrackR2/LogEventHandlers/GameVersionEvent.cs
@@ -0,0 +1,21 @@
+using System.Text.RegularExpressions;
+
+namespace AutoTrackR2.LogEventHandlers;
+
+public class GameVersionEvent : ILogEventHandler
+{
+ public Regex Pattern { get; }
+
+ public GameVersionEvent()
+ {
+ Pattern = new Regex(@"--system-trace-env-id='pub-sc-alpha-(?<GameVersion>\d{3,4}-\d{7})'");
+ }
+ public void Handle(LogEntry entry)
+ {
+ if (entry.Message is null) return;
+ var match = Pattern.Match(entry.Message);
+ if (!match.Success) return;
+
+ TrackREventDispatcher.OnGameVersionEvent(match.Groups["GameVersion"].Value);
+ }
+}
\ No newline at end of file
diff --git a/AutoTrackR2/LogEventHandlers/ILogEventHandler.cs b/AutoTrackR2/LogEventHandlers/ILogEventHandler.cs
new file mode 100644
index 0000000..adaf1ba
--- /dev/null
+++ b/AutoTrackR2/LogEventHandlers/ILogEventHandler.cs
@@ -0,0 +1,10 @@
+using System.Text.RegularExpressions;
+
+namespace AutoTrackR2.LogEventHandlers;
+
+public interface ILogEventHandler
+{
+ Regex Pattern { get; }
+ void Handle(LogEntry entry);
+
+}
\ No newline at end of file
diff --git a/AutoTrackR2/LogEventHandlers/InArenaCommanderEvent.cs b/AutoTrackR2/LogEventHandlers/InArenaCommanderEvent.cs
new file mode 100644
index 0000000..defdd4c
--- /dev/null
+++ b/AutoTrackR2/LogEventHandlers/InArenaCommanderEvent.cs
@@ -0,0 +1,22 @@
+using System.Text.RegularExpressions;
+
+namespace AutoTrackR2.LogEventHandlers;
+
+public class InArenaCommanderEvent : ILogEventHandler
+{
+ public Regex Pattern { get; }
+
+ public InArenaCommanderEvent()
+ {
+ Pattern = new Regex("Requesting Mode Change");
+ }
+
+ public void Handle(LogEntry entry)
+ {
+ if (entry.Message is null) return;
+ var match = Pattern.Match(entry.Message);
+ if (!match.Success) return;
+
+ TrackREventDispatcher.OnPlayerChangedGameModeEvent(GameMode.ArenaCommander);
+ }
+}
\ No newline at end of file
diff --git a/AutoTrackR2/LogEventHandlers/InPersistentUniverseEvent.cs b/AutoTrackR2/LogEventHandlers/InPersistentUniverseEvent.cs
new file mode 100644
index 0000000..2f7c53e
--- /dev/null
+++ b/AutoTrackR2/LogEventHandlers/InPersistentUniverseEvent.cs
@@ -0,0 +1,22 @@
+using System.Text.RegularExpressions;
+
+namespace AutoTrackR2.LogEventHandlers;
+
+public class InPersistentUniverseEvent : ILogEventHandler
+{
+ public Regex Pattern { get; }
+
+ public InPersistentUniverseEvent()
+ {
+ Pattern = new Regex(@"<\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z> \[Notice\] <ContextEstablisherTaskFinished> establisher=""CReplicationModel"" message=""CET completed"" taskname=""StopLoadingScreen"" state=[^\s()]+\(\d+\) status=""Finished"" runningTime=\d+\.\d+ numRuns=\d+ map=""megamap"" gamerules=""SC_Default"" sessionId=""[a-f0-9\-]+"" \[Team_Network\]\[Network\]\[Replication\]\[Loading\]\[Persistence\]");
+ }
+
+ public void Handle(LogEntry entry)
+ {
+ if (entry.Message is null) return;
+ var match = Pattern.Match(entry.Message);
+ if (!match.Success) return;
+
+ TrackREventDispatcher.OnPlayerChangedGameModeEvent(GameMode.PersistentUniverse);
+ }
+}
\ No newline at end of file
diff --git a/AutoTrackR2/LogEventHandlers/InstancedInteriorEvent.cs b/AutoTrackR2/LogEventHandlers/InstancedInteriorEvent.cs
new file mode 100644
index 0000000..62ab732
--- /dev/null
+++ b/AutoTrackR2/LogEventHandlers/InstancedInteriorEvent.cs
@@ -0,0 +1,77 @@
+using System.Text.RegularExpressions;
+
+namespace AutoTrackR2.LogEventHandlers;
+
+public struct InstancedInteriorData
+{
+ public string Entity;
+ public string OwnerGEID;
+ public string ManagerGEID;
+ public string InstancedInterior;
+ public string? Ship;
+}
+
+// A ship loadout has been changed
+public class InstancedInteriorEvent : ILogEventHandler
+{
+ public Regex Pattern { get; }
+
+ private Regex _shipManufacturerPattern;
+ private Regex _cleanUpPattern = new Regex(@"(.+?)_\d+$");
+
+ private List<string> _shipManufacturers = new List<string>
+ {
+ "ORIG",
+ "CRUS",
+ "RSI",
+ "AEGS",
+ "VNCL",
+ "DRAK",
+ "ANVL",
+ "BANU",
+ "MISC",
+ "CNOU",
+ "XIAN",
+ "GAMA",
+ "TMBL",
+ "ESPR",
+ "KRIG",
+ "GRIN",
+ "XNAA",
+ "MRAI"
+ };
+
+ public InstancedInteriorEvent()
+ {
+ Pattern = new Regex(@"\[InstancedInterior\] OnEntityLeaveZone - InstancedInterior \[(?<InstancedInterior>[^\]]+)\] \[\d+\] -> Entity \[(?<Entity>[^\]]+)\] \[\d+\] -- m_openDoors\[\d+\], m_managerGEID\[(?<ManagerGEID>\d+)\], m_ownerGEID\[(?<OwnerGEID>[^\[]+)\]");
+ _shipManufacturerPattern = new Regex($"^({string.Join("|", _shipManufacturers)})");
+ }
+
+ public void Handle(LogEntry entry)
+ {
+ if (entry.Message is null) return;
+ var match = Pattern.Match(entry.Message);
+ if (!match.Success) return;
+
+ var data = new InstancedInteriorData {
+ Entity = match.Groups["Entity"].Value,
+ OwnerGEID = match.Groups["OwnerGEID"].Value,
+ ManagerGEID = match.Groups["ManagerGEID"].Value,
+ InstancedInterior = match.Groups["InstancedInterior"].Value,
+ };
+
+ match = _shipManufacturerPattern.Match(data.Entity);
+ if (match.Success)
+ {
+ match = _cleanUpPattern.Match(data.Entity);
+ if (match.Success)
+ {
+ data.Ship = match.Groups[1].Value;
+ }
+ }
+
+ TrackREventDispatcher.OnInstancedInteriorEvent(data);
+
+ }
+
+}
\ No newline at end of file
diff --git a/AutoTrackR2/LogEventHandlers/LoginEvent.cs b/AutoTrackR2/LogEventHandlers/LoginEvent.cs
new file mode 100644
index 0000000..e6f9cc4
--- /dev/null
+++ b/AutoTrackR2/LogEventHandlers/LoginEvent.cs
@@ -0,0 +1,24 @@
+using System.Text.RegularExpressions;
+
+namespace AutoTrackR2.LogEventHandlers;
+
+// Local player has logged in
+public class LoginEvent : ILogEventHandler
+{
+ public Regex Pattern { get; }
+
+ public LoginEvent()
+ {
+ Pattern = new Regex(@"\[Notice\] <Legacy login response> \[CIG-net\] User Login Success - Handle\[(?<Player>[A-Za-z0-9_-]+)\]");
+ }
+
+ public void Handle(LogEntry entry)
+ {
+ if (entry.Message is null) return;
+
+ var match = Pattern.Match(entry.Message);
+ if (!match.Success) return;
+
+ TrackREventDispatcher.OnPlayerLoginEvent(match.Groups["Player"].Value);
+ }
+}
\ No newline at end of file
diff --git a/AutoTrackR2/LogEventHandlers/VehicleDestructionEvent.cs b/AutoTrackR2/LogEventHandlers/VehicleDestructionEvent.cs
new file mode 100644
index 0000000..041859a
--- /dev/null
+++ b/AutoTrackR2/LogEventHandlers/VehicleDestructionEvent.cs
@@ -0,0 +1,59 @@
+using System.Text.RegularExpressions;
+
+namespace AutoTrackR2.LogEventHandlers;
+
+public struct VehicleDestructionData
+{
+ public string Vehicle { get; set; }
+ public string VehicleZone { get; set; }
+ public float PosX { get; set; }
+ public float PosY { get; set; }
+ public float PosZ { get; set; }
+ public string Driver { get; set; }
+ public int DestroyLevelFrom { get; set; }
+ public int DestroyLevelTo { get; set; }
+ public string CausedBy { get; set; }
+ public string DamageType { get; set; }
+}
+
+public class VehicleDestructionEvent : ILogEventHandler
+{
+ public Regex Pattern { get; }
+
+ public VehicleDestructionEvent()
+ {
+ Pattern = new Regex("""
+ "<(?<timestamp>[^>]+)> \[Notice\] <Vehicle Destruction> CVehicle::OnAdvanceDestroyLevel: " +
+ "Vehicle '(?<vehicle>[^']+)' \[\d+\] in zone '(?<vehicle_zone>[^']+)' " +
+ "\[pos x: (?<pos_x>[-\d\.]+), y: (?<pos_y>[-\d\.]+), z: (?<pos_z>[-\d\.]+) " +
+ "vel x: [^,]+, y: [^,]+, z: [^\]]+\] driven by '(?<driver>[^']+)' \[\d+\] " +
+ "advanced from destroy level (?<destroy_level_from>\d+) to (?<destroy_level_to>\d+) " +
+ "caused by '(?<caused_by>[^']+)' \[\d+\] with '(?<damage_type>[^']+)'"
+ """);
+ }
+
+ public void Handle(LogEntry entry)
+ {
+ var match = Pattern.Match(entry.Message);
+ if (!match.Success)
+ {
+ return;
+ }
+
+ var data = new VehicleDestructionData
+ {
+ Vehicle = match.Groups["vehicle"].Value,
+ VehicleZone = match.Groups["vehicle_zone"].Value,
+ PosX = float.Parse(match.Groups["pos_x"].Value),
+ PosY = float.Parse(match.Groups["pos_y"].Value),
+ PosZ = float.Parse(match.Groups["pos_z"].Value),
+ Driver = match.Groups["driver"].Value,
+ DestroyLevelFrom = int.Parse(match.Groups["destroy_level_from"].Value),
+ DestroyLevelTo = int.Parse(match.Groups["destroy_level_to"].Value),
+ CausedBy = match.Groups["caused_by"].Value,
+ DamageType = match.Groups["damage_type"].Value,
+ };
+
+ TrackREventDispatcher.OnVehicleDestructionEvent(data);
+ }
+}
\ No newline at end of file
diff --git a/AutoTrackR2/LogHandler.cs b/AutoTrackR2/LogHandler.cs
new file mode 100644
index 0000000..0bff5dc
--- /dev/null
+++ b/AutoTrackR2/LogHandler.cs
@@ -0,0 +1,101 @@
+using System.IO;
+using System.Text.RegularExpressions;
+using AutoTrackR2.LogEventHandlers;
+
+namespace AutoTrackR2;
+
+
+// Represents a single log entry
+// This is the object that will be passed to each handler, mostly for convenience
+public class LogEntry
+{
+ public DateTime Timestamp { get; set; }
+ public required string? Message { get; set; }
+
+}
+public class LogHandler(string logPath)
+{
+ private readonly string? _logPath = logPath;
+ private FileStream? _fileStream;
+ private StreamReader? _reader;
+
+ private CancellationTokenSource cancellationToken = new CancellationTokenSource();
+ Thread? monitorThread;
+
+ // Handlers that should be run on every log entry
+ // Overlap with _startupEventHandlers is fine
+ private readonly List<ILogEventHandler> _eventHandlers = [
+ new LoginEvent(),
+ new InstancedInteriorEvent(),
+ new InArenaCommanderEvent(),
+ new InPersistentUniverseEvent(),
+ new GameVersionEvent(),
+ ];
+
+ // Initialize the LogHandler and run all startup handlers
+ public void Initialize()
+ {
+ if (!File.Exists(_logPath))
+ {
+ throw new FileNotFoundException("Log file not found", _logPath);
+ }
+
+ _fileStream = new FileStream(_logPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+ _reader = new StreamReader(_fileStream);
+
+ while (_reader.ReadLine() is { } line)
+ {
+ HandleLogEntry(line);
+ }
+
+ // Ensures that any deaths already in log aren't sent to the APIs until the monitor thread is running
+ _eventHandlers.Add(new ActorDeathEvent());
+
+ monitorThread = new Thread(() => MonitorLog(cancellationToken.Token));
+ monitorThread.Start();
+ }
+
+ public void Stop()
+ {
+ // Stop the monitor thread
+ cancellationToken?.Cancel();
+ _reader?.Close();
+ _fileStream?.Close();
+ }
+
+ // Parse a single line of the log file and run matching handlers
+ private void HandleLogEntry(string line)
+ {
+ foreach (var handler in _eventHandlers)
+ {
+ var match = handler.Pattern.Match(line);
+ if (!match.Success) continue;
+
+ var entry = new LogEntry
+ {
+ Timestamp = DateTime.Now,
+ Message = line
+ };
+ handler.Handle(entry);
+ break;
+ }
+ }
+
+ private void MonitorLog(CancellationToken token)
+ {
+ while (!token.IsCancellationRequested)
+ {
+ if (_reader?.ReadLine() is { } line)
+ {
+ HandleLogEntry(line);
+ Console.WriteLine(line);
+ }
+ else
+ {
+ // Wait for new lines to be written to the log file
+ Thread.Sleep(1000);
+ }
+ }
+ Console.WriteLine("Monitor thread stopped");
+ }
+}
\ No newline at end of file
diff --git a/AutoTrackR2/TrackREventDispatcher.cs b/AutoTrackR2/TrackREventDispatcher.cs
new file mode 100644
index 0000000..8b3f12d
--- /dev/null
+++ b/AutoTrackR2/TrackREventDispatcher.cs
@@ -0,0 +1,49 @@
+using AutoTrackR2.LogEventHandlers;
+
+namespace AutoTrackR2;
+
+public static class TrackREventDispatcher
+{
+ // Local Player Login
+ public static event Action<string>? PlayerLoginEvent;
+ public static void OnPlayerLoginEvent(string playerName)
+ {
+ PlayerLoginEvent?.Invoke(playerName);
+ }
+
+ // An instanced interior has changed
+ // Example: Player enters/leaves a ship
+ public static event Action<InstancedInteriorData>? InstancedInteriorEvent;
+ public static void OnInstancedInteriorEvent(InstancedInteriorData data)
+ {
+ InstancedInteriorEvent?.Invoke(data);
+ }
+
+ // Player changed GameMode (AC or PU)
+ public static event Action<GameMode>? PlayerChangedGameModeEvent;
+ public static void OnPlayerChangedGameModeEvent(GameMode mode)
+ {
+ PlayerChangedGameModeEvent?.Invoke(mode);
+ }
+
+ // Game version has been detected
+ public static event Action<string>? GameVersionEvent;
+ public static void OnGameVersionEvent(string value)
+ {
+ GameVersionEvent?.Invoke(value);
+ }
+
+ // Actor has died
+ public static event Action<ActorDeathData>? ActorDeathEvent;
+ public static void OnActorDeathEvent(ActorDeathData data)
+ {
+ ActorDeathEvent?.Invoke(data);
+ }
+
+ // Vehicle has been destroyed
+ public static event Action<VehicleDestructionData>? VehicleDestructionEvent;
+ public static void OnVehicleDestructionEvent(VehicleDestructionData data)
+ {
+ VehicleDestructionEvent?.Invoke(data);
+ }
+}
\ No newline at end of file
diff --git a/AutoTrackR2/UpdatePage.xaml.cs b/AutoTrackR2/UpdatePage.xaml.cs
index 11f4d24..75d9e70 100644
--- a/AutoTrackR2/UpdatePage.xaml.cs
+++ b/AutoTrackR2/UpdatePage.xaml.cs
@@ -9,7 +9,7 @@ namespace AutoTrackR2
{
public partial class UpdatePage : UserControl
{
- private string currentVersion = "v2.07";
+ public static string currentVersion = "v2.08";
private string latestVersion;
public UpdatePage()
diff --git a/AutoTrackR2/WebHandler.cs b/AutoTrackR2/WebHandler.cs
new file mode 100644
index 0000000..73740e3
--- /dev/null
+++ b/AutoTrackR2/WebHandler.cs
@@ -0,0 +1,102 @@
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using System.Text.RegularExpressions;
+using AutoTrackR2.LogEventHandlers;
+
+namespace AutoTrackR2;
+
+public static class WebHandler
+{
+ class APIKillData
+ {
+ public string? victim_ship { get; set; }
+ public string? victim{ get; set; }
+ public string? enlisted{ get; set; }
+ public string? rsi{ get; set; }
+ public string? weapon{ get; set; }
+ public string? method{ get; set; }
+ public string? loadout_ship{ get; set; }
+ public string? game_version{ get; set; }
+ public string? gamemode{ get; set; }
+ public string? trackr_version{ get; set; }
+ public string? location{ get; set; }
+ }
+
+ public static async Task<PlayerData?> GetPlayerData(string enemyPilot)
+ {
+ var joinDataPattern = new Regex("<span class=\"label\">Enlisted</span>\\s*<strong class=\"value\">([^<]+)</strong>");
+ var ueePattern = new Regex("<p class=\"entry citizen-record\">\\s*<span class=\"label\">UEE Citizen Record<\\/span>\\s*<strong class=\"value\">#?(n\\/a|\\d+)<\\/strong>\\s*<\\/p>");
+ var orgPattern = new Regex("\\/orgs\\/(?<OrgURL>[A-z0-9]+)\" .*\\>(?<OrgName>.*)<");
+ var pfpPattern = new Regex("/media/(.*)\"");
+
+ // Make web request to check player data
+ var playerData = new PlayerData();
+ var httpClient = new HttpClient();
+ var response = await httpClient.GetAsync($"https://robertsspaceindustries.com/en/citizens/{enemyPilot}");
+
+ if (response.StatusCode != HttpStatusCode.OK)
+ {
+ return null;
+ }
+
+ var content = await response.Content.ReadAsStringAsync();
+ var joinDataMatch = joinDataPattern.Match(content);
+ if (joinDataMatch.Success)
+ {
+ playerData.JoinDate = joinDataMatch.Groups[1].Value;
+ }
+
+ var ueeMatch = ueePattern.Match(content);
+ if (ueeMatch.Success)
+ {
+ playerData.UEERecord = ueeMatch.Groups[1].Value;
+ }
+
+ var orgMatch = orgPattern.Match(content);
+ if (orgMatch.Success)
+ {
+ playerData.OrgName = orgMatch.Groups["OrgName"].Value;
+ playerData.OrgURL = "https://robertsspaceindustries.com/en/orgs/" + orgMatch.Groups["OrgURL"].Value;
+ }
+
+ var pfpMatch = pfpPattern.Match(content);
+ if (pfpMatch.Success)
+ {
+ var match = pfpMatch.Groups[1].Value;
+ if (match.Contains("heap_thumb"))
+ {
+ playerData.PFPURL = "https://cdn.robertsspaceindustries.com/static/images/account/avatar_default_big.jpg";
+ }
+ else
+ {
+ playerData.PFPURL = "https://robertsspaceindustries.com/media/" + pfpMatch.Groups[1].Value;
+ }
+ }
+
+ return playerData;
+ }
+
+ public static async Task SubmitKill(ActorDeathData deathData, PlayerData? enemyPlayerData)
+ {
+ var killData = new APIKillData
+ {
+ victim_ship = deathData.VictimShip,
+ victim = deathData.VictimPilot,
+ enlisted = enemyPlayerData?.JoinDate,
+ rsi = enemyPlayerData?.UEERecord,
+ weapon = deathData.Weapon,
+ method = deathData.DamageType,
+ loadout_ship = LocalPlayerData.PlayerShip ?? "Unknown",
+ game_version = LocalPlayerData.GameVersion ?? "Unknown",
+ gamemode = LocalPlayerData.CurrentGameMode.ToString() ?? "Unknown",
+ trackr_version = UpdatePage.currentVersion ?? "Unknown",
+ location = LocalPlayerData.LastSeenVehicleLocation ?? "Unknown"
+ };
+
+ var httpClient = new HttpClient();
+ string jsonData = JsonSerializer.Serialize(killData);
+ await httpClient.PostAsync(ConfigManager.ApiUrl + "/register-kill", new StringContent(jsonData, Encoding.UTF8, "application/json"));
+ }
+}
\ No newline at end of file
From c6e6a7e6bdd35019a79582364ac49072d1c1c716 Mon Sep 17 00:00:00 2001
From: Dork Normalize <nope>
Date: Fri, 28 Mar 2025 00:37:15 -0700
Subject: [PATCH 02/11] Fix APIcalls
---
AutoTrackR2/HomePage.xaml.cs | 5 +++++
AutoTrackR2/LogHandler.cs | 2 +-
AutoTrackR2/WebHandler.cs | 21 +++++++++++++++++----
3 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/AutoTrackR2/HomePage.xaml.cs b/AutoTrackR2/HomePage.xaml.cs
index 73918ca..ccd42ab 100644
--- a/AutoTrackR2/HomePage.xaml.cs
+++ b/AutoTrackR2/HomePage.xaml.cs
@@ -147,6 +147,11 @@ public partial class HomePage : UserControl
}
};
+ // Vehicle Destruction
+ TrackREventDispatcher.VehicleDestructionEvent += (data) => {
+ LocalPlayerData.LastSeenVehicleLocation = data.VehicleZone;
+ };
+
_UIEventsRegistered = true;
}
diff --git a/AutoTrackR2/LogHandler.cs b/AutoTrackR2/LogHandler.cs
index 0bff5dc..ce2f0ba 100644
--- a/AutoTrackR2/LogHandler.cs
+++ b/AutoTrackR2/LogHandler.cs
@@ -29,7 +29,7 @@ public class LogHandler(string logPath)
new InstancedInteriorEvent(),
new InArenaCommanderEvent(),
new InPersistentUniverseEvent(),
- new GameVersionEvent(),
+ new GameVersionEvent()
];
// Initialize the LogHandler and run all startup handlers
diff --git a/AutoTrackR2/WebHandler.cs b/AutoTrackR2/WebHandler.cs
index 73740e3..c46d192 100644
--- a/AutoTrackR2/WebHandler.cs
+++ b/AutoTrackR2/WebHandler.cs
@@ -51,7 +51,7 @@ public static class WebHandler
var ueeMatch = ueePattern.Match(content);
if (ueeMatch.Success)
{
- playerData.UEERecord = ueeMatch.Groups[1].Value;
+ playerData.UEERecord = ueeMatch.Groups[1].Value == "n/a" ? "-1" : ueeMatch.Groups[1].Value;
}
var orgMatch = orgPattern.Match(content);
@@ -88,15 +88,28 @@ public static class WebHandler
rsi = enemyPlayerData?.UEERecord,
weapon = deathData.Weapon,
method = deathData.DamageType,
+ // loadout_ship = LocalPlayerData.PlayerShip ?? "Unknown",
loadout_ship = LocalPlayerData.PlayerShip ?? "Unknown",
game_version = LocalPlayerData.GameVersion ?? "Unknown",
- gamemode = LocalPlayerData.CurrentGameMode.ToString() ?? "Unknown",
- trackr_version = UpdatePage.currentVersion ?? "Unknown",
+ trackr_version = UpdatePage.currentVersion.Replace("v", "") ?? "Unknown",
location = LocalPlayerData.LastSeenVehicleLocation ?? "Unknown"
};
+ switch (LocalPlayerData.CurrentGameMode)
+ {
+ case GameMode.PersistentUniverse:
+ killData.gamemode = "pu";
+ break;
+ case GameMode.ArenaCommander:
+ killData.gamemode = "ac";
+ break;
+ }
+
var httpClient = new HttpClient();
string jsonData = JsonSerializer.Serialize(killData);
- await httpClient.PostAsync(ConfigManager.ApiUrl + "/register-kill", new StringContent(jsonData, Encoding.UTF8, "application/json"));
+ httpClient.DefaultRequestHeaders.Add("Authorization", "Bearer " + ConfigManager.ApiKey);
+ httpClient.DefaultRequestHeaders.Add("User-Agent", "AutoTrackR2");
+ httpClient.DefaultRequestHeaders.Add("Accept", "application/json");
+ await httpClient.PostAsync(ConfigManager.ApiUrl + "register-kill", new StringContent(jsonData, Encoding.UTF8, "application/json"));
}
}
\ No newline at end of file
From d6ce48b47538ff53db79f6ba61426f10fc0bc1c4 Mon Sep 17 00:00:00 2001
From: Dork Normalize <nope>
Date: Fri, 28 Mar 2025 17:01:03 -0700
Subject: [PATCH 03/11] Implement KillHistory CSV functionality
---
AutoTrackR2/HomePage.xaml.cs | 98 ++++++++++++++++++-------------
AutoTrackR2/KillHistoryManager.cs | 83 ++++++++++++++++++++++++++
AutoTrackR2/MainWindow.xaml.cs | 12 ++++
AutoTrackR2/Util.cs | 31 ++++++++++
4 files changed, 182 insertions(+), 42 deletions(-)
create mode 100644 AutoTrackR2/KillHistoryManager.cs
create mode 100644 AutoTrackR2/Util.cs
diff --git a/AutoTrackR2/HomePage.xaml.cs b/AutoTrackR2/HomePage.xaml.cs
index ccd42ab..fe47e59 100644
--- a/AutoTrackR2/HomePage.xaml.cs
+++ b/AutoTrackR2/HomePage.xaml.cs
@@ -5,38 +5,31 @@ using System.Windows.Media;
using System.Windows.Media.Effects;
using System.Windows.Documents;
using System.Globalization;
+using System.IO;
+using System.Text;
using System.Windows.Media.Imaging;
using AutoTrackR2.LogEventHandlers;
namespace AutoTrackR2;
-public struct PlayerData
-{
- public string? PFPURL;
- public string? UEERecord;
- public string? OrgURL;
- public string? OrgName;
- public string? JoinDate;
-}
-
public partial class HomePage : UserControl
{
+ private Process runningProcess; // Field to store the running process
+ private LogHandler? _logHandler;
+ private KillHistoryManager _killHistoryManager;
+ private bool _UIEventsRegistered = false;
+
public HomePage()
{
InitializeComponent();
-
- // Get the current month
- string currentMonth = DateTime.Now.ToString("MMMM", CultureInfo.InvariantCulture);
+
+ _killHistoryManager = new KillHistoryManager(ConfigManager.KillHistoryFile);
// Set the TextBlock text
- KillTallyTitle.Text = $"Kill Tally - {currentMonth}";
+ KillTallyTitle.Text = $"Kill Tally - {_killHistoryManager.GetKillsInCurrentMonth().Count}";
+ AddKillHistoryKillsToUI();
}
-
- private Process runningProcess; // Field to store the running process
- private LogHandler _logHandler;
- private bool _UIEventsRegistered = false;
-
-
+
// Update Start/Stop button states based on the isRunning flag
public void UpdateButtonState(bool isRunning)
{
@@ -89,6 +82,15 @@ public partial class HomePage : UserControl
_logHandler = new LogHandler(ConfigManager.LogFile);
_logHandler.Initialize();
}
+
+ private void AddKillHistoryKillsToUI()
+ {
+ var kills = _killHistoryManager.GetKills();
+ foreach (var kill in kills)
+ {
+ Dispatcher.Invoke(() => { AddKillToScreen(kill); });
+ }
+ }
private void RegisterUIEventHandlers()
{
@@ -134,15 +136,31 @@ public partial class HomePage : UserControl
};
// Actor Death
- TrackREventDispatcher.ActorDeathEvent += async (data) => {
- if (data.VictimPilot != LocalPlayerData.Username)
+ TrackREventDispatcher.ActorDeathEvent += async (actorDeathData) => {
+ if (actorDeathData.VictimPilot != LocalPlayerData.Username)
{
- var playerData = await WebHandler.GetPlayerData(data.VictimPilot);
+ var playerData = await WebHandler.GetPlayerData(actorDeathData.VictimPilot);
if (playerData != null)
{
- Dispatcher.Invoke(() => { AddKillToScreen(data, playerData); });
- await WebHandler.SubmitKill(data, playerData);
+ var killData = new KillData
+ {
+ EnemyPilot = actorDeathData.VictimPilot,
+ EnemyShip = actorDeathData.VictimShip,
+ OrgAffiliation = playerData?.OrgName,
+ Enlisted = playerData?.JoinDate,
+ KillTime = DateTime.UtcNow.ToString("dd MMM yyyy HH:mm"),
+ PFP = playerData?.PFPURL
+ };
+
+ // Add kill to UI
+ Dispatcher.Invoke(() =>
+ {
+ AddKillToScreen(killData);
+ });
+
+ await WebHandler.SubmitKill(actorDeathData, playerData);
+ _killHistoryManager.AddKill(killData);
}
}
};
@@ -155,7 +173,7 @@ public partial class HomePage : UserControl
_UIEventsRegistered = true;
}
- private void AddKillToScreen(ActorDeathData deathData, PlayerData? playerData)
+ private void AddKillToScreen(KillData killData)
{
// Fetch the dynamic resource for AltTextColor
var altTextColorBrush = new SolidColorBrush((Color)Application.Current.Resources["AltTextColor"]);
@@ -181,7 +199,7 @@ public partial class HomePage : UserControl
Foreground = altTextColorBrush,
FontFamily = orbitronFontFamily,
});
- killTextBlock.Inlines.Add(new Run($"{deathData.VictimPilot}\n"));
+ killTextBlock.Inlines.Add(new Run($"{killData.EnemyPilot}\n"));
// Repeat for other lines
killTextBlock.Inlines.Add(new Run("Victim Ship: ")
@@ -189,21 +207,21 @@ public partial class HomePage : UserControl
Foreground = altTextColorBrush,
FontFamily = orbitronFontFamily,
});
- killTextBlock.Inlines.Add(new Run($"{deathData.VictimShip}\n"));
+ killTextBlock.Inlines.Add(new Run($"{killData.EnemyShip}\n"));
killTextBlock.Inlines.Add(new Run("Victim Org: ")
{
Foreground = altTextColorBrush,
FontFamily = orbitronFontFamily,
});
- killTextBlock.Inlines.Add(new Run($"{playerData?.OrgName}\n"));
+ killTextBlock.Inlines.Add(new Run($"{killData.OrgAffiliation}\n"));
killTextBlock.Inlines.Add(new Run("Join Date: ")
{
Foreground = altTextColorBrush,
FontFamily = orbitronFontFamily,
});
- killTextBlock.Inlines.Add(new Run($"{playerData?.JoinDate}\n"));
+ killTextBlock.Inlines.Add(new Run($"{killData.Enlisted}\n"));
killTextBlock.Inlines.Add(new Run("UEE Record: ")
{
@@ -211,16 +229,12 @@ public partial class HomePage : UserControl
FontFamily = orbitronFontFamily,
});
-
- const string dateFormatString = "dd MMM yyyy HH:mm";
- var currentTime = DateTime.UtcNow.ToString(dateFormatString);
-
killTextBlock.Inlines.Add(new Run("Kill Time: ")
{
Foreground = altTextColorBrush,
FontFamily = orbitronFontFamily,
});
- killTextBlock.Inlines.Add(new Run($"{currentTime}"));
+ killTextBlock.Inlines.Add(new Run($"{killData.KillTime}"));
// Create a Border and apply the RoundedTextBlockWithBorder style
var killBorder = new Border
@@ -246,7 +260,7 @@ public partial class HomePage : UserControl
// Create the Image for the profile
var profileImage = new Image
{
- Source = new BitmapImage(new Uri(playerData?.PFPURL)), // Assuming the 8th part contains the profile image URL
+ Source = new BitmapImage(new Uri(killData.PFP)), // Assuming the 8th part contains the profile image URL
Width = 90,
Height = 90,
Stretch = Stretch.Fill, // Adjust how the image fits
@@ -279,15 +293,15 @@ public partial class HomePage : UserControl
public void StopButton_Click(object sender, RoutedEventArgs e)
{
- _logHandler.Stop();
+ _logHandler?.Stop();
// Clear the text boxes
- System.Threading.Thread.Sleep(200);
- PilotNameTextBox.Text = string.Empty;
- PlayerShipTextBox.Text = string.Empty;
- GameModeTextBox.Text = string.Empty;
- KillTallyTextBox.Text = string.Empty;
- KillFeedStackPanel.Children.Clear();
+ // System.Threading.Thread.Sleep(200);
+ // PilotNameTextBox.Text = string.Empty;
+ // PlayerShipTextBox.Text = string.Empty;
+ // GameModeTextBox.Text = string.Empty;
+ // KillTallyTextBox.Text = string.Empty;
+ // KillFeedStackPanel.Children.Clear();
}
private void AdjustFontSize(TextBlock textBlock)
diff --git a/AutoTrackR2/KillHistoryManager.cs b/AutoTrackR2/KillHistoryManager.cs
new file mode 100644
index 0000000..fd07f2e
--- /dev/null
+++ b/AutoTrackR2/KillHistoryManager.cs
@@ -0,0 +1,83 @@
+using System.Globalization;
+using System.IO;
+using System.Text;
+
+namespace AutoTrackR2;
+
+public class KillHistoryManager
+{
+ private string _killHistoryPath;
+ private readonly string _headers = "KillTime,EnemyPilot,EnemyShip,Enlisted,RecordNumber,OrgAffiliation,Player,Weapon,Ship,Method,Mode,GameVersion,TrackRver,Logged,PFP\n";
+
+ public KillHistoryManager(string logPath)
+ {
+ _killHistoryPath = logPath;
+
+ if (!File.Exists(_killHistoryPath))
+ {
+ File.WriteAllText(_killHistoryPath, _headers);
+ }
+ }
+
+ public void AddKill(KillData killData)
+ {
+ // Ensure the CSV file exists
+ // This should only happen if the file was deleted or corrupted
+ if (!File.Exists(_killHistoryPath))
+ {
+ File.WriteAllText(_killHistoryPath, _headers);
+ }
+
+ // Append the new kill data to the CSV file
+ var csv = new StringBuilder();
+ csv.AppendLine($"\"{killData.KillTime}\",\"{killData.EnemyPilot}\",\"{killData.EnemyShip}\",\"{killData.Enlisted}\",\"{killData.RecordNumber}\",\"{killData.OrgAffiliation}\",\"{killData.Player}\",\"{killData.Weapon}\",\"{killData.Ship}\",\"{killData.Method}\",\"{killData.Mode}\",\"{killData.GameVersion}\",\"{killData.TrackRver}\",\"{killData.Logged}\",\"{killData.PFP}\"");
+ File.AppendAllText(_killHistoryPath, csv.ToString());
+ }
+
+ public List<KillData> GetKills()
+ {
+ var kills = new List<KillData>();
+
+ using var reader = new StreamReader(_killHistoryPath);
+ reader.ReadLine(); // Skip headers
+
+ while (reader.Peek() >= 0)
+ {
+ var line = reader.ReadLine();
+
+ // Remove extra quotes from CSV data
+ // Todo: These quotes are for handling commas in the data, but not sure if they're necessary
+ line = line?.Replace("\"", string.Empty);
+
+ var data = line?.Split(',');
+
+ kills.Add(new KillData
+ {
+ KillTime = data?[0],
+ EnemyPilot = data?[1],
+ EnemyShip = data?[2],
+ Enlisted = data?[3],
+ RecordNumber = data?[4],
+ OrgAffiliation = data?[5],
+ Player = data?[6],
+ Weapon = data?[7],
+ Ship = data?[8],
+ Method = data?[9],
+ Mode = data?[10],
+ GameVersion = data?[11],
+ TrackRver = data?[12],
+ Logged = data?[13],
+ PFP = data?[14]
+ });
+ }
+
+ return kills;
+ }
+
+ public List<KillData> GetKillsInCurrentMonth()
+ {
+ string currentMonth = DateTime.Now.ToString("MMM", CultureInfo.InvariantCulture);
+ var kills = GetKills();
+ return kills.Where(kill => kill.KillTime?.Contains(currentMonth) == true).ToList();
+ }
+}
\ No newline at end of file
diff --git a/AutoTrackR2/MainWindow.xaml.cs b/AutoTrackR2/MainWindow.xaml.cs
index e432e97..3d143d0 100644
--- a/AutoTrackR2/MainWindow.xaml.cs
+++ b/AutoTrackR2/MainWindow.xaml.cs
@@ -195,6 +195,7 @@ namespace AutoTrackR2
public static class ConfigManager
{
public static string LogFile { get; set; }
+ public static string KillHistoryFile { get; set; }
public static string ApiUrl { get; set; }
public static string ApiKey { get; set; }
public static string VideoPath { get; set; }
@@ -202,6 +203,17 @@ namespace AutoTrackR2
public static int VideoRecord { get; set; }
public static int OfflineMode { get; set; }
public static int Theme { get; set; }
+
+ static ConfigManager()
+ {
+ // Set default values
+ // AppData\Local\AutoTrackR2\Kill-log.csv
+ KillHistoryFile = Path.Combine(
+ Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+ "AutoTrackR2",
+ "Kill-log.csv"
+ );
+ }
public static void LoadConfig()
{
diff --git a/AutoTrackR2/Util.cs b/AutoTrackR2/Util.cs
new file mode 100644
index 0000000..b5931de
--- /dev/null
+++ b/AutoTrackR2/Util.cs
@@ -0,0 +1,31 @@
+namespace AutoTrackR2;
+
+// Data returned from the CIG API
+public struct PlayerData
+{
+ public string? PFPURL;
+ public string? UEERecord;
+ public string? OrgURL;
+ public string? OrgName;
+ public string? JoinDate;
+}
+
+// Amalgamation of all data from a single kill
+public struct KillData
+{
+ public string? KillTime;
+ public string? EnemyPilot;
+ public string? EnemyShip;
+ public string? Enlisted;
+ public string? RecordNumber;
+ public string? OrgAffiliation;
+ public string? Player;
+ public string? Weapon;
+ public string? Ship;
+ public string? Method;
+ public string? Mode;
+ public string? GameVersion;
+ public string? TrackRver;
+ public string? Logged;
+ public string? PFP;
+}
\ No newline at end of file
From aa787d305ce661d35b408bd9b30913ff2f4668e0 Mon Sep 17 00:00:00 2001
From: Dork Normalize <nope>
Date: Fri, 28 Mar 2025 17:15:40 -0700
Subject: [PATCH 04/11] Refactor config save/load
---
AutoTrackR2/ConfigPage.xaml.cs | 39 ++++++++++------------------------
AutoTrackR2/HomePage.xaml.cs | 8 +++++++
AutoTrackR2/MainWindow.xaml.cs | 9 ++++----
3 files changed, 23 insertions(+), 33 deletions(-)
diff --git a/AutoTrackR2/ConfigPage.xaml.cs b/AutoTrackR2/ConfigPage.xaml.cs
index 5e7f366..7dcfc7a 100644
--- a/AutoTrackR2/ConfigPage.xaml.cs
+++ b/AutoTrackR2/ConfigPage.xaml.cs
@@ -508,36 +508,19 @@ namespace AutoTrackR2
private void SaveButton_Click(object sender, RoutedEventArgs e)
{
- // Get the directory for the user's local application data
- string appDataDirectory = Path.Combine(
- Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
- "AutoTrackR2"
- );
-
- // Ensure the directory exists
- if (!Directory.Exists(appDataDirectory))
- {
- Directory.CreateDirectory(appDataDirectory);
- }
-
- // Combine the app data directory with the config file name
- string configFilePath = Path.Combine(appDataDirectory, "config.ini");
-
- using (StreamWriter writer = new StreamWriter(configFilePath))
- {
- writer.WriteLine($"LogFile={LogFilePath.Text}");
- writer.WriteLine($"ApiUrl={ApiUrl.Text}");
- writer.WriteLine($"ApiKey={ApiKey.Text}");
- writer.WriteLine($"VideoPath={VideoPath.Text}");
- writer.WriteLine($"VisorWipe={(int)VisorWipeSlider.Value}");
- writer.WriteLine($"VideoRecord={(int)VideoRecordSlider.Value}");
- writer.WriteLine($"OfflineMode={(int)OfflineModeSlider.Value}");
- writer.WriteLine($"Theme={(int)ThemeSlider.Value}"); // Assumes you are saving the theme slider value (0, 1, or 2)
- }
-
+ ConfigManager.ApiKey = ApiKey.Text;
+ ConfigManager.ApiUrl = ApiUrl.Text;
+ ConfigManager.LogFile = LogFilePath.Text;
+ ConfigManager.VideoPath = VideoPath.Text;
+ ConfigManager.VisorWipe = (int)VisorWipeSlider.Value;
+ ConfigManager.VideoRecord = (int)VideoRecordSlider.Value;
+ ConfigManager.OfflineMode = (int)OfflineModeSlider.Value;
+ ConfigManager.Theme = (int)ThemeSlider.Value;
+
+ // Save the current config values
+ ConfigManager.SaveConfig();
// Start the flashing effect
FlashSaveButton();
- ConfigManager.LoadConfig();
}
private void FlashSaveButton()
diff --git a/AutoTrackR2/HomePage.xaml.cs b/AutoTrackR2/HomePage.xaml.cs
index fe47e59..c4b3371 100644
--- a/AutoTrackR2/HomePage.xaml.cs
+++ b/AutoTrackR2/HomePage.xaml.cs
@@ -342,4 +342,12 @@ public partial class HomePage : UserControl
// Apply the adjusted font size
textBlock.FontSize = fontSize;
}
+
+ private void VisorWipe()
+ {
+ if (ConfigManager.VisorWipe == 1)
+ {
+
+ }
+ }
}
diff --git a/AutoTrackR2/MainWindow.xaml.cs b/AutoTrackR2/MainWindow.xaml.cs
index 3d143d0..94b6149 100644
--- a/AutoTrackR2/MainWindow.xaml.cs
+++ b/AutoTrackR2/MainWindow.xaml.cs
@@ -33,9 +33,6 @@ namespace AutoTrackR2
{
InitializeComponent();
- // Load configuration settings before setting them in any page
- ConfigManager.LoadConfig();
-
homePage = new HomePage(); // Create a single instance of HomePage
ContentControl.Content = homePage; // Default to HomePage
@@ -205,7 +202,9 @@ namespace AutoTrackR2
public static int Theme { get; set; }
static ConfigManager()
- {
+ {
+ LoadConfig();
+
// Set default values
// AppData\Local\AutoTrackR2\Kill-log.csv
KillHistoryFile = Path.Combine(
@@ -253,7 +252,7 @@ namespace AutoTrackR2
// Define the config file path in a writable location
string configDirectory = Path.Combine(
Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
- "YourAppName"
+ "AutoTrackR2"
);
// Ensure the directory exists
From ebef4eca5b7db9cd1d76eeab95b6d712d2d0daa2 Mon Sep 17 00:00:00 2001
From: Dork Normalize <nope>
Date: Fri, 28 Mar 2025 19:43:22 -0700
Subject: [PATCH 05/11] Add support for AHK scripts and remove the main
Powershell Script
---
AutoTrackR2/AutoTrackR2.csproj | 3 -
AutoTrackR2/ConfigPage.xaml.cs | 3 +-
AutoTrackR2/HomePage.xaml.cs | 41 +-
AutoTrackR2/KillTrackR_MainScript.ps1 | 516 --------------------------
AutoTrackR2/MainWindow.xaml.cs | 16 +
AutoTrackR2/UpdatePage.xaml.cs | 2 +-
6 files changed, 56 insertions(+), 525 deletions(-)
delete mode 100644 AutoTrackR2/KillTrackR_MainScript.ps1
diff --git a/AutoTrackR2/AutoTrackR2.csproj b/AutoTrackR2/AutoTrackR2.csproj
index 0ba95b7..875c53d 100644
--- a/AutoTrackR2/AutoTrackR2.csproj
+++ b/AutoTrackR2/AutoTrackR2.csproj
@@ -109,9 +109,6 @@
</ItemGroup>
<ItemGroup>
- <None Update="KillTrackR_MainScript.ps1">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </None>
<None Update="update.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
diff --git a/AutoTrackR2/ConfigPage.xaml.cs b/AutoTrackR2/ConfigPage.xaml.cs
index 7dcfc7a..f718aed 100644
--- a/AutoTrackR2/ConfigPage.xaml.cs
+++ b/AutoTrackR2/ConfigPage.xaml.cs
@@ -413,8 +413,7 @@ namespace AutoTrackR2
// Build the dynamic file path for the current user
string filePath = Path.Combine(
- Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
- "AutoTrackR2",
+ ConfigManager.AHKScriptFolder,
"visorwipe.ahk"
);
diff --git a/AutoTrackR2/HomePage.xaml.cs b/AutoTrackR2/HomePage.xaml.cs
index c4b3371..cd264e6 100644
--- a/AutoTrackR2/HomePage.xaml.cs
+++ b/AutoTrackR2/HomePage.xaml.cs
@@ -81,6 +81,7 @@ public partial class HomePage : UserControl
// _logHandler = new LogHandler(@"U:\\StarCitizen\\StarCitizen\\LIVE\\Game.log");
_logHandler = new LogHandler(ConfigManager.LogFile);
_logHandler.Initialize();
+
}
private void AddKillHistoryKillsToUI()
@@ -158,9 +159,16 @@ public partial class HomePage : UserControl
{
AddKillToScreen(killData);
});
-
- await WebHandler.SubmitKill(actorDeathData, playerData);
+
+ // Only submit kill data if not in offline mode
+ if (ConfigManager.OfflineMode == 0)
+ {
+ await WebHandler.SubmitKill(actorDeathData, playerData);
+ }
+
_killHistoryManager.AddKill(killData);
+ VisorWipe();
+ VideoRecord();
}
}
};
@@ -342,12 +350,39 @@ public partial class HomePage : UserControl
// Apply the adjusted font size
textBlock.FontSize = fontSize;
}
+
+ public static void RunAHKScript(string path)
+ {
+ string scriptPath = Path.Combine(ConfigManager.AHKScriptFolder, path);
+
+ if (!File.Exists(scriptPath))
+ {
+ return;
+ }
+
+ // Run the script using powershell
+ using var ahkProcess = new Process();
+
+ // Runs the script via Explorer, ensuring it uses whatever the
+ // default binary for AHK is. Skips having to find a specific path to AHK
+ ahkProcess.StartInfo.FileName = "explorer";
+ ahkProcess.StartInfo.Arguments = "\"" + scriptPath + "\"";
+ ahkProcess.Start();
+ }
private void VisorWipe()
{
if (ConfigManager.VisorWipe == 1)
{
-
+ RunAHKScript(ConfigManager.VisorWipeScript);
+ }
+ }
+
+ private void VideoRecord()
+ {
+ if (ConfigManager.VideoRecord == 1)
+ {
+ RunAHKScript(ConfigManager.VideoRecordScript);
}
}
}
diff --git a/AutoTrackR2/KillTrackR_MainScript.ps1 b/AutoTrackR2/KillTrackR_MainScript.ps1
deleted file mode 100644
index 26f0ed2..0000000
--- a/AutoTrackR2/KillTrackR_MainScript.ps1
+++ /dev/null
@@ -1,516 +0,0 @@
-$TrackRver = "2.07"
-
-# Path to the config file
-$appName = "AutoTrackR2"
-$scriptFolder = Join-Path -Path $env:LOCALAPPDATA -ChildPath $appName
-$configFile = Join-Path -Path $scriptFolder -ChildPath "config.ini"
-
-# Read the config file into a hashtable
-if (Test-Path $configFile) {
- Write-Output "PlayerName=Config.ini found."
- $configContent = Get-Content $configFile | Where-Object { $_ -notmatch '^#|^\s*$' }
-
- # Escape backslashes by doubling them
- $configContent = $configContent -replace '\\', '\\\\'
-
- # Convert to key-value pairs
- $config = $configContent -replace '^([^=]+)=(.+)$', '$1=$2' | ConvertFrom-StringData
-} else {
- Write-Output "Config.ini not found."
- exit
-}
-
-$parentApp = (Get-Process -Name AutoTrackR2).ID
-
-# Access config values
-$logFilePath = $config.Logfile
-$apiUrl = $config.ApiUrl
-$apiKey = $config.ApiKey
-$videoPath = $config.VideoPath
-$visorWipe = $config.VisorWipe
-$videoRecord = $config.VideoRecord
-$offlineMode = $config.OfflineMode
-
-if ($offlineMode -eq 1){
- $offlineMode = $true
-} else {
- $offlineMode = $false
-}
-Write-Output "PlayerName=OfflineMode: $offlineMode"
-
-if ($videoRecord -eq 1){
- $videoRecord = $true
-} else {
- $videoRecord = $false
-}
-Write-Output "PlayerName=VideoRecord: $videoRecord"
-
-if ($visorWipe -eq 1){
- $visorWipe = $true
-} else {
- $visorWipe = $false
-}
-Write-Output "PlayerName=VisorWipe: $visorWipe"
-
-If (Test-Path $logFilePath) {
- Write-Output "PlayerName=Logfile found"
-} else {
- Write-Output "Logfile not found."
-}
-
-If ($null -ne $apiUrl){
- if ($apiUrl -notlike "*/register-kill") {
- $apiUrl = $apiUrl.TrimEnd("/") + "/register-kill"
- }
- Write-output "PlayerName=$apiURL"
-}
-
-# Ship Manufacturers
-$prefixes = @(
- "ORIG",
- "CRUS",
- "RSI",
- "AEGS",
- "VNCL",
- "DRAK",
- "ANVL",
- "BANU",
- "MISC",
- "CNOU",
- "XIAN",
- "GAMA",
- "TMBL",
- "ESPR",
- "KRIG",
- "GRIN",
- "XNAA",
- "MRAI"
-)
-
-# Define the regex pattern to extract information
-$killPattern = "<Actor Death> CActor::Kill: '(?<EnemyPilot>[^']+)' \[\d+\] in zone '(?<EnemyShip>[^']+)' killed by '(?<Player>[^']+)' \[[^']+\] using '(?<Weapon>[^']+)' \[Class (?<Class>[^\]]+)\] with damage type '(?<DamageType>[^']+)'"
-$puPattern = '<\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z> \[Notice\] <ContextEstablisherTaskFinished> establisher="CReplicationModel" message="CET completed" taskname="StopLoadingScreen" state=[^\s()]+\(\d+\) status="Finished" runningTime=\d+\.\d+ numRuns=\d+ map="megamap" gamerules="SC_Default" sessionId="[a-f0-9\-]+" \[Team_Network\]\[Network\]\[Replication\]\[Loading\]\[Persistence\]'
-$acPattern = "Requesting Mode Change" # "ArenaCommanderFeature"
-$loadoutPattern = '\[InstancedInterior\] OnEntityLeaveZone - InstancedInterior \[(?<InstancedInterior>[^\]]+)\] \[\d+\] -> Entity \[(?<Entity>[^\]]+)\] \[\d+\] -- m_openDoors\[\d+\], m_managerGEID\[(?<ManagerGEID>\d+)\], m_ownerGEID\[(?<OwnerGEID>[^\[]+)\]'
-$shipManPattern = "^(" + ($prefixes -join "|") + ")"
-# $loginPattern = "\[Notice\] <AccountLoginCharacterStatus_Character> Character: createdAt [A-Za-z0-9]+ - updatedAt [A-Za-z0-9]+ - geid [A-Za-z0-9]+ - accountId [A-Za-z0-9]+ - name (?<Player>[A-Za-z0-9_-]+) - state STATE_CURRENT" # KEEP THIS INCASE LEGACY LOGIN IS REMOVED
-$loginPattern = "\[Notice\] <Legacy login response> \[CIG-net\] User Login Success - Handle\[(?<Player>[A-Za-z0-9_-]+)\]"
-$cleanupPattern = '^(.+?)_\d+$'
-$versionPattern = "--system-trace-env-id='pub-sc-alpha-(?<gameversion>\d{3,4}-\d{7})'"
-$vehiclePattern = "<(?<timestamp>[^>]+)> \[Notice\] <Vehicle Destruction> CVehicle::OnAdvanceDestroyLevel: " +
- "Vehicle '(?<vehicle>[^']+)' \[\d+\] in zone '(?<vehicle_zone>[^']+)' " +
- "\[pos x: (?<pos_x>[-\d\.]+), y: (?<pos_y>[-\d\.]+), z: (?<pos_z>[-\d\.]+) " +
- "vel x: [^,]+, y: [^,]+, z: [^\]]+\] driven by '(?<driver>[^']+)' \[\d+\] " +
- "advanced from destroy level (?<destroy_level_from>\d+) to (?<destroy_level_to>\d+) " +
- "caused by '(?<caused_by>[^']+)' \[\d+\] with '(?<damage_type>[^']+)'"
-
-# Lookup Patterns
-$joinDatePattern = '<span class="label">Enlisted</span>\s*<strong class="value">([^<]+)</strong>'
-$ueePattern = '<p class="entry citizen-record">\s*<span class="label">UEE Citizen Record<\/span>\s*<strong class="value">#?(n\/a|\d+)<\/strong>\s*<\/p>'
-
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-$process = Get-Process | Where-Object {$_.Name -like "AutoTrackR2"}
-$global:killTally = 0
-
-# Load historic kills from csv
-if (Test-Path "$scriptFolder\Kill-Log.csv") {
- $historicKills = Import-CSV "$scriptFolder\Kill-log.csv"
- $currentDate = Get-Date
- $dateFormat = "dd MMM yyyy HH:mm UTC"
- foreach ($kill in $historicKills) {
- $killDate = [datetime]::ParseExact($kill.KillTime.Trim(), $dateFormat, [System.Globalization.CultureInfo]::InvariantCulture)
- If ($killdate.year -eq $currentDate.Year -and $killdate.month -eq $currentDate.Month) {
- $global:killTally++
- }
- Try {
- Write-Output "NewKill=throwaway,$($kill.EnemyPilot),$($kill.EnemyShip),$($kill.OrgAffiliation),$($kill.Enlisted),$($kill.RecordNumber),$($kill.KillTime), $($kill.PFP)"
- } Catch {
- Write-Output "Error Loading Kill: $($kill.EnemyPilot)"
- }
- }
-}
-Write-Output "KillTally=$global:killTally"
-
-# Match and extract username from gamelog
-Do {
- # Load gamelog into memory
- $authLog = Get-Content -Path $logFilePath
-
- # Initialize variable to store username
- $global:userName = $null
- $global:loadout = "Player"
-
- # Loop through each line in the log to find the matching line
- foreach ($line in $authLog) {
- if ($line -match $loginPattern) {
- $global:userName = $matches['Player']
- Write-Output "PlayerName=$global:userName"
- }
- # Get Loadout
- if ($line -match $loadoutPattern) {
- $entity = $matches['Entity']
- $ownerGEID = $matches['OwnerGEID']
-
- If ($ownerGEID -eq $global:userName -and $entity -match $shipManPattern) {
- $tryloadOut = $entity
- If ($tryloadOut -match $cleanupPattern){
- if ($null -ne $matches[1]){
- $global:loadOut = $matches[1]
- }
- }
- }
- }
- Write-Output "PlayerShip=$global:loadOut"
-
- If ($line -match $versionPattern){
- $global:GameVersion = $matches['gameversion']
- }
- if ($line -match $acPattern){
- $global:GameMode = "AC"
- }
- if ($line -match $puPattern){
- $global:GameMode = "PU"
- }
- Write-Output "GameMode=$global:GameMode"
-
- }
- # If no match found, print "Logged In: False"
- if (-not $global:userName) {
- Write-Output "PlayerName=No Player Found..."
- Start-Sleep -Seconds 30
- }
-
- # Clear the log from memory
- $authLog = $null
-} until ($null -ne $global:userName)
-
-# Function to process new log entries and write to the host
-function Read-LogEntry {
- param (
- [string]$line
- )
-
- # Look for vehicle events
- if ($line -match $vehiclePattern) {
- # Access the named capture groups from the regex match
- $global:vehicle_id = $matches['vehicle']
- $global:location = $matches['vehicle_zone']
-
- }
-
- # Apply the regex pattern to the line
- if ($line -match $killPattern) {
- # Access the named capture groups from the regex match
- $enemyPilot = $matches['EnemyPilot']
- $enemyShip = $matches['EnemyShip']
- $player = $matches['Player']
- $weapon = $matches['Weapon']
- $damageType = $matches['DamageType']
- $ship = $global:loadOut
-
- If ($enemyShip -ne "vehicle_id"){
-
- $global:got_location = $location
- }
- else
- {
- $global:got_location = "NONE"
- }
-
- Try {
- $page1 = Invoke-WebRequest -uri "https://robertsspaceindustries.com/citizens/$enemyPilot"
- } Catch {
- $page1 = $null
- }
-
- If ($null -ne $page1){
- # Check if the Autotrackr2 process is running
- if ($null -eq (Get-Process -ID $parentApp -ErrorAction SilentlyContinue)) {
- Stop-Process -Id $PID -Force
- }
- If ($enemyShip -ne "Player"){
- If ($enemyShip -eq $global:lastKill){
- $enemyShip = "Passenger"
- } Else {
- $global:lastKill = $enemyShip
- }
- }
-
- If ($player -eq $global:userName -and $enemyPilot -ne $global:userName){
- If ($enemyShip -match $cleanupPattern){
- $enemyShip = $matches[1]
- }
- If ($weapon -match $cleanupPattern){
- $weapon = $matches[1]
- }
- If ($weapon -eq "KLWE_MassDriver_S10"){
- $global:loadOut = "AEGS_Idris"
- $ship = "AEGS_Idris"
- }
- if ($damageType -eq "Bullet" -or $weapon -like "apar_special_ballistic*") {
- $ship = "Player"
- $enemyShip = "Player"
- }
- If ($ship -match $cleanupPattern){
- $ship = $matches[1]
- }
- if ($ship -notmatch $shipManPattern){
- $ship = "Player"
- }
- If ($enemyShip -notmatch $shipManPattern -and $enemyShip -notlike "Passenger" ) {
- $enemyShip = "Player"
- }
-
- # Repeatedly remove all suffixes
- while ($enemyShip -match '_(PU|AI|CIV|MIL|PIR)$') {
- $enemyShip = $enemyShip -replace '_(PU|AI|CIV|MIL|PIR)$', ''
- }
- # Repeatedly remove all suffixes
- while ($ship -match '_(PU|AI|CIV|MIL|PIR)$') {
- $ship = $ship -replace '_(PU|AI|CIV|MIL|PIR)$', ''
- }
- while ($enemyShip -match '-00(1|2|3|4|5|6|7|8|9|0)$') {
- $enemyShip = $enemyShip -replace '-00(1|2|3|4|5|6|7|8|9|0)$', ''
- }while ($ship -match '-00(1|2|3|4|5|6|7|8|9|0)$') {
- $ship = $ship -replace '-00(1|2|3|4|5|6|7|8|9|0)$', ''
- }
-
- $KillTime = (Get-Date).ToUniversalTime().ToString("dd MMM yyyy HH:mm 'UTC'", [System.Globalization.CultureInfo]::InvariantCulture)
-
- # Get Enlisted Date
- if ($($page1.content) -match $joinDatePattern) {
- $joinDate = $matches[1]
- $joinDate2 = $joinDate -replace ',', ''
- } else {
- $joinDate2 = "-"
- }
-
- # Check if there are any matches
- If ($null -eq $page1.links[0].innerHTML) {
- $enemyOrgs = $page1.links[4].innerHTML
- } Else {
- $enemyOrgs = $page1.links[3].innerHTML
- }
-
- if ($null -eq $enemyOrgs) {
- $enemyOrgs = "-"
- }
-
- # Get UEE Number
- if ($($page1.content) -match $ueePattern) {
- # The matched UEE Citizen Record number is in $matches[1]
- $citizenRecord = $matches[1]
- } else {
- $citizenRecord = "n/a"
- }
- If ($citizenRecord -eq "n/a") {
- $citizenRecordAPI = "-1"
- $citizenRecord = "-"
- } Else {
- $citizenRecordAPI = $citizenRecord
- }
-
- # Get PFP
- if ($page1.images[0].src -like "/media/*") {
- $victimPFP = "https://robertsspaceindustries.com$($page1.images[0].src)"
- } Else {
- $victimPFP = "https://cdn.robertsspaceindustries.com/static/images/account/avatar_default_big.jpg"
- }
-
- $global:killTally++
- Write-Output "KillTally=$global:killTally"
- Write-Output "NewKill=throwaway,$enemyPilot,$enemyShip,$enemyOrgs,$joinDate2,$citizenRecord,$killTime,$victimPFP"
-
- $global:GameMode = $global:GameMode.ToLower()
- # Send to API
- # Define the data to send
- If ($null -ne $apiUrl -and $offlineMode -eq $false){
- $data = @{
- victim_ship = $enemyShip
- victim = $enemyPilot
- enlisted = $joinDate
- rsi = $citizenRecordAPI
- weapon = $weapon
- method = $damageType
- loadout_ship = $ship
- game_version = $global:GameVersion
- gamemode = $global:GameMode
- trackr_version = $TrackRver
- location = $got_location
- }
-
- # Headers which may or may not be necessary
- $headers = @{
- "Authorization" = "Bearer $apiKey"
- "Content-Type" = "application/json"
- "User-Agent" = "AutoTrackR2"
- }
-
- try {
- # Send the POST request with JSON data
- $null = Invoke-RestMethod -Uri $apiURL -Method Post -Body ($data | ConvertTo-Json -Depth 5) -Headers $headers
- $logMode = "API"
- $global:got_location = "NONE"
- } catch {
- # Catch and display errors
- $apiError = $_
- # Add to output file
- $logMode = "Err-Local"
- }
- } Else {
- $logMode = "Local"
- }
-
- # Define the output CSV path
- $csvPath = "$scriptFolder\Kill-log.csv"
-
- # Create an object to hold the data
- $killData = [PSCustomObject]@{
- KillTime = $killTime
- EnemyPilot = $enemyPilot
- EnemyShip = $enemyShip
- Enlisted = $joinDate2
- RecordNumber = $citizenRecord
- OrgAffiliation = $enemyOrgs
- Player = $player
- Weapon = $weapon
- Ship = $ship
- Method = $damageType
- Mode = $global:GameMode
- GameVersion = $global:GameVersion
- TrackRver = $TrackRver
- Logged = $logMode
- PFP = $victimPFP
- }
-
- # Remove commas from all properties
- foreach ($property in $killData.PSObject.Properties) {
- if ($property.Value -is [string]) {
- $property.Value = $property.Value -replace ',', ''
- }
- }
-
- # Export to CSV
- if (-Not (Test-Path $csvPath)) {
- # If file doesn't exist, create it with headers
- $killData | Export-Csv -Path $csvPath -NoTypeInformation
- } else {
- # Append data to the existing file without adding headers
- $killData | ConvertTo-Csv -NoTypeInformation | Select-Object -Skip 1 | Out-File -Append -Encoding utf8 -FilePath $csvPath
- }
-
- $sleeptimer = 10
-
- # VisorWipe
- If ($visorwipe -eq $true -and $enemyShip -ne "Passenger" -and $damageType -notlike "*Bullet*"){
- # send keybind for visorwipe
- start-sleep 1
- $sleeptimer = $sleeptimer -1
- &"$scriptFolder\visorwipe.ahk"
- }
-
- # Record video
- if ($videoRecord -eq $true -and $enemyShip -ne "Passenger"){
- # send keybind for windows game bar recording
- Start-Sleep 2
- $sleeptimer = $sleeptimer -9
- &"$scriptFolder\videorecord.ahk"
- Start-Sleep 7
-
- $latestFile = Get-ChildItem -Path $videoPath | Where-Object { -not $_.PSIsContainer } | Sort-Object CreationTime -Descending | Select-Object -First 1
- # Check if the latest file is no more than 30 seconds old
- if ($latestFile) {
- $fileAgeInSeconds = (New-TimeSpan -Start $latestFile.CreationTime -End (Get-Date)).TotalSeconds
- if ($fileAgeInSeconds -le 30) {
- # Generate a timestamp in ddMMMyyyy-HH:mm format
- $timestamp = (Get-Date).ToString("ddMMMyyyy-HHmm")
-
- # Extract the file extension to preserve it
- $fileExtension = $latestFile.Extension
-
- # Rename the file, preserving the original file extension
- Rename-Item -Path $latestFile.FullName -NewName "$enemyPilot.$enemyShip.$timestamp$fileExtension"
- } else {}
- } else {}
- }
- Start-Sleep $sleeptimer
- }
- }
- }
-
- # Get Logged-in User
- If ($line -match $loginPattern) {
- # Load gamelog into memory
- $authLog = Get-Content -Path $logFilePath
- $authLog = $authlog -match $loginPattern
- $authLog = $authLog | Out-String
-
- # Extract User Name
- $nameExtract = "name\s+(?<PlayerName>[^\s-]+)"
-
- If ($authLog -match $nameExtract -and $global:userName -ne $nameExtract){
- $global:userName = $matches['PlayerName']
- Write-Output "PlayerName=$global:userName"
- }
- }
-
- # Detect PU or AC
- if ($line -match $puPattern) {
- $global:GameMode = "PU"
- Write-Output "GameMode=$global:GameMode"
- }
- if ($line -match $acPattern) {
- $global:GameMode = "AC"
- Write-Output "GameMode=$global:GameMode"
- }
-
- #Set loadout
- if ($line -match $loadoutPattern) {
- $entity = $matches['Entity']
- $ownerGEID = $matches['OwnerGEID']
-
- If ($ownerGEID -eq $global:userName -and $entity -match $shipManPattern) {
- $tryloadOut = $entity
- If ($tryloadOut -match $cleanupPattern){
- $global:loadOut = $matches[1]
- }
- Write-Output "PlayerShip=$global:loadOut"
- }
- }
-}
-
-
-# Monitor the log file and process new lines as they are added
-Get-Content -Path $logFilePath -Wait -Tail 0 | ForEach-Object {
- Read-LogEntry $_
-}
-
-<#
-# Open the log file with shared access for reading and writing
-$fileStream = [System.IO.FileStream]::new($logFilePath, [System.IO.FileMode]::Open, [System.IO.FileAccess]::Read, [System.IO.FileShare]::ReadWrite)
-$reader = [System.IO.StreamReader]::new($fileStream, [System.Text.Encoding]::UTF8) # Ensure we're reading as UTF-8
-
-try {
- # Move to the end of the file to start monitoring new entries
- $reader.BaseStream.Seek(0, [System.IO.SeekOrigin]::End)
-
- while ($true) {
- # Read the next line from the file
- $line = $reader.ReadLine()
-
- # Ensure we have new content to process
- if ($line) {
- # Process the line (this is where your log entry handler would go)
- Read-LogEntry $line
- }
-
- # Sleep for a brief moment to avoid high CPU usage
- Start-Sleep -Milliseconds 100
- }
-}
-finally {
- # Ensure we close the reader and file stream properly when done
- $reader.Close()
- $fileStream.Close()
-}
-#>
diff --git a/AutoTrackR2/MainWindow.xaml.cs b/AutoTrackR2/MainWindow.xaml.cs
index 94b6149..637e90f 100644
--- a/AutoTrackR2/MainWindow.xaml.cs
+++ b/AutoTrackR2/MainWindow.xaml.cs
@@ -1,4 +1,6 @@
//using System.Collections.Generic;
+
+using System.Diagnostics;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
@@ -193,6 +195,12 @@ namespace AutoTrackR2
{
public static string LogFile { get; set; }
public static string KillHistoryFile { get; set; }
+
+ public static string AHKScriptFolder { get; set; }
+
+ public static string VisorWipeScript { get; set; }
+ public static string VideoRecordScript { get; set; }
+
public static string ApiUrl { get; set; }
public static string ApiKey { get; set; }
public static string VideoPath { get; set; }
@@ -212,6 +220,14 @@ namespace AutoTrackR2
"AutoTrackR2",
"Kill-log.csv"
);
+
+ AHKScriptFolder = Path.Combine(
+ Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+ "AutoTrackR2"
+ );
+
+ VisorWipeScript = "visorwipe.ahk";
+ VideoRecordScript = "videorecord.ahk";
}
public static void LoadConfig()
diff --git a/AutoTrackR2/UpdatePage.xaml.cs b/AutoTrackR2/UpdatePage.xaml.cs
index 75d9e70..87b260e 100644
--- a/AutoTrackR2/UpdatePage.xaml.cs
+++ b/AutoTrackR2/UpdatePage.xaml.cs
@@ -9,7 +9,7 @@ namespace AutoTrackR2
{
public partial class UpdatePage : UserControl
{
- public static string currentVersion = "v2.08";
+ public static string currentVersion = "v2.09";
private string latestVersion;
public UpdatePage()
From 90a905435c7802c2c0ee1cf0e98f8be5790065c6 Mon Sep 17 00:00:00 2001
From: Dork Normalize <nope>
Date: Fri, 28 Mar 2025 19:54:01 -0700
Subject: [PATCH 06/11] UI enhancements on the config page
---
AutoTrackR2/ConfigPage.xaml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/AutoTrackR2/ConfigPage.xaml b/AutoTrackR2/ConfigPage.xaml
index 3b2016f..0f79db0 100644
--- a/AutoTrackR2/ConfigPage.xaml
+++ b/AutoTrackR2/ConfigPage.xaml
@@ -56,18 +56,21 @@
<!-- Visor Wipe Toggle Slider -->
<StackPanel Margin="0,0,0,15" Orientation="Horizontal">
+ <TextBlock Text="ⓘ" ToolTip="Perform a Visor Wipe animation on player kill. Requires AHKv2." Foreground="{DynamicResource TextBrush}" FontSize="20" Margin="0,4,3,5"/>
<TextBlock Text="Visor Wipe:" Foreground="{DynamicResource TextBrush}" FontSize="16" Margin="0,7,0,5"/>
<Slider Name="VisorWipeSlider" Minimum="0" Maximum="1" TickFrequency="1" IsSnapToTickEnabled="True" Value="0" Style="{StaticResource ToggleSliderStyle}" Margin="27,-4,0,0" ValueChanged="VisorWipeSlider_ValueChanged"/>
</StackPanel>
<!-- Video Record Toggle Slider -->
<StackPanel Margin="0,0,0,15" Orientation="Horizontal">
+ <TextBlock Text="ⓘ" ToolTip="Automatically clip your last kill. Check the README for more info." Foreground="{DynamicResource TextBrush}" FontSize="20" Margin="0,4,3,5"/>
<TextBlock Text="Video Record:" Foreground="{DynamicResource TextBrush}" FontSize="16" Margin="0,7,0,5"/>
<Slider Name="VideoRecordSlider" Minimum="0" Maximum="1" TickFrequency="1" IsSnapToTickEnabled="True" Value="0" Style="{StaticResource ToggleSliderStyle}" Margin="10,-4,0,0" ValueChanged="VideoRecordSlider_ValueChanged"/>
</StackPanel>
<!-- Offline Mode Toggle Slider -->
<StackPanel Margin="0,0,0,15" Orientation="Horizontal">
+ <TextBlock Text="ⓘ" ToolTip="With Offline Mode enabled, kills will not be submitted to the configured API" Foreground="{DynamicResource TextBrush}" FontSize="20" Margin="0,4,3,5"/>
<TextBlock Text="Offline Mode:" Foreground="{DynamicResource TextBrush}" FontSize="16" Margin="0,7,0,5"/>
<Slider Name="OfflineModeSlider" Minimum="0" Maximum="1" TickFrequency="1" IsSnapToTickEnabled="True" Value="0" Style="{StaticResource ToggleSliderStyle}" Margin="12,-4,0,0" ValueChanged="OfflineModeSlider_ValueChanged"/>
</StackPanel>
From 0e4419e5cc8a6e03a93ad04d3d058a2aba3d6cf3 Mon Sep 17 00:00:00 2001
From: Dork Normalize <nope>
Date: Fri, 28 Mar 2025 20:02:58 -0700
Subject: [PATCH 07/11] Add config info tooltips
---
AutoTrackR2/ConfigPage.xaml | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/AutoTrackR2/ConfigPage.xaml b/AutoTrackR2/ConfigPage.xaml
index 0f79db0..937fe68 100644
--- a/AutoTrackR2/ConfigPage.xaml
+++ b/AutoTrackR2/ConfigPage.xaml
@@ -1,7 +1,7 @@
<UserControl x:Class="AutoTrackR2.ConfigPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- Height="396" Width="626">
+ Height="410" Width="626">
<Grid Background="{DynamicResource BackgroundLightBrush}">
<!-- Main Layout Grid -->
@@ -23,33 +23,37 @@
<StackPanel Grid.Column="0" VerticalAlignment="Center" Height="389">
<!-- Log File -->
<StackPanel Margin="0,10,0,15" Orientation="Horizontal">
+ <TextBlock Text="ⓘ" ToolTip="Set this to the Game.log file in your StarCitizen\LIVE directory." Foreground="{DynamicResource TextBrush}" FontSize="20" Margin="0,0,3,5"/>
<TextBlock Text="Log File:" Foreground="{DynamicResource TextBrush}" FontSize="16" Margin="0,5,0,5" FontFamily="{StaticResource Roboto}"/>
<StackPanel Orientation="Horizontal" Margin="30,0,0,0">
- <TextBox Name="LogFilePath" Width="340" Height="30" Style="{StaticResource RoundedTextBox}"/>
+ <TextBox Name="LogFilePath" Width="330" Height="30" Style="{StaticResource RoundedTextBox}"/>
<Button Content="Browse" Width="75" Height="30" FontFamily="{StaticResource Orbitron}" Margin="5,0" Style="{StaticResource ButtonStyle}" Click="LogFileBrowseButton_Click"/>
</StackPanel>
</StackPanel>
<!-- API URL -->
<StackPanel Margin="0,0,0,15" Orientation="Horizontal">
+ <TextBlock Text="ⓘ" ToolTip="Need a URL? No idea what to do? Contact heavy_bob on Discord!" Foreground="{DynamicResource TextBrush}" FontSize="20" Margin="0,3,3,5"/>
<TextBlock Text="API URL:" Foreground="{DynamicResource TextBrush}" FontSize="16" Margin="0,5,0,5"/>
<StackPanel Orientation="Horizontal" Margin="30,0,0,0">
- <TextBox Name="ApiUrl" Width="340" Height="30" Style="{StaticResource RoundedTextBox}"/>
+ <TextBox Name="ApiUrl" Width="330" Height="30" Style="{StaticResource RoundedTextBox}"/>
<Button Content="Test" Width="75" Height="30" FontFamily="{StaticResource Orbitron}" Margin="5,0" Style="{StaticResource ButtonStyle}" Click="TestApiButton_Click"/>
</StackPanel>
</StackPanel>
<!-- API Key -->
<StackPanel Margin="0,0,0,15" Orientation="Horizontal">
+ <TextBlock Text="ⓘ" ToolTip="Need a key? No idea what to do? Contact heavy_bob on Discord!" Foreground="{DynamicResource TextBrush}" FontSize="20" Margin="0,3,3,5"/>
<TextBlock Text="API Key:" Foreground="{DynamicResource TextBrush}" FontSize="16" Margin="0,5,0,5"/>
- <TextBox Name="ApiKey" Width="340" Height="30" Margin="33,0,0,0" Style="{StaticResource RoundedTextBox}"/>
+ <TextBox Name="ApiKey" Width="330" Height="30" Margin="33,0,0,0" Style="{StaticResource RoundedTextBox}"/>
</StackPanel>
<!-- Video Path -->
<StackPanel Margin="0,0,0,15" Orientation="Horizontal">
+ <TextBlock Text="ⓘ" ToolTip="The directory where your clipping software saves kills. Check the README." Foreground="{DynamicResource TextBrush}" FontSize="20" Margin="0,3,3,5"/>
<TextBlock Text="Video Path:" Foreground="{DynamicResource TextBrush}" FontSize="16" Margin="0,5,0,5"/>
<StackPanel Orientation="Horizontal">
- <TextBox Name="VideoPath" Width="340" Height="30" Margin="10,0,0,0" Style="{StaticResource RoundedTextBox}"/>
+ <TextBox Name="VideoPath" Width="330" Height="30" Margin="10,0,0,0" Style="{StaticResource RoundedTextBox}"/>
<Button Content="Browse" Width="75" Height="30" FontFamily="{StaticResource Orbitron}" Margin="5,0" Style="{StaticResource ButtonStyle}" Click="VideoPathBrowseButton_Click"/>
</StackPanel>
</StackPanel>
@@ -69,8 +73,8 @@
</StackPanel>
<!-- Offline Mode Toggle Slider -->
- <StackPanel Margin="0,0,0,15" Orientation="Horizontal">
- <TextBlock Text="ⓘ" ToolTip="With Offline Mode enabled, kills will not be submitted to the configured API" Foreground="{DynamicResource TextBrush}" FontSize="20" Margin="0,4,3,5"/>
+ <StackPanel Margin="0,0,0,10" Orientation="Horizontal">
+ <TextBlock Text="ⓘ" ToolTip="With Offline Mode enabled, kills will not be submitted to the configured API." Foreground="{DynamicResource TextBrush}" FontSize="20" Margin="0,4,3,5"/>
<TextBlock Text="Offline Mode:" Foreground="{DynamicResource TextBrush}" FontSize="16" Margin="0,7,0,5"/>
<Slider Name="OfflineModeSlider" Minimum="0" Maximum="1" TickFrequency="1" IsSnapToTickEnabled="True" Value="0" Style="{StaticResource ToggleSliderStyle}" Margin="12,-4,0,0" ValueChanged="OfflineModeSlider_ValueChanged"/>
</StackPanel>
From d817b097ab79a7dc0577276544b693a9c740d4de Mon Sep 17 00:00:00 2001
From: Dork Normalize <nope>
Date: Fri, 28 Mar 2025 21:13:47 -0700
Subject: [PATCH 08/11] Add more ship detection events. Add threading to log
handling
---
AutoTrackR2/HomePage.xaml.cs | 9 ++--
.../JumpDriveStateChangedEvent.cs | 27 ++++++++++
.../RequestJumpFailedEvent.cs | 27 ++++++++++
AutoTrackR2/LogHandler.cs | 53 +++++++++++++++++--
AutoTrackR2/TrackREventDispatcher.cs | 8 +++
5 files changed, 114 insertions(+), 10 deletions(-)
create mode 100644 AutoTrackR2/LogEventHandlers/JumpDriveStateChangedEvent.cs
create mode 100644 AutoTrackR2/LogEventHandlers/RequestJumpFailedEvent.cs
diff --git a/AutoTrackR2/HomePage.xaml.cs b/AutoTrackR2/HomePage.xaml.cs
index cd264e6..318a63d 100644
--- a/AutoTrackR2/HomePage.xaml.cs
+++ b/AutoTrackR2/HomePage.xaml.cs
@@ -109,16 +109,13 @@ public partial class HomePage : UserControl
};
// Ship
- TrackREventDispatcher.InstancedInteriorEvent += (data) => {
- if (data.OwnerGEID == LocalPlayerData.Username && data.Ship != null)
- {
+ TrackREventDispatcher.JumpDriveStateChangedEvent += (shipName) => {
Dispatcher.Invoke(() =>
{
- PlayerShipTextBox.Text = data.Ship;
+ PlayerShipTextBox.Text = shipName;
AdjustFontSize(PlayerShipTextBox);
- LocalPlayerData.PlayerShip = data.Ship;
+ LocalPlayerData.PlayerShip = shipName;
});
- }
};
// Game Mode
diff --git a/AutoTrackR2/LogEventHandlers/JumpDriveStateChangedEvent.cs b/AutoTrackR2/LogEventHandlers/JumpDriveStateChangedEvent.cs
new file mode 100644
index 0000000..9955f7f
--- /dev/null
+++ b/AutoTrackR2/LogEventHandlers/JumpDriveStateChangedEvent.cs
@@ -0,0 +1,27 @@
+using System.Text.RegularExpressions;
+
+namespace AutoTrackR2.LogEventHandlers;
+
+public class JumpDriveStateChangedEvent : ILogEventHandler
+{
+ public Regex Pattern { get; }
+ private Regex _cleanUpPattern = new Regex(@"(.+?)_\d+$");
+
+ public JumpDriveStateChangedEvent()
+ {
+ Pattern = new Regex(@"<Jump Drive State Changed>.*.adam: (?<ShipName>.*.) in");
+ }
+
+ public void Handle(LogEntry entry)
+ {
+ if (entry.Message is null) return;
+ var match = Pattern.Match(entry.Message);
+ if (!match.Success) return;
+
+ match = _cleanUpPattern.Match(match.Groups["ShipName"].Value);
+ if (match.Success)
+ {
+ TrackREventDispatcher.OnJumpDriveStateChangedEvent(match.Groups[1].Value);;
+ }
+ }
+}
\ No newline at end of file
diff --git a/AutoTrackR2/LogEventHandlers/RequestJumpFailedEvent.cs b/AutoTrackR2/LogEventHandlers/RequestJumpFailedEvent.cs
new file mode 100644
index 0000000..c998685
--- /dev/null
+++ b/AutoTrackR2/LogEventHandlers/RequestJumpFailedEvent.cs
@@ -0,0 +1,27 @@
+using System.Text.RegularExpressions;
+
+namespace AutoTrackR2.LogEventHandlers;
+
+public class RequestJumpFailedEvent : ILogEventHandler
+{
+ public Regex Pattern { get; }
+ private Regex _cleanUpPattern = new Regex(@"(.+?)_\d+$");
+
+ public RequestJumpFailedEvent()
+ {
+ Pattern = new Regex(@"<Request Jump Failed>.*.adam: (?<ShipName>.*.) in");
+ }
+
+ public void Handle(LogEntry entry)
+ {
+ if (entry.Message is null) return;
+ var match = Pattern.Match(entry.Message);
+ if (!match.Success) return;
+
+ match = _cleanUpPattern.Match(match.Groups["ShipName"].Value);
+ if (match.Success)
+ {
+ TrackREventDispatcher.OnJumpDriveStateChangedEvent(match.Groups[1].Value);;
+ }
+ }
+}
\ No newline at end of file
diff --git a/AutoTrackR2/LogHandler.cs b/AutoTrackR2/LogHandler.cs
index ce2f0ba..6cb61dd 100644
--- a/AutoTrackR2/LogHandler.cs
+++ b/AutoTrackR2/LogHandler.cs
@@ -1,4 +1,5 @@
-using System.IO;
+using System.Diagnostics;
+using System.IO;
using System.Text.RegularExpressions;
using AutoTrackR2.LogEventHandlers;
@@ -13,11 +14,20 @@ public class LogEntry
public required string? Message { get; set; }
}
+
+enum GameProcessState
+{
+ NotRunning,
+ Running,
+ Unknown
+}
+
public class LogHandler(string logPath)
{
private readonly string? _logPath = logPath;
private FileStream? _fileStream;
private StreamReader? _reader;
+ private GameProcessState _gameProcessState = GameProcessState.Unknown;
private CancellationTokenSource cancellationToken = new CancellationTokenSource();
Thread? monitorThread;
@@ -29,7 +39,9 @@ public class LogHandler(string logPath)
new InstancedInteriorEvent(),
new InArenaCommanderEvent(),
new InPersistentUniverseEvent(),
- new GameVersionEvent()
+ new GameVersionEvent(),
+ new JumpDriveStateChangedEvent(),
+ new RequestJumpFailedEvent()
];
// Initialize the LogHandler and run all startup handlers
@@ -66,6 +78,7 @@ public class LogHandler(string logPath)
// Parse a single line of the log file and run matching handlers
private void HandleLogEntry(string line)
{
+ Console.WriteLine(line);
foreach (var handler in _eventHandlers)
{
var match = handler.Pattern.Match(line);
@@ -85,10 +98,14 @@ public class LogHandler(string logPath)
{
while (!token.IsCancellationRequested)
{
+ CheckGameProcessState();
+
if (_reader?.ReadLine() is { } line)
{
- HandleLogEntry(line);
- Console.WriteLine(line);
+ // start new thread to handle log entry
+ var thread = new Thread(() => HandleLogEntry(line));
+ thread.Start();
+ // Console.WriteLine(line);
}
else
{
@@ -98,4 +115,32 @@ public class LogHandler(string logPath)
}
Console.WriteLine("Monitor thread stopped");
}
+
+ private void CheckGameProcessState()
+ {
+ // Check if the game process is running by window name
+ var process = Process.GetProcesses().FirstOrDefault(p => p.MainWindowTitle == "Star Citizen");
+
+ GameProcessState newGameProcessState = process != null ? GameProcessState.Running : GameProcessState.NotRunning;
+
+ if (newGameProcessState == GameProcessState.Running && _gameProcessState == GameProcessState.NotRunning)
+ {
+ // Game process went from NotRunning to Running, so reload the Game.log file
+ Console.WriteLine("Game process started, reloading log file");
+
+ _reader?.Close();
+ _fileStream?.Close();
+
+ // Wait for the log file to be written to
+ Thread.Sleep(3000);
+
+ _fileStream = new FileStream(_logPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+ _reader = new StreamReader(_fileStream);
+
+ // Skip all the startup junk
+ while (_reader.ReadLine() is { } line) { }
+ }
+
+ _gameProcessState = newGameProcessState;
+ }
}
\ No newline at end of file
diff --git a/AutoTrackR2/TrackREventDispatcher.cs b/AutoTrackR2/TrackREventDispatcher.cs
index 8b3f12d..9aaab03 100644
--- a/AutoTrackR2/TrackREventDispatcher.cs
+++ b/AutoTrackR2/TrackREventDispatcher.cs
@@ -46,4 +46,12 @@ public static class TrackREventDispatcher
{
VehicleDestructionEvent?.Invoke(data);
}
+
+ // Jump Drive state has changed
+ // Todo: Add proper data for this event. Right now only ship name is used.
+ public static event Action<string>? JumpDriveStateChangedEvent;
+ public static void OnJumpDriveStateChangedEvent(string shipName)
+ {
+ JumpDriveStateChangedEvent?.Invoke(shipName);
+ }
}
\ No newline at end of file
From 3f892c6a3749b0d3d843ea8b580294e32da5e13c Mon Sep 17 00:00:00 2001
From: Dork Normalize <nope>
Date: Sun, 30 Mar 2025 19:01:50 -0700
Subject: [PATCH 09/11] Fix CSV parsing dates with commas. Fix UEE record
scraping
---
AutoTrackR2/HomePage.xaml.cs | 27 ++++++++++++++++++++--
AutoTrackR2/KillHistoryManager.cs | 3 +++
AutoTrackR2/WebHandler.cs | 38 ++++++++++++-------------------
3 files changed, 42 insertions(+), 26 deletions(-)
diff --git a/AutoTrackR2/HomePage.xaml.cs b/AutoTrackR2/HomePage.xaml.cs
index 318a63d..2227fd0 100644
--- a/AutoTrackR2/HomePage.xaml.cs
+++ b/AutoTrackR2/HomePage.xaml.cs
@@ -146,11 +146,27 @@ public partial class HomePage : UserControl
EnemyPilot = actorDeathData.VictimPilot,
EnemyShip = actorDeathData.VictimShip,
OrgAffiliation = playerData?.OrgName,
+ Weapon = actorDeathData.Weapon,
+ Ship = LocalPlayerData.PlayerShip ?? "Unknown",
+ Method = actorDeathData.DamageType,
+ RecordNumber = playerData?.UEERecord,
+ GameVersion = LocalPlayerData.GameVersion ?? "Unknown",
+ TrackRver = UpdatePage.currentVersion.Replace("v", "") ?? "Unknown",
Enlisted = playerData?.JoinDate,
KillTime = DateTime.UtcNow.ToString("dd MMM yyyy HH:mm"),
- PFP = playerData?.PFPURL
+ PFP = playerData?.PFPURL ?? "https://cdn.robertsspaceindustries.com/static/images/account/avatar_default_big.jpg"
};
+ switch (LocalPlayerData.CurrentGameMode)
+ {
+ case GameMode.PersistentUniverse:
+ killData.Mode = "pu";
+ break;
+ case GameMode.ArenaCommander:
+ killData.Mode = "ac";
+ break;
+ }
+
// Add kill to UI
Dispatcher.Invoke(() =>
{
@@ -160,7 +176,7 @@ public partial class HomePage : UserControl
// Only submit kill data if not in offline mode
if (ConfigManager.OfflineMode == 0)
{
- await WebHandler.SubmitKill(actorDeathData, playerData);
+ await WebHandler.SubmitKill(killData);
}
_killHistoryManager.AddKill(killData);
@@ -234,6 +250,8 @@ public partial class HomePage : UserControl
FontFamily = orbitronFontFamily,
});
+ killTextBlock.Inlines.Add(new Run($"{killData.RecordNumber}\n"));
+
killTextBlock.Inlines.Add(new Run("Kill Time: ")
{
Foreground = altTextColorBrush,
@@ -261,6 +279,11 @@ public partial class HomePage : UserControl
// Add the TextBlock to the first column of the Grid
Grid.SetColumn(killTextBlock, 0);
killGrid.Children.Add(killTextBlock);
+
+ if (killData.PFP == "")
+ {
+ killData.PFP = "https://cdn.robertsspaceindustries.com/static/images/account/avatar_default_big.jpg";
+ }
// Create the Image for the profile
var profileImage = new Image
diff --git a/AutoTrackR2/KillHistoryManager.cs b/AutoTrackR2/KillHistoryManager.cs
index fd07f2e..831a6ae 100644
--- a/AutoTrackR2/KillHistoryManager.cs
+++ b/AutoTrackR2/KillHistoryManager.cs
@@ -28,6 +28,9 @@ public class KillHistoryManager
File.WriteAllText(_killHistoryPath, _headers);
}
+ // Remove comma from Enlisted
+ killData.Enlisted = killData.Enlisted?.Replace(",", string.Empty);
+
// Append the new kill data to the CSV file
var csv = new StringBuilder();
csv.AppendLine($"\"{killData.KillTime}\",\"{killData.EnemyPilot}\",\"{killData.EnemyShip}\",\"{killData.Enlisted}\",\"{killData.RecordNumber}\",\"{killData.OrgAffiliation}\",\"{killData.Player}\",\"{killData.Weapon}\",\"{killData.Ship}\",\"{killData.Method}\",\"{killData.Mode}\",\"{killData.GameVersion}\",\"{killData.TrackRver}\",\"{killData.Logged}\",\"{killData.PFP}\"");
diff --git a/AutoTrackR2/WebHandler.cs b/AutoTrackR2/WebHandler.cs
index c46d192..af2ebc7 100644
--- a/AutoTrackR2/WebHandler.cs
+++ b/AutoTrackR2/WebHandler.cs
@@ -27,7 +27,7 @@ public static class WebHandler
public static async Task<PlayerData?> GetPlayerData(string enemyPilot)
{
var joinDataPattern = new Regex("<span class=\"label\">Enlisted</span>\\s*<strong class=\"value\">([^<]+)</strong>");
- var ueePattern = new Regex("<p class=\"entry citizen-record\">\\s*<span class=\"label\">UEE Citizen Record<\\/span>\\s*<strong class=\"value\">#?(n\\/a|\\d+)<\\/strong>\\s*<\\/p>");
+ var ueePattern = new Regex("<p class=\"entry citizen-record\">\\n.*.<span class=\"label\">UEE Citizen Record<\\/span>\\n.*.<strong class=\"value\">#(?<UEERecord>\\d+)<\\/strong>");
var orgPattern = new Regex("\\/orgs\\/(?<OrgURL>[A-z0-9]+)\" .*\\>(?<OrgName>.*)<");
var pfpPattern = new Regex("/media/(.*)\"");
@@ -51,7 +51,7 @@ public static class WebHandler
var ueeMatch = ueePattern.Match(content);
if (ueeMatch.Success)
{
- playerData.UEERecord = ueeMatch.Groups[1].Value == "n/a" ? "-1" : ueeMatch.Groups[1].Value;
+ playerData.UEERecord = ueeMatch.Groups["UEERecord"].Value == "n/a" ? "-1" : ueeMatch.Groups[1].Value;
}
var orgMatch = orgPattern.Match(content);
@@ -78,33 +78,23 @@ public static class WebHandler
return playerData;
}
- public static async Task SubmitKill(ActorDeathData deathData, PlayerData? enemyPlayerData)
+ public static async Task SubmitKill(KillData killData)
{
- var killData = new APIKillData
+ var apiKillData = new APIKillData
{
- victim_ship = deathData.VictimShip,
- victim = deathData.VictimPilot,
- enlisted = enemyPlayerData?.JoinDate,
- rsi = enemyPlayerData?.UEERecord,
- weapon = deathData.Weapon,
- method = deathData.DamageType,
+ victim_ship = killData.EnemyShip,
+ victim = killData.EnemyPilot,
+ enlisted = killData.Enlisted,
+ rsi = killData.RecordNumber,
+ weapon = killData.Weapon,
+ method = killData.Method,
// loadout_ship = LocalPlayerData.PlayerShip ?? "Unknown",
- loadout_ship = LocalPlayerData.PlayerShip ?? "Unknown",
- game_version = LocalPlayerData.GameVersion ?? "Unknown",
- trackr_version = UpdatePage.currentVersion.Replace("v", "") ?? "Unknown",
- location = LocalPlayerData.LastSeenVehicleLocation ?? "Unknown"
+ loadout_ship = killData.Ship,
+ game_version = killData.GameVersion,
+ trackr_version = killData.TrackRver,
+ location = "Unknown"
};
- switch (LocalPlayerData.CurrentGameMode)
- {
- case GameMode.PersistentUniverse:
- killData.gamemode = "pu";
- break;
- case GameMode.ArenaCommander:
- killData.gamemode = "ac";
- break;
- }
-
var httpClient = new HttpClient();
string jsonData = JsonSerializer.Serialize(killData);
httpClient.DefaultRequestHeaders.Add("Authorization", "Bearer " + ConfigManager.ApiKey);
From e9f0e75d6096e4f62e46433d94d912797d5a57ff Mon Sep 17 00:00:00 2001
From: Dork Normalize <nope>
Date: Mon, 31 Mar 2025 04:33:28 -0700
Subject: [PATCH 10/11] Drastically increase log processing speed
---
AutoTrackR2/LogHandler.cs | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/AutoTrackR2/LogHandler.cs b/AutoTrackR2/LogHandler.cs
index 6cb61dd..3c7bef5 100644
--- a/AutoTrackR2/LogHandler.cs
+++ b/AutoTrackR2/LogHandler.cs
@@ -100,14 +100,20 @@ public class LogHandler(string logPath)
{
CheckGameProcessState();
- if (_reader?.ReadLine() is { } line)
+ List<string> lines = new List<string>();
+ while (_reader.ReadLine() is { } line)
+ {
+ lines.Add(line);
+ }
+
+ foreach (var line in lines)
{
// start new thread to handle log entry
var thread = new Thread(() => HandleLogEntry(line));
thread.Start();
// Console.WriteLine(line);
}
- else
+
{
// Wait for new lines to be written to the log file
Thread.Sleep(1000);
@@ -131,14 +137,8 @@ public class LogHandler(string logPath)
_reader?.Close();
_fileStream?.Close();
- // Wait for the log file to be written to
- Thread.Sleep(3000);
-
_fileStream = new FileStream(_logPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
_reader = new StreamReader(_fileStream);
-
- // Skip all the startup junk
- while (_reader.ReadLine() is { } line) { }
}
_gameProcessState = newGameProcessState;
From 666b5ce11f00b74062242b72b7356faa77874242 Mon Sep 17 00:00:00 2001
From: Dork Normalize <nope>
Date: Sun, 6 Apr 2025 15:04:09 -0700
Subject: [PATCH 11/11] Varius bug fixes
---
AutoTrackR2/HomePage.xaml.cs | 4 ++--
AutoTrackR2/KillHistoryManager.cs | 14 +++++++++++++-
AutoTrackR2/LogHandler.cs | 7 ++++++-
AutoTrackR2/WebHandler.cs | 21 +++++++++++++++++++--
4 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/AutoTrackR2/HomePage.xaml.cs b/AutoTrackR2/HomePage.xaml.cs
index 2227fd0..e3eb36a 100644
--- a/AutoTrackR2/HomePage.xaml.cs
+++ b/AutoTrackR2/HomePage.xaml.cs
@@ -28,9 +28,9 @@ public partial class HomePage : UserControl
// Set the TextBlock text
KillTallyTitle.Text = $"Kill Tally - {_killHistoryManager.GetKillsInCurrentMonth().Count}";
AddKillHistoryKillsToUI();
+
}
-
- // Update Start/Stop button states based on the isRunning flag
+ //
public void UpdateButtonState(bool isRunning)
{
var accentColor = (Color)Application.Current.Resources["AccentColor"];
diff --git a/AutoTrackR2/KillHistoryManager.cs b/AutoTrackR2/KillHistoryManager.cs
index 831a6ae..5c87a17 100644
--- a/AutoTrackR2/KillHistoryManager.cs
+++ b/AutoTrackR2/KillHistoryManager.cs
@@ -34,7 +34,19 @@ public class KillHistoryManager
// Append the new kill data to the CSV file
var csv = new StringBuilder();
csv.AppendLine($"\"{killData.KillTime}\",\"{killData.EnemyPilot}\",\"{killData.EnemyShip}\",\"{killData.Enlisted}\",\"{killData.RecordNumber}\",\"{killData.OrgAffiliation}\",\"{killData.Player}\",\"{killData.Weapon}\",\"{killData.Ship}\",\"{killData.Method}\",\"{killData.Mode}\",\"{killData.GameVersion}\",\"{killData.TrackRver}\",\"{killData.Logged}\",\"{killData.PFP}\"");
- File.AppendAllText(_killHistoryPath, csv.ToString());
+
+ // Check file can be written to
+ try
+ {
+ using var fileStream = new FileStream(_killHistoryPath, FileMode.Append, FileAccess.Write, FileShare.None);
+ using var writer = new StreamWriter(fileStream);
+ writer.Write(csv.ToString());
+ }
+ catch (IOException ex)
+ {
+ // Handle the exception (e.g., log it)
+ Console.WriteLine($"Error writing to file: {ex.Message}");
+ }
}
public List<KillData> GetKills()
diff --git a/AutoTrackR2/LogHandler.cs b/AutoTrackR2/LogHandler.cs
index 3c7bef5..38ddd6e 100644
--- a/AutoTrackR2/LogHandler.cs
+++ b/AutoTrackR2/LogHandler.cs
@@ -78,7 +78,7 @@ public class LogHandler(string logPath)
// Parse a single line of the log file and run matching handlers
private void HandleLogEntry(string line)
{
- Console.WriteLine(line);
+ // Console.WriteLine(line);
foreach (var handler in _eventHandlers)
{
var match = handler.Pattern.Match(line);
@@ -98,6 +98,11 @@ public class LogHandler(string logPath)
{
while (!token.IsCancellationRequested)
{
+ if (_reader == null || _fileStream == null)
+ {
+ break;
+ }
+
CheckGameProcessState();
List<string> lines = new List<string>();
diff --git a/AutoTrackR2/WebHandler.cs b/AutoTrackR2/WebHandler.cs
index af2ebc7..2d8ad59 100644
--- a/AutoTrackR2/WebHandler.cs
+++ b/AutoTrackR2/WebHandler.cs
@@ -80,6 +80,8 @@ public static class WebHandler
public static async Task SubmitKill(KillData killData)
{
+ // int secondSpaceIndex = killData.Enlisted.IndexOf(" ", killData.Enlisted.IndexOf(" ") + 1);
+ // killData.Enlisted = killData.Enlisted.Insert(secondSpaceIndex, ",");
var apiKillData = new APIKillData
{
victim_ship = killData.EnemyShip,
@@ -88,6 +90,7 @@ public static class WebHandler
rsi = killData.RecordNumber,
weapon = killData.Weapon,
method = killData.Method,
+ gamemode = killData.Mode,
// loadout_ship = LocalPlayerData.PlayerShip ?? "Unknown",
loadout_ship = killData.Ship,
game_version = killData.GameVersion,
@@ -95,11 +98,25 @@ public static class WebHandler
location = "Unknown"
};
+ if (string.IsNullOrEmpty(apiKillData.rsi))
+ {
+ apiKillData.rsi = "-1";
+ }
+
var httpClient = new HttpClient();
- string jsonData = JsonSerializer.Serialize(killData);
+ string jsonData = JsonSerializer.Serialize(apiKillData);
httpClient.DefaultRequestHeaders.Add("Authorization", "Bearer " + ConfigManager.ApiKey);
httpClient.DefaultRequestHeaders.Add("User-Agent", "AutoTrackR2");
httpClient.DefaultRequestHeaders.Add("Accept", "application/json");
- await httpClient.PostAsync(ConfigManager.ApiUrl + "register-kill", new StringContent(jsonData, Encoding.UTF8, "application/json"));
+ var response = await httpClient.PostAsync(ConfigManager.ApiUrl + "register-kill", new StringContent(jsonData, Encoding.UTF8, "application/json"));
+ if (response.StatusCode != HttpStatusCode.OK)
+ {
+ Console.WriteLine("Failed to submit kill data: ");
+ Console.WriteLine(jsonData);
+ }
+ else if (response.StatusCode == HttpStatusCode.OK)
+ {
+ Console.WriteLine("Successfully submitted kill data");
+ }
}
}
\ No newline at end of file