claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up based on .NET Core 3.1 reccomendations

Browse Source
This commit is contained in:
Matt Nadareski
2020-12-14 16:01:28 -08:00
parent 8870e9b287
commit ebd1044454
29 changed files with 130 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SabreTools.Filtering/ExtraIni.cs
View File

@@ -58,7 +58,7 @@ namespace SabreTools.Filtering
string inputTrimmed = input.Trim('"', ' ', '\t');
string fieldString = inputTrimmed.Split(':')[0].ToLowerInvariant().Trim('"', ' ', '\t');
string fileString = inputTrimmed.Substring(fieldString.Length + 1).Trim('"', ' ', '\t');
string fileString = inputTrimmed[(fieldString.Length + 1)..].Trim('"', ' ', '\t');
item.DatItemField = fieldString.AsDatItemField();
item.MachineField = fieldString.AsMachineField();

4
SabreTools.Filtering/Filter.cs
View File

@@ -57,10 +57,10 @@ namespace SabreTools.Filtering
|| filterTrimmed.StartsWith("~")
|| filterTrimmed.StartsWith("not-");
filterTrimmed = filterTrimmed.TrimStart('!', '~');
filterTrimmed = filterTrimmed.StartsWith("not-") ? filterTrimmed.Substring(4) : filterTrimmed;
filterTrimmed = filterTrimmed.StartsWith("not-") ? filterTrimmed[4..] : filterTrimmed;
string filterFieldString = filterTrimmed.Split(':')[0].ToLowerInvariant().Trim('"', ' ', '\t');
string filterValue = filterTrimmed.Substring(filterFieldString.Length + 1).Trim('"', ' ', '\t');
string filterValue = filterTrimmed[(filterFieldString.Length + 1)..].Trim('"', ' ', '\t');
return (filterFieldString, filterValue, negate);
}

3
SabreTools.Filtering/FilterItem.cs
View File

@@ -153,9 +153,8 @@ namespace SabreTools.Filtering
{
if (straw is string)
{
string needleString = needle as string;
string strawString = straw as string;
if (!string.IsNullOrWhiteSpace(strawString) && needleString != null)
if (!string.IsNullOrWhiteSpace(strawString) && needle is string needleString)
{
string regexStraw = strawString;