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

[DatFile] More code simplification

Browse Source
This commit is contained in:
Matt Nadareski
2017-02-27 22:13:29 -08:00
parent 003d7ec7d3
commit 76279f384d
1 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
SabreTools.Helper/Dats/Partials/DatFile.Parsers.cs
View File

@@ -275,8 +275,7 @@ namespace SabreTools.Helper.Dats
}; };
// Now process and add the rom // Now process and add the rom
string key = ""; ParseAddHelper(rom, filter, trim, single, root, clean, logger, out string key);
ParseAddHelper(rom, filter, trim, single, root, clean, logger, out key);
} }
sr.Dispose(); sr.Dispose();
@@ -1863,7 +1862,7 @@ namespace SabreTools.Helper.Dats
case "romCRC": case "romCRC":
empty = false; empty = false;
ext = (subreader.GetAttribute("extension") != null ? subreader.GetAttribute("extension") : ""); ext = (subreader.GetAttribute("extension") ?? "");
DatItem olrom = new Rom DatItem olrom = new Rom
{ {
@@ -2245,7 +2244,7 @@ namespace SabreTools.Helper.Dats
Type = (Type == "" ? "SuperDAT" : Type); Type = (Type == "" ? "SuperDAT" : Type);
} }
string foldername = (xtr.GetAttribute("name") == null ? "" : xtr.GetAttribute("name")); string foldername = (xtr.GetAttribute("name") ?? "");
if (foldername != "") if (foldername != "")
{ {
parent.Add(foldername); parent.Add(foldername);
@@ -2479,8 +2478,7 @@ namespace SabreTools.Helper.Dats
}; };
// Now process and add the rom // Now process and add the rom
string key = ""; ParseAddHelper(rom, filter, trim, single, root, clean, logger, out string key);
ParseAddHelper(rom, filter, trim, single, root, clean, logger, out key);
} }
sr.Dispose(); sr.Dispose();
@@ -2541,8 +2539,7 @@ namespace SabreTools.Helper.Dats
}; };
// Now process and add the rom // Now process and add the rom
string key = ""; ParseAddHelper(rom, filter, trim, single, root, clean, logger, out string key);
ParseAddHelper(rom, filter, trim, single, root, clean, logger, out key);
} }
sr.Dispose(); sr.Dispose();
@@ -2603,8 +2600,7 @@ namespace SabreTools.Helper.Dats
}; };
// Now process and add the rom // Now process and add the rom
string key = ""; ParseAddHelper(rom, filter, trim, single, root, clean, logger, out string key);
ParseAddHelper(rom, filter, trim, single, root, clean, logger, out key);
} }
sr.Dispose(); sr.Dispose();
@@ -2665,8 +2661,7 @@ namespace SabreTools.Helper.Dats
}; };
// Now process and add the rom // Now process and add the rom
string key = ""; ParseAddHelper(rom, filter, trim, single, root, clean, logger, out string key);
ParseAddHelper(rom, filter, trim, single, root, clean, logger, out key);
} }
sr.Dispose(); sr.Dispose();
@@ -2727,8 +2722,7 @@ namespace SabreTools.Helper.Dats
}; };
// Now process and add the rom // Now process and add the rom
string key = ""; ParseAddHelper(rom, filter, trim, single, root, clean, logger, out string key);
ParseAddHelper(rom, filter, trim, single, root, clean, logger, out key);
} }
sr.Dispose(); sr.Dispose();
@@ -2789,8 +2783,7 @@ namespace SabreTools.Helper.Dats
}; };
// Now process and add the rom // Now process and add the rom
string key = ""; ParseAddHelper(rom, filter, trim, single, root, clean, logger, out string key);
ParseAddHelper(rom, filter, trim, single, root, clean, logger, out key);
} }
sr.Dispose(); sr.Dispose();
@@ -2891,8 +2884,7 @@ namespace SabreTools.Helper.Dats
// If we have the split flag // If we have the split flag
else if (line.ToLowerInvariant().StartsWith("split=")) else if (line.ToLowerInvariant().StartsWith("split="))
{ {
int split = 0; if (Int32.TryParse(line.Split('=')[1], out int split))
if (Int32.TryParse(line.Split('=')[1], out split))
{ {
if (split == 1 && ForcePacking == ForcePacking.None) if (split == 1 && ForcePacking == ForcePacking.None)
{ {
@@ -2903,8 +2895,7 @@ namespace SabreTools.Helper.Dats
// If we have the merge tag // If we have the merge tag
else if (line.ToLowerInvariant().StartsWith("merge=")) else if (line.ToLowerInvariant().StartsWith("merge="))
{ {
int merge = 0; if (Int32.TryParse(line.Split('=')[1], out int merge))
if (Int32.TryParse(line.Split('=')[1], out merge))
{ {
if (merge == 1 && ForceMerging == ForceMerging.None) if (merge == 1 && ForceMerging == ForceMerging.None)
{ {
@@ -2941,8 +2932,7 @@ namespace SabreTools.Helper.Dats
string[] rominfo = line.Split('¬'); string[] rominfo = line.Split('¬');
// Try getting the size separately // Try getting the size separately
long size = 0; if (!Int64.TryParse(rominfo[7], out long size))
if (!Int64.TryParse(rominfo[7], out size))
{ {
size = 0; size = 0;
} }
@@ -2967,8 +2957,7 @@ namespace SabreTools.Helper.Dats
}; };
// Now process and add the rom // Now process and add the rom
string key = ""; ParseAddHelper(rom, filter, trim, single, root, clean, logger, out string key);
ParseAddHelper(rom, filter, trim, single, root, clean, logger, out key);
} }
} }
} }