mikx
/
Filtration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve parsing & bug fixes

This commit is contained in:
azakhi 2018-08-20 01:35:49 +03:00
parent e5209fb459
commit 7fb9378304
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Filtration.Parser/Services/ItemFilterBlockTranslator.cs
View File

@ -312,6 +312,7 @@ namespace Filtration.Parser.Services
private static void AddBooleanItemToBlockItems<T>(IItemFilterBlock block, string inputString) where T : BooleanBlockItem private static void AddBooleanItemToBlockItems<T>(IItemFilterBlock block, string inputString) where T : BooleanBlockItem
{ {
inputString = Regex.Replace(inputString, @"\s+", " ");
var blockItem = Activator.CreateInstance<T>(); var blockItem = Activator.CreateInstance<T>();
var splitString = inputString.Split(' '); var splitString = inputString.Split(' ');
if (splitString.Length == 2) if (splitString.Length == 2)

18
Filtration.Parser/Services/ItemFilterScriptTranslator.cs
View File

@ -115,9 +115,10 @@ namespace Filtration.Parser.Services
var parsingCommented = false; var parsingCommented = false;
for (var i = 0; i < lines.Length; i++) for (var i = 0; i < lines.Length; i++)
{ {
if (!parsingCommented) if (!parsingCommented && lines[i].StartsWith("#"))
{ {
if (lines[i].StartsWith("# Show") || lines[i].StartsWith("#Show")) string curLine = Regex.Replace(lines[i].Substring(1), @"\s+", "");
if ((curLine.StartsWith("Show") || curLine.StartsWith("Hide")) && (curLine.Length == 4 || curLine[4] == '#'))
{ {
parsingCommented = true; parsingCommented = true;
lines[i] = "#Disabled Block Start" + Environment.NewLine + lines[i]; lines[i] = "#Disabled Block Start" + Environment.NewLine + lines[i];
@ -125,7 +126,7 @@ namespace Filtration.Parser.Services
} }
else else
{ {
if (!lines[i].StartsWith("#")) if (parsingCommented && !lines[i].StartsWith("#"))
{ {
parsingCommented = false; parsingCommented = false;
lines[i - 1] += Environment.NewLine + "#Disabled Block End"; lines[i - 1] += Environment.NewLine + "#Disabled Block End";
@ -145,8 +146,8 @@ namespace Filtration.Parser.Services
var script = _itemFilterScriptFactory.Create(); var script = _itemFilterScriptFactory.Create();
_blockGroupHierarchyBuilder.Initialise(script.ItemFilterBlockGroups.First()); _blockGroupHierarchyBuilder.Initialise(script.ItemFilterBlockGroups.First());
//NeverSink's Indepth Loot Filter parsing //Check for possible different disabled block syntaxes if the script is not from Filtration
if (inputString.Contains("NeverSink's Indepth Loot Filter")) if (!inputString.Contains("Script edited with Filtration"))
{ {
inputString = ConvertCommentedToDisabled(inputString); inputString = ConvertCommentedToDisabled(inputString);
} }
@ -304,13 +305,6 @@ namespace Filtration.Parser.Services
} }
} }
//NeverSink's Indepth Loot Filter parsing
if (outputString.Contains("NeverSink's Indepth Loot Filter"))
{
outputString = Regex.Replace(outputString, "(\r)?\n#Disabled Block Start*(\r)?\n", Environment.NewLine);
outputString = Regex.Replace(outputString, "(\r)?\n#Disabled Block End*(\r)?\n", Environment.NewLine);
}
return outputString; return outputString;
} }
} }

2
Filtration/ViewModels/ItemFilterCommentBlockViewModel.cs
View File

@ -59,7 +59,7 @@ namespace Filtration.ViewModels
{ {
string[] commentLines = ItemFilterCommentBlock.Comment.Split(new[] { Environment.NewLine }, StringSplitOptions.None); string[] commentLines = ItemFilterCommentBlock.Comment.Split(new[] { Environment.NewLine }, StringSplitOptions.None);
var titleOffset = 1; var titleOffset = 1;
if (commentLines.Length > 1 && (commentLines[0].StartsWith(@"============") || commentLines[0].StartsWith(@"------------"))) if (commentLines.Length > 1 && (commentLines[0].TrimStart(' ').StartsWith(@"============") || commentLines[0].TrimStart(' ').StartsWith(@"------------")))
{ {
titleOffset = 3; titleOffset = 3;
commentLines[0] = commentLines[1]; commentLines[0] = commentLines[1];