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 @@
-
+
+
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
/// The result of the check.
public BotStatus Result { get { return result; } set { result = value; OnPropertyChanged(); } }
+ private string type;
+ /// The type of the result.
+ public string Type { get { return type; } set { type = value; OnPropertyChanged(); } }
+
private string capturedData;
/// The data captured during the check.
public string CapturedData { get { return capturedData; } set { capturedData = value; OnPropertyChanged(); } }
@@ -55,14 +59,16 @@ namespace RuriLib.Models
/// The proxy that was used for the check (empty string if none)
/// The proxy type
/// The result of the check
+ /// The result type
/// The data captured during the check
/// The last page source code of the check
/// The detailed log of the check
- public ValidData(string data, string proxy, ProxyType proxyType, BotStatus result, string capturedData, string source, List log)
+ public ValidData(string data, string proxy, ProxyType proxyType, BotStatus result, string type, string capturedData, string source, List 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)