From 49663a0c6706be0c5f6d66bef8a2d2a32b8960ed Mon Sep 17 00:00:00 2001
From: ruri <ruridev@protonmail.com>
Date: Wed, 29 May 2019 11:20:28 +0200
Subject: [PATCH] Added hit type column to the Runner's hit table.

---
 OpenBullet/Pages/Main/Runner/Runner.xaml |  3 ++-
 RuriLib/Models/ValidData.cs              |  8 +++++++-
 RuriLib/Runner/RunnerViewModel.cs        | 10 +++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/OpenBullet/Pages/Main/Runner/Runner.xaml b/OpenBullet/Pages/Main/Runner/Runner.xaml
index 00ee7fd..e82e15a 100644
--- a/OpenBullet/Pages/Main/Runner/Runner.xaml
+++ b/OpenBullet/Pages/Main/Runner/Runner.xaml
@@ -226,7 +226,8 @@
                             <GridViewColumn Header="Time" DisplayMemberBinding="{Binding Path=Time}" />
                             <GridViewColumn Header="Data" DisplayMemberBinding="{Binding Path=Data}" />
                             <GridViewColumn Header="Proxy" DisplayMemberBinding="{Binding Path=Proxy}" />
-                            <GridViewColumn Width="2000" Header="Captured Data" DisplayMemberBinding="{Binding Path=CapturedData}" />
+                            <GridViewColumn Header="Type" DisplayMemberBinding="{Binding Path=Type}"/>
+                            <GridViewColumn Width="2000" Header="Capture" DisplayMemberBinding="{Binding Path=CapturedData}" />
                         </GridView>
                     </ListView.View>
                 </ListView>
diff --git a/RuriLib/Models/ValidData.cs b/RuriLib/Models/ValidData.cs
index daf9703..793b872 100644
--- a/RuriLib/Models/ValidData.cs
+++ b/RuriLib/Models/ValidData.cs
@@ -26,6 +26,10 @@ namespace RuriLib.Models
         /// <summary>The result of the check.</summary>
         public BotStatus Result { get { return result; } set { result = value; OnPropertyChanged(); } }
 
+        private string type;
+        /// <summary>The type of the result.</summary>
+        public string Type { get { return type; } set { type = value; OnPropertyChanged(); } }
+
         private string capturedData;
         /// <summary>The data captured during the check.</summary>
         public string CapturedData { get { return capturedData; } set { capturedData = value; OnPropertyChanged(); } }
@@ -55,14 +59,16 @@ namespace RuriLib.Models
         /// <param name="proxy">The proxy that was used for the check (empty string if none)</param>
         /// <param name="proxyType">The proxy type</param>
         /// <param name="result">The result of the check</param>
+        /// <param name="type">The result type</param>
         /// <param name="capturedData">The data captured during the check</param>
         /// <param name="source">The last page source code of the check</param>
         /// <param name="log">The detailed log of the check</param>
