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

Fix a few stragglers

Browse Source
This commit is contained in:
Matt Nadareski
2020-09-15 14:46:39 -07:00
parent fc580c7d35
commit 74a0c47102
3 changed files with 36 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
SabreTools.Library/DatFiles/DatFile.cs
View File

@@ -707,8 +707,9 @@ namespace SabreTools.Library.DatFiles
/// Apply cleaning methods to the DatFile /// Apply cleaning methods to the DatFile
/// </summary> /// </summary>
/// <param name="cleaner">Cleaner to use</param> /// <param name="cleaner">Cleaner to use</param>
/// <param name="throwOnError">True if the error that is thrown should be thrown back to the caller, false otherwise</param>
/// <returns>True if cleaning was successful, false on error</returns> /// <returns>True if cleaning was successful, false on error</returns>
public bool ApplyCleaning(Cleaner cleaner) public bool ApplyCleaning(Cleaner cleaner, bool throwOnError = false)
{ {
try try
{ {
@@ -751,9 +752,7 @@ namespace SabreTools.Library.DatFiles
catch (Exception ex) catch (Exception ex)
{ {
Globals.Logger.Error(ex); Globals.Logger.Error(ex);
if (Globals.ThrowOnError) if (throwOnError) throw ex;
throw ex;
return false; return false;
} }
@@ -764,8 +763,9 @@ namespace SabreTools.Library.DatFiles
/// Apply a set of Extra INIs on the DatFile /// Apply a set of Extra INIs on the DatFile
/// </summary> /// </summary>
/// <param name="extras">ExtrasIni to use</param> /// <param name="extras">ExtrasIni to use</param>
/// <param name="throwOnError">True if the error that is thrown should be thrown back to the caller, false otherwise</param>
/// <returns>True if the extras were applied, false on error</returns> /// <returns>True if the extras were applied, false on error</returns>
public bool ApplyExtras(ExtraIni extras) public bool ApplyExtras(ExtraIni extras, bool throwOnError = false)
{ {
try try
{ {
@@ -817,9 +817,7 @@ namespace SabreTools.Library.DatFiles
catch (Exception ex) catch (Exception ex)
{ {
Globals.Logger.Error(ex); Globals.Logger.Error(ex);
if (Globals.ThrowOnError) if (throwOnError) throw ex;
throw ex;
return false; return false;
} }
@@ -831,8 +829,9 @@ namespace SabreTools.Library.DatFiles
/// </summary> /// </summary>
/// <param name="filter">Filter to use</param> /// <param name="filter">Filter to use</param>
/// <param name="perMachine">True if entire machines are considered, false otherwise (default)</param> /// <param name="perMachine">True if entire machines are considered, false otherwise (default)</param>
/// <param name="throwOnError">True if the error that is thrown should be thrown back to the caller, false otherwise</param>
/// <returns>True if the DatFile was filtered, false on error</returns> /// <returns>True if the DatFile was filtered, false on error</returns>
public bool ApplyFilter(Filter filter, bool perMachine = false) public bool ApplyFilter(Filter filter, bool perMachine = false, bool throwOnError = false)
{ {
// If we have a null filter, return false // If we have a null filter, return false
if (filter == null) if (filter == null)
@@ -891,9 +890,7 @@ namespace SabreTools.Library.DatFiles
catch (Exception ex) catch (Exception ex)
{ {
Globals.Logger.Error(ex); Globals.Logger.Error(ex);
if (Globals.ThrowOnError) if (throwOnError) throw ex;
throw ex;
return false; return false;
} }
@@ -905,8 +902,9 @@ namespace SabreTools.Library.DatFiles
/// </summary> /// </summary>
/// <param name="splitType">Split type to try</param> /// <param name="splitType">Split type to try</param>
/// <param name="useTags">True if DatFile tags override splitting, false otherwise</param> /// <param name="useTags">True if DatFile tags override splitting, false otherwise</param>
/// <param name="throwOnError">True if the error that is thrown should be thrown back to the caller, false otherwise</param>
/// <returns>True if the DatFile was split, false on error</returns> /// <returns>True if the DatFile was split, false on error</returns>
public bool ApplySplitting(MergingFlag splitType, bool useTags) public bool ApplySplitting(MergingFlag splitType, bool useTags, bool throwOnError = false)
{ {
try try
{ {
@@ -940,9 +938,7 @@ namespace SabreTools.Library.DatFiles
catch (Exception ex) catch (Exception ex)
{ {
Globals.Logger.Error(ex); Globals.Logger.Error(ex);
if (Globals.ThrowOnError) if (throwOnError) throw ex;
throw ex;
return false; return false;
} }
@@ -1011,7 +1007,8 @@ namespace SabreTools.Library.DatFiles
/// <summary> /// <summary>
/// Use game descriptions as names in the DAT, updating cloneof/romof/sampleof /// Use game descriptions as names in the DAT, updating cloneof/romof/sampleof
/// </summary> /// </summary>
public void MachineDescriptionToName() /// <param name="throwOnError">True if the error that is thrown should be thrown back to the caller, false otherwise</param>
public void MachineDescriptionToName(bool throwOnError = false)
{ {
try try
{ {
@@ -1062,8 +1059,7 @@ namespace SabreTools.Library.DatFiles
catch (Exception ex) catch (Exception ex)
{ {
Globals.Logger.Warning(ex.ToString()); Globals.Logger.Warning(ex.ToString());
if (Globals.ThrowOnError) if (throwOnError) throw ex;
throw ex;
} }
} }
@@ -3527,8 +3523,7 @@ namespace SabreTools.Library.DatFiles
catch (Exception ex) catch (Exception ex)
{ {
Globals.Logger.Error(ex, $"Datfile {outfile} could not be written out"); Globals.Logger.Error(ex, $"Datfile {outfile} could not be written out");
if (Globals.ThrowOnError) if (throwOnError) throw ex;
throw ex;
} }
}); });
@@ -3536,9 +3531,7 @@ namespace SabreTools.Library.DatFiles
catch (Exception ex) catch (Exception ex)
{ {
Globals.Logger.Error(ex); Globals.Logger.Error(ex);
if (Globals.ThrowOnError) if (throwOnError) throw ex;
throw ex;
return false; return false;
} }

20
SabreTools.Library/DatFiles/EverdriveSmdb.cs
View File

@@ -139,9 +139,7 @@ namespace SabreTools.Library.DatFiles
catch (Exception ex) catch (Exception ex)
{ {
Globals.Logger.Error(ex); Globals.Logger.Error(ex);
if (Globals.ThrowOnError) if (throwOnError) throw ex;
throw ex;
return false; return false;
} }
@@ -153,10 +151,7 @@ namespace SabreTools.Library.DatFiles
/// </summary> /// </summary>
/// <param name="svw">SeparatedValueWriter to output to</param> /// <param name="svw">SeparatedValueWriter to output to</param>
/// <param name="datItem">DatItem object to be output</param> /// <param name="datItem">DatItem object to be output</param>
/// <returns>True if the data was written, false on error</returns> private void WriteDatItem(SeparatedValueWriter svw, DatItem datItem)
private bool WriteDatItem(SeparatedValueWriter svw, DatItem datItem)
{
try
{ {
// No game should start with a path separator // No game should start with a path separator
datItem.Machine.Name = datItem.Machine.Name.TrimStart(Path.DirectorySeparatorChar); datItem.Machine.Name = datItem.Machine.Name.TrimStart(Path.DirectorySeparatorChar);
@@ -187,16 +182,5 @@ namespace SabreTools.Library.DatFiles
svw.Flush(); svw.Flush();
} }
catch (Exception ex)
{
Globals.Logger.Error(ex);
if (Globals.ThrowOnError)
throw ex;
return false;
}
return true;
}
} }
} }

4
SabreTools.Library/DatFiles/SeparatedValue.cs
View File

@@ -66,9 +66,7 @@ namespace SabreTools.Library.DatFiles
catch (InvalidDataException ex) catch (InvalidDataException ex)
{ {
Globals.Logger.Warning($"Malformed line found in '{filename}' at line {svr.LineNumber}"); Globals.Logger.Warning($"Malformed line found in '{filename}' at line {svr.LineNumber}");
if (Globals.ThrowOnError) if (throwOnError) throw ex;
throw ex;
continue; continue;
} }