Skip to content

Commit 7fdf128

Browse files
committed
Only log keycheck header once
1 parent 82d072a commit 7fdf128

3 files changed

Lines changed: 10 additions & 19 deletions

File tree

RuriLib.Tests/Models/Blocks/Custom/KeycheckBlockInstanceTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public void ToSyntax_NormalBlock_OutputScript()
192192
block.Label = "My Label";
193193
block.Keychains = CreateKeychains();
194194

195-
var expected = $"if (CheckCondition(data, myString.AsString(), StrComparison.Contains, \"abc\") || CheckCondition(data, 3F, NumComparison.GreaterThan, 1.5F)){_nl} {{ data.STATUS = \"SUCCESS\"; }}{_nl}else if (CheckCondition(data, myList.AsList(), ListComparison.Contains, \"abc\") && CheckCondition(data, myDict.AsDict(), DictComparison.HasKey, \"abc\")){_nl} {{ data.STATUS = \"FAIL\"; return; }}{_nl}else if (myBool.AsBool()){_nl} {{ data.STATUS = \"BAN\"; return; }}{_nl}if (CheckGlobalBanKeys(data)) {{ data.STATUS = \"BAN\"; return; }}{_nl}if (CheckGlobalRetryKeys(data)) {{ data.STATUS = \"RETRY\"; return; }}{_nl}";
195+
var expected = $"data.Logger.LogHeader(\"CheckCondition\");{_nl}if (CheckCondition(data, myString.AsString(), StrComparison.Contains, \"abc\") || CheckCondition(data, 3F, NumComparison.GreaterThan, 1.5F)){_nl} {{ data.STATUS = \"SUCCESS\"; }}{_nl}else if (CheckCondition(data, myList.AsList(), ListComparison.Contains, \"abc\") && CheckCondition(data, myDict.AsDict(), DictComparison.HasKey, \"abc\")){_nl} {{ data.STATUS = \"FAIL\"; return; }}{_nl}else if (myBool.AsBool()){_nl} {{ data.STATUS = \"BAN\"; return; }}{_nl}if (CheckGlobalBanKeys(data)) {{ data.STATUS = \"BAN\"; return; }}{_nl}if (CheckGlobalRetryKeys(data)) {{ data.STATUS = \"RETRY\"; return; }}{_nl}";
196196
Assert.Equal(NormalizeSnippet(expected), RenderSyntax(block, new ConfigSettings()));
197197
}
198198

@@ -205,14 +205,15 @@ public void ToSyntax_NoKeychains_OutputScript()
205205
banIfNoMatch.InputMode = SettingInputMode.Variable;
206206
banIfNoMatch.InputVariableName = "myBool";
207207

208-
var expected = $"if (myBool.AsBool()){_nl} {{ data.STATUS = \"BAN\"; return; }}{_nl}if (CheckGlobalBanKeys(data)) {{ data.STATUS = \"BAN\"; return; }}{_nl}if (CheckGlobalRetryKeys(data)) {{ data.STATUS = \"RETRY\"; return; }}{_nl}";
208+
var expected = $"data.Logger.LogHeader(\"CheckCondition\");{_nl}if (myBool.AsBool()){_nl} {{ data.STATUS = \"BAN\"; return; }}{_nl}if (CheckGlobalBanKeys(data)) {{ data.STATUS = \"BAN\"; return; }}{_nl}if (CheckGlobalRetryKeys(data)) {{ data.STATUS = \"RETRY\"; return; }}{_nl}";
209209
Assert.Equal(NormalizeSnippet(expected), RenderSyntax(block, new ConfigSettings()));
210210
}
211211