-        public ValidData(string data, string proxy, ProxyType proxyType, BotStatus result, string capturedData, string source, List<LogEntry> log)
+        public ValidData(string data, string proxy, ProxyType proxyType, BotStatus result, string type, string capturedData, string source, List<LogEntry> log)
         {
             Data = data;
             Proxy = proxy;
             Result = result;
+            Type = type;
             CapturedData = capturedData;
             UnixDate = (int)Math.Round((DateTime.Now - new DateTime(1970, 1, 1, 0, 0, 0)).TotalSeconds);
             Source = source;
diff --git a/RuriLib/Runner/RunnerViewModel.cs b/RuriLib/Runner/RunnerViewModel.cs
index 794d305..c620744 100644
--- a/RuriLib/Runner/RunnerViewModel.cs
+++ b/RuriLib/Runner/RunnerViewModel.cs
@@ -447,7 +447,7 @@ namespace RuriLib.Runner
                 // Check if it's valid
                 if (!c.IsValid || !c.RespectsRules(Config.Settings.DataRules.ToList()))
                 {
-                    FailedList.Add(new ValidData(data, "", ProxyType.Http, BotStatus.FAIL, "", "", null));
+                    FailedList.Add(new ValidData(data, "", ProxyType.Http, BotStatus.FAIL, "", "", "", null));
                     continue;
                 }
 
@@ -791,7 +791,7 @@ namespace RuriLib.Runner
                 switch (botData.Status)
                 {
                     case BotStatus.SUCCESS:
-                        validData = new ValidData(botData.Data.Data, botData.Proxy == null ? "" : botData.Proxy.Proxy, botData.Proxy == null ? ProxyType.Http : botData.Proxy.Type, botData.Status, capturedData.ToCaptureString(), Settings.General.SaveLastSource ? botData.ResponseSource : "", BotLog);
+                        validData = new ValidData(botData.Data.Data, botData.Proxy == null ? "" : botData.Proxy.Proxy, botData.Proxy == null ? ProxyType.Http : botData.Proxy.Type, botData.Status, "HIT", capturedData.ToCaptureString(), Settings.General.SaveLastSource ? botData.ResponseSource : "", BotLog);
                         RaiseDispatchAction(new Action(() => HitsList.Add(validData)));
                         if (UseProxies && !Settings.Proxies.NeverBan && Settings.Proxies.BanAfterGoodStatus)
                         {
@@ -803,12 +803,12 @@ namespace RuriLib.Runner
                         break;
 
                     case BotStatus.FAIL:
-                        FailedList.Add(new ValidData("", "", ProxyType.Http, botData.Status, "", "", null)); // Only needed for CPM calculation so we can set blank data to avoid filling RAM
+                        FailedList.Add(new ValidData("", "", ProxyType.Http, botData.Status, "", "", "", null)); // Only needed for CPM calculation so we can set blank data to avoid filling RAM
                         break;
 
                     case BotStatus.CUSTOM:
                         hitType = botData.CustomStatus;
-                        validData = new ValidData(botData.Data.Data, botData.Proxy == null ? "" : botData.Proxy.Proxy, botData.Proxy == null ? ProxyType.Http : botData.Proxy.Type, botData.Status, capturedData.ToCaptureString(), Settings.General.SaveLastSource ? botData.ResponseSource : "", BotLog);
+                        validData = new ValidData(botData.Data.Data, botData.Proxy == null ? "" : botData.Proxy.Proxy, botData.Proxy == null ? ProxyType.Http : botData.Proxy.Type, botData.Status, hitType, capturedData.ToCaptureString(), Settings.General.SaveLastSource ? botData.ResponseSource : "", BotLog);
                         RaiseDispatchAction(new Action(() => CustomList.Add(validData)));
 
                         if (UseProxies && !Settings.Proxies.NeverBan && Settings.Proxies.BanAfterGoodStatus)
@@ -840,7 +840,7 @@ namespace RuriLib.Runner
                         goto GETPROXY;
 
                     case BotStatus.NONE:
-                        validData = new ValidData(botData.Data.Data, botData.Proxy == null ? "" : botData.Proxy.Proxy, botData.Proxy == null ? ProxyType.Http : botData.Proxy.Type, botData.Status, capturedData.ToCaptureString(), Settings.General.SaveLastSource ? botData.ResponseSource : "", BotLog);
+                        validData = new ValidData(botData.Data.Data, botData.Proxy == null ? "" : botData.Proxy.Proxy, botData.Proxy == null ? ProxyType.Http : botData.Proxy.Type, botData.Status, "TOCHK", capturedData.ToCaptureString(), Settings.General.SaveLastSource ? botData.ResponseSource : "", BotLog);
                         RaiseDispatchAction(new Action(() => ToCheckList.Add(validData)));
 
                         if (UseProxies && !Settings.Proxies.NeverBan && Settings.Proxies.BanAfterGoodStatus)