prehistoric-systems/FilterLists
1
0
Fork 0
mirror of https://github.com/collinbarrett/FilterLists.git synced 2026-03-11 09:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use consistent null conditional in rule linter

Browse source
This commit is contained in:
Collin M. Barrett 2018-02-09 14:37:10 -06:00
parent 282f9cecf8
commit 9de64fcd85
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/FilterLists.Services/SnapshotService/RawRuleLinterExtensions.cs
View file

@ -4,12 +4,12 @@ public static class RawRuleLinterExtensions
{
public static string LintStringForMySql(this string rule)
{
rule = rule.TrimLeadingAndTrailingWhitespace();
rule = rule.DropIfEmpty();
rule = rule.DropIfComment();
rule = rule.DropIfTooLong();
rule = rule.DropIfContainsBackslashSingleQuote();
rule = rule.TrimSingleBackslashFromEnd();
rule = rule?.TrimLeadingAndTrailingWhitespace();
rule = rule?.DropIfEmpty();
rule = rule?.DropIfComment();
rule = rule?.DropIfTooLong();
rule = rule?.DropIfContainsBackslashSingleQuote();
rule = rule?.TrimSingleBackslashFromEnd();
return rule;
}
@ -26,28 +26,22 @@ private static string DropIfEmpty(this string rule)
private static string DropIfComment(this string rule)
{
if (rule != null)
return rule.StartsWith(@"!") && !rule.StartsWith(@"!#") ? null : rule;
return null;
return rule.StartsWith(@"!") && !rule.StartsWith(@"!#") ? null : rule;
}
private static string DropIfTooLong(this string rule)
{
return rule?.Length > 8192 ? null : rule;
return rule.Length > 8192 ? null : rule;
}
private static string DropIfContainsBackslashSingleQuote(this string rule)
{
if (rule != null)
return rule.Contains(@"\'") ? null : rule;
return null;
return rule.Contains(@"\'") ? null : rule;
}
private static string TrimSingleBackslashFromEnd(this string rule)
{
if (rule != null)
return rule.EndsWith(@"\") && !rule.EndsWith(@"\\") ? rule.Remove(rule.Length - 1) : rule;
return null;
return rule.EndsWith(@"\") && !rule.EndsWith(@"\\") ? rule.Remove(rule.Length - 1) : rule;
}
}
}