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

[DatTools] Take care of nulled values too

Browse Source
This commit is contained in:
Matt Nadareski
2016-09-06 12:18:30 -07:00
parent 27d61eb0e6
commit 59d8b7b5ed
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SabreTools.Helper/Tools/DatTools.cs
View File

@@ -2089,7 +2089,7 @@ namespace SabreTools.Helper
} }
// Filter on game name // Filter on game name
if (gamename != "") if (!String.IsNullOrEmpty(gamename))
{ {
if (gamename.StartsWith("*") && gamename.EndsWith("*")) if (gamename.StartsWith("*") && gamename.EndsWith("*"))
{ {
@@ -2115,7 +2115,7 @@ namespace SabreTools.Helper
} }
// Filter on rom name // Filter on rom name
if (romname != "") if (!String.IsNullOrEmpty(romname))
{ {
if (romname.StartsWith("*") && romname.EndsWith("*") && !romdata.Name.ToLowerInvariant().Contains(romname.ToLowerInvariant().Replace("*", ""))) if (romname.StartsWith("*") && romname.EndsWith("*") && !romdata.Name.ToLowerInvariant().Contains(romname.ToLowerInvariant().Replace("*", "")))
{ {
@@ -2132,7 +2132,7 @@ namespace SabreTools.Helper
} }
// Filter on rom type // Filter on rom type
if (romtype != "" && romdata.Type.ToString().ToLowerInvariant() != romtype.ToLowerInvariant()) if (!String.IsNullOrEmpty(romtype) && romdata.Type.ToString().ToLowerInvariant() != romtype.ToLowerInvariant())
{ {
return false; return false;
} }
@@ -2155,7 +2155,7 @@ namespace SabreTools.Helper
} }
// Filter on crc // Filter on crc
if (crc != "") if (!String.IsNullOrEmpty(crc))
{ {
if (crc.StartsWith("*") && crc.EndsWith("*") && !romdata.HashData.CRC.ToLowerInvariant().Contains(crc.ToLowerInvariant().Replace("*", ""))) if (crc.StartsWith("*") && crc.EndsWith("*") && !romdata.HashData.CRC.ToLowerInvariant().Contains(crc.ToLowerInvariant().Replace("*", "")))
{ {
@@ -2172,7 +2172,7 @@ namespace SabreTools.Helper
} }
// Filter on md5 // Filter on md5
if (md5 != "") if (!String.IsNullOrEmpty(md5))
{ {
if (md5.StartsWith("*") && md5.EndsWith("*") && !romdata.HashData.MD5.ToLowerInvariant().Contains(md5.ToLowerInvariant().Replace("*", ""))) if (md5.StartsWith("*") && md5.EndsWith("*") && !romdata.HashData.MD5.ToLowerInvariant().Contains(md5.ToLowerInvariant().Replace("*", "")))
{ {
@@ -2189,7 +2189,7 @@ namespace SabreTools.Helper
} }
// Filter on sha1 // Filter on sha1
if (sha1 != "") if (!String.IsNullOrEmpty(sha1))
{ {
if (sha1.StartsWith("*") && sha1.EndsWith("*") && !romdata.HashData.SHA1.ToLowerInvariant().Contains(sha1.ToLowerInvariant().Replace("*", ""))) if (sha1.StartsWith("*") && sha1.EndsWith("*") && !romdata.HashData.SHA1.ToLowerInvariant().Contains(sha1.ToLowerInvariant().Replace("*", "")))
{ {