212212
[Fact]
213213
public void ToSyntax_TracksExpectedStatusFlowVariants()
214214
{
215215
AssertSyntax(CreateVariableBanBlock(), new ConfigSettings(),
216+
"data.Logger.LogHeader(\"CheckCondition\")",
216217
"if (CheckCondition(data, ObjectExtensions.DynamicAsString(globals.myString), StrComparison.Contains, \"abc\") || CheckCondition(data, 3F, NumComparison.GreaterThan, 1.5F))",
217218
"data.STATUS = \"SUCCESS\";",
218219
"else if (CheckCondition(data, ObjectExtensions.DynamicAsList(globals.myList), ListComparison.Contains, \"abc\") && CheckCondition(data, ObjectExtensions.DynamicAsDict(input.myDict), DictComparison.HasKey, \"abc\"))",

RuriLib/Blocks/Conditions/Methods.cs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ public static class Methods
2222
/// </summary>
2323
public static bool CheckCondition(BotData data, bool leftTerm, BoolComparison comparison, bool rightTerm)
2424
{
25-
data.Logger.LogHeader();
26-
2725
var result = RuriLib.Functions.Conditions.Conditions.Check(leftTerm, comparison, rightTerm);
2826

2927
if (result)
@@ -39,8 +37,6 @@ public static bool CheckCondition(BotData data, bool leftTerm, BoolComparison co
3937
/// </summary>
4038
public static bool CheckCondition(BotData data, string leftTerm, StrComparison comparison, string rightTerm)
4139
{
42-
data.Logger.LogHeader();
43-
4440
var result = RuriLib.Functions.Conditions.Conditions.Check(leftTerm, comparison, rightTerm);
4541

4642
if (result)
@@ -56,8 +52,6 @@ public static bool CheckCondition(BotData data, string leftTerm, StrComparison c
5652
/// </summary>
5753
public static bool CheckCondition(BotData data, List<string> leftTerm, ListComparison comparison, string rightTerm)
5854
{
59-
data.Logger.LogHeader();
60-
6155
var result = RuriLib.Functions.Conditions.Conditions.Check(leftTerm, comparison, rightTerm);
6256

6357
if (result)
@@ -73,8 +67,6 @@ public static bool CheckCondition(BotData data, List<string> leftTerm, ListCompa
7367
/// </summary>
7468
public static bool CheckCondition(BotData data, int leftTerm, NumComparison comparison, int rightTerm)
7569
{
76-
data.Logger.LogHeader();
77-
7870
var result = RuriLib.Functions.Conditions.Conditions.Check(leftTerm, comparison, rightTerm);
7971

8072
if (result)
@@ -90,8 +82,6 @@ public static bool CheckCondition(BotData data, int leftTerm, NumComparison comp
9082
/// </summary>
9183
public static bool CheckCondition(BotData data, float leftTerm, NumComparison comparison, float rightTerm)
9284
{
93-
data.Logger.LogHeader();
94-
9585
var result = RuriLib.Functions.Conditions.Conditions.Check(leftTerm, comparison, rightTerm);
9686

9787
if (result)
@@ -107,8 +97,6 @@ public static bool CheckCondition(BotData data, float leftTerm, NumComparison co
10797
/// </summary>
10898
public static bool CheckCondition(BotData data, Dictionary<string, string> leftTerm, DictComparison comparison, string rightTerm)
10999
{
110-
data.Logger.LogHeader();
111-
112100
var result = RuriLib.Functions.Conditions.Conditions.Check(leftTerm, comparison, rightTerm);
113101

114102
if (result)
@@ -124,8 +112,6 @@ public static bool CheckCondition(BotData data, Dictionary<string, string> leftT
124112
/// </summary>
125113
public static bool CheckGlobalBanKeys(BotData data)
126114
{
127-
data.Logger.LogHeader();
128-
129115
var result = data.Providers.ProxySettings.ContainsBanKey(data.SOURCE, out var matchedKey);
130116

131117
if (result)
@@ -141,8 +127,6 @@ public static bool CheckGlobalBanKeys(BotData data)
141127
/// </summary>
142128
public static bool CheckGlobalRetryKeys(BotData data)
143129
{
144-
data.Logger.LogHeader();
145-
146130
var result = data.Providers.ProxySettings.ContainsRetryKey(data.SOURCE, out var matchedKey);
147131

148132
if (result)

RuriLib/Models/Blocks/Custom/KeycheckBlockInstance.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,13 @@ public override IEnumerable<StatementSyntax> ToSyntax(BlockSyntaxGenerationConte
153153
{
154154
ArgumentNullException.ThrowIfNull(context);
155155

156-
var statements = new List<StatementSyntax>();
156+
var statements = new List<StatementSyntax>
157+
{
158+
BlockSyntaxFactory.CreateMemberInvocation(
159+
Expr("data.Logger"),
160+
"LogHeader",
161+
Arg(Lit("CheckCondition"))).Stmt()
162+
};
157163
var banIfNoMatch = Settings["banIfNoMatch"];
158164
var nonEmpty = Keychains.Where(kc => kc.Keys.Count > 0).ToList();
159165
var continueBan = context.Settings.GeneralSettings.ContinueStatuses.Contains("BAN");

0 commit comments

Comments
 (0)