iamdoubz/OpenBullet
1
0
Fork 0
mirror of https://github.com/openbullet/openbullet.git synced 2023-10-21 07:33:42 -05:00
Code Issues Releases Wiki Activity

Added the ability to not create an empty variable when the Parse Block fails.

Browse Source
This commit is contained in:
ruri
2019-05-09 01:14:12 +02:00
parent a2cc07a100
commit 74d5aa3436
7 changed files with 72 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RuriLib/Blocks/BlockParse.cs
+15 -5
View File
@@ -63,6 +63,10 @@ namespace RuriLib
/// <summary>Whether to URL encode the parsed text.</summary>
public bool EncodeOutput { get { return encodeOutput; } set { encodeOutput = value; OnPropertyChanged(); } }
private bool createEmpty = true;
/// <summary>Whether to create the variable with an empty value if the parsing was not successful.</summary>
public bool CreateEmpty { get { return createEmpty; } set { createEmpty = value; OnPropertyChanged(); } }
private ParseType type = ParseType.LR;
/// <summary>The parsing algorithm being used.</summary>
public ParseType Type { get { return type; } set { type = value; OnPropertyChanged(); } }
@@ -151,7 +155,7 @@ namespace RuriLib
LineParser.SetBool(ref input, this);
else if (LineParser.Lookahead(ref input) == TokenType.Integer)
CssElementIndex = LineParser.ParseInt(ref input, "INDEX");
if (LineParser.Lookahead(ref input) == TokenType.Boolean)
while (LineParser.Lookahead(ref input) == TokenType.Boolean)
LineParser.SetBool(ref input, this);
break;
@@ -216,6 +220,7 @@ namespace RuriLib
.Literal(RightString)
.Boolean(Recursive, "Recursive")
.Boolean(EncodeOutput, "EncodeOutput")
.Boolean(CreateEmpty, "CreateEmpty")
.Boolean(UseRegexLR, "UseRegexLR");
break;
@@ -225,14 +230,18 @@ namespace RuriLib
.Literal(AttributeName);
if (Recursive) writer.Boolean(Recursive, "Recursive");
else writer.Integer(CssElementIndex, "CssElementIndex");
writer.Boolean(EncodeOutput, "EncodeOutput");
writer
.Boolean(EncodeOutput, "EncodeOutput")
.Boolean(CreateEmpty, "CreateEmpty");
break;
case ParseType.JSON:
writer
.Literal(JsonField)
.Boolean(Recursive, "Recursive")
.Boolean(EncodeOutput, "EncodeOutput");
.Boolean(EncodeOutput, "EncodeOutput")
.Boolean(CreateEmpty, "CreateEmpty");
break;
case ParseType.REGEX:
@@ -240,7 +249,8 @@ namespace RuriLib
.Literal(RegexString)
.Literal(RegexOutput)
.Boolean(Recursive, "Recursive")
.Boolean(EncodeOutput, "EncodeOutput");
.Boolean(EncodeOutput, "EncodeOutput")
.Boolean(CreateEmpty, "CreateEmpty");
break;
}
@@ -260,7 +270,7 @@ namespace RuriLib
{
base.Process(data);
InsertVariables(data, isCapture, recursive, Parse(data), variableName, prefix, suffix, encodeOutput);
InsertVariables(data, isCapture, recursive, Parse(data), variableName, prefix, suffix, encodeOutput, createEmpty);
}
private List<string> Parse(BotData data)