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] Make method signature cleaner

Browse Source
This commit is contained in:
Matt Nadareski
2017-03-21 11:32:06 -07:00
parent c71b60d2d2
commit 6c4485961c
1 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -264,7 +264,7 @@ namespace SabreTools.Helper.Dats
}; };
// Now process and add the rom // Now process and add the rom
ParseAddHelper(rom, clean, remUnicode, out string key); ParseAddHelper(rom, clean, remUnicode);
} }
sr.Dispose(); sr.Dispose();
@@ -385,9 +385,6 @@ namespace SabreTools.Helper.Dats
item.SystemID = sysid; item.SystemID = sysid;
item.SourceID = srcid; item.SourceID = srcid;
// Get the blank key to write to
string key = "";
// If we have a sample, treat it special // If we have a sample, treat it special
if (temptype == ItemType.Sample) if (temptype == ItemType.Sample)
{ {
@@ -395,8 +392,7 @@ namespace SabreTools.Helper.Dats
item.Name = line; item.Name = line;
// Now process and add the sample // Now process and add the sample
key = ""; ParseAddHelper(item, clean, remUnicode);
ParseAddHelper(item, clean, remUnicode, out key);
continue; continue;
} }
@@ -480,8 +476,7 @@ namespace SabreTools.Helper.Dats
} }
// Now process and add the rom // Now process and add the rom
key = ""; ParseAddHelper(item, clean, remUnicode);
ParseAddHelper(item, clean, remUnicode, out key);
continue; continue;
} }
@@ -693,8 +688,7 @@ namespace SabreTools.Helper.Dats
} }
// Now process and add the rom // Now process and add the rom
key = ""; ParseAddHelper(item, clean, remUnicode);
ParseAddHelper(item, clean, remUnicode, out key);
} }
// If the line is anything but a rom or disk and we're in a block // If the line is anything but a rom or disk and we're in a block
@@ -1105,7 +1099,6 @@ namespace SabreTools.Helper.Dats
} }
// And now we populate and add the new item // And now we populate and add the new item
string key = "";
switch (itemType) switch (itemType)
{ {
case ItemType.Archive: case ItemType.Archive:
@@ -1120,7 +1113,7 @@ namespace SabreTools.Helper.Dats
}, },
}; };
ParseAddHelper(archive, clean, remUnicode, out key); ParseAddHelper(archive, clean, remUnicode);
break; break;
case ItemType.BiosSet: case ItemType.BiosSet:
BiosSet biosset = new BiosSet() BiosSet biosset = new BiosSet()
@@ -1134,7 +1127,7 @@ namespace SabreTools.Helper.Dats
}, },
}; };
ParseAddHelper(biosset, clean, remUnicode, out key); ParseAddHelper(biosset, clean, remUnicode);
break; break;
case ItemType.Disk: case ItemType.Disk:
Disk disk = new Disk() Disk disk = new Disk()
@@ -1155,7 +1148,7 @@ namespace SabreTools.Helper.Dats
ItemStatus = status, ItemStatus = status,
}; };
ParseAddHelper(disk, clean, remUnicode, out key); ParseAddHelper(disk, clean, remUnicode);
break; break;
case ItemType.Release: case ItemType.Release:
Release release = new Release() Release release = new Release()
@@ -1169,7 +1162,7 @@ namespace SabreTools.Helper.Dats
}, },
}; };
ParseAddHelper(release, clean, remUnicode, out key); ParseAddHelper(release, clean, remUnicode);
break; break;
case ItemType.Rom: case ItemType.Rom:
Rom rom = new Rom() Rom rom = new Rom()
@@ -1192,7 +1185,7 @@ namespace SabreTools.Helper.Dats
ItemStatus = status, ItemStatus = status,
}; };
ParseAddHelper(rom, clean, remUnicode, out key); ParseAddHelper(rom, clean, remUnicode);
break; break;
case ItemType.Sample: case ItemType.Sample:
Sample sample = new Sample() Sample sample = new Sample()
@@ -1206,7 +1199,7 @@ namespace SabreTools.Helper.Dats
}, },
}; };
ParseAddHelper(sample, clean, remUnicode, out key); ParseAddHelper(sample, clean, remUnicode);
break; break;
} }
} }
@@ -1268,7 +1261,7 @@ namespace SabreTools.Helper.Dats
Rom rom = new Rom("null", tempgame); Rom rom = new Rom("null", tempgame);
// Now process and add the rom // Now process and add the rom
ParseAddHelper(rom, clean, remUnicode, out key); key = ParseAddHelper(rom, clean, remUnicode);
} }
// Regardless, end the current folder // Regardless, end the current folder
@@ -1814,7 +1807,7 @@ namespace SabreTools.Helper.Dats
}; };
// Now process and add the rom // Now process and add the rom
ParseAddHelper(olrom, clean, remUnicode, out key); key = ParseAddHelper(olrom, clean, remUnicode);
break; break;
// For Software List and MAME listxml only // For Software List and MAME listxml only
@@ -1910,7 +1903,7 @@ namespace SabreTools.Helper.Dats
}; };
// Now process and add the rom // Now process and add the rom
ParseAddHelper(relrom, clean, remUnicode, out key); key = ParseAddHelper(relrom, clean, remUnicode);
subreader.Read(); subreader.Read();
break; break;
@@ -1953,7 +1946,7 @@ namespace SabreTools.Helper.Dats
}; };
// Now process and add the rom // Now process and add the rom
ParseAddHelper(biosrom, clean, remUnicode, out key); key = ParseAddHelper(biosrom, clean, remUnicode);
subreader.Read(); subreader.Read();
break; break;
@@ -1981,7 +1974,7 @@ namespace SabreTools.Helper.Dats
}; };
// Now process and add the rom // Now process and add the rom
ParseAddHelper(archiverom, clean, remUnicode, out key); key = ParseAddHelper(archiverom, clean, remUnicode);
subreader.Read(); subreader.Read();
break; break;
@@ -2009,7 +2002,7 @@ namespace SabreTools.Helper.Dats
}; };
// Now process and add the rom // Now process and add the rom
ParseAddHelper(samplerom, clean, remUnicode, out key); key = ParseAddHelper(samplerom, clean, remUnicode);
subreader.Read(); subreader.Read();
break; break;
@@ -2152,7 +2145,7 @@ namespace SabreTools.Helper.Dats
} }
// Now process and add the rom // Now process and add the rom
ParseAddHelper(inrom, clean, remUnicode, out key); key = ParseAddHelper(inrom, clean, remUnicode);
subreader.Read(); subreader.Read();
break; break;
@@ -2327,7 +2320,7 @@ namespace SabreTools.Helper.Dats
} }
// Now process and add the rom // Now process and add the rom
ParseAddHelper(rom, clean, remUnicode, out key); key = ParseAddHelper(rom, clean, remUnicode);
xtr.Read(); xtr.Read();
break; break;
@@ -2391,7 +2384,7 @@ namespace SabreTools.Helper.Dats
}; };
// Now process and add the rom // Now process and add the rom
ParseAddHelper(rom, clean, remUnicode, out string key); ParseAddHelper(rom, clean, remUnicode);
} }
sr.Dispose(); sr.Dispose();
@@ -2440,7 +2433,7 @@ namespace SabreTools.Helper.Dats
}; };
// Now process and add the rom // Now process and add the rom
ParseAddHelper(rom, clean, remUnicode, out string key); ParseAddHelper(rom, clean, remUnicode);
} }
sr.Dispose(); sr.Dispose();
@@ -2489,7 +2482,7 @@ namespace SabreTools.Helper.Dats
}; };
// Now process and add the rom // Now process and add the rom
ParseAddHelper(rom, clean, remUnicode, out string key); ParseAddHelper(rom, clean, remUnicode);
} }
sr.Dispose(); sr.Dispose();
@@ -2538,7 +2531,7 @@ namespace SabreTools.Helper.Dats
}; };
// Now process and add the rom // Now process and add the rom
ParseAddHelper(rom, clean, remUnicode, out string key); ParseAddHelper(rom, clean, remUnicode);
} }
sr.Dispose(); sr.Dispose();
@@ -2587,7 +2580,7 @@ namespace SabreTools.Helper.Dats
}; };
// Now process and add the rom // Now process and add the rom
ParseAddHelper(rom, clean, remUnicode, out string key); ParseAddHelper(rom, clean, remUnicode);
} }
sr.Dispose(); sr.Dispose();
@@ -2636,7 +2629,7 @@ namespace SabreTools.Helper.Dats
}; };
// Now process and add the rom // Now process and add the rom
ParseAddHelper(rom, clean, remUnicode, out string key); ParseAddHelper(rom, clean, remUnicode);
} }
sr.Dispose(); sr.Dispose();
@@ -2796,7 +2789,7 @@ namespace SabreTools.Helper.Dats
}; };
// Now process and add the rom // Now process and add the rom
ParseAddHelper(rom, clean, remUnicode, out string key); ParseAddHelper(rom, clean, remUnicode);
} }
} }
} }
@@ -2811,22 +2804,22 @@ namespace SabreTools.Helper.Dats
/// <param name="clean">True if the names should be cleaned to WoD standards, false otherwise</param> /// <param name="clean">True if the names should be cleaned to WoD standards, false otherwise</param>
/// <param name="remUnicode">True if we should remove non-ASCII characters from output, false otherwise (default)</param> /// <param name="remUnicode">True if we should remove non-ASCII characters from output, false otherwise (default)</param>
/// <param name="key">Output param containing the key for the item</param> /// <param name="key">Output param containing the key for the item</param>
private void ParseAddHelper(DatItem item, bool clean, bool remUnicode, out string key) private string ParseAddHelper(DatItem item, bool clean, bool remUnicode)
{ {
key = ""; string key = "";
// If there's no name in the rom, we log and skip it // If there's no name in the rom, we log and skip it
if (item.Name == null) if (item.Name == null)
{ {
Globals.Logger.Warning(FileName + ": Rom with no name found! Skipping..."); Globals.Logger.Warning(FileName + ": Rom with no name found! Skipping...");
return; return key;
} }
// If the name ends with a directory separator, we log and skip it (DOSCenter only?) // If the name ends with a directory separator, we log and skip it (DOSCenter only?)
if (item.Name.EndsWith("/") || item.Name.EndsWith("\\")) if (item.Name.EndsWith("/") || item.Name.EndsWith("\\"))
{ {
Globals.Logger.Warning(FileName + ": Rom ending with directory separator found: '" + item.Name + "'. Skipping..."); Globals.Logger.Warning(FileName + ": Rom ending with directory separator found: '" + item.Name + "'. Skipping...");
return; return key;
} }
// If we're in cleaning mode, sanitize the game name // If we're in cleaning mode, sanitize the game name
@@ -2969,6 +2962,8 @@ namespace SabreTools.Helper.Dats
// Add the item to the DAT // Add the item to the DAT
Add(key, item); Add(key, item);
return key;
} }
#endregion #endregion