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

Use when on throw on error to avoid context loss

Browse Source
This commit is contained in:
Matt Nadareski
2021-01-12 15:54:14 -08:00
parent 2e674e23ca
commit 3317aef790
20 changed files with 40 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SabreTools.DatFiles/Formats/AttractMode.cs
View File

@@ -96,15 +96,10 @@ namespace SabreTools.DatFiles.Formats
// Now process and add the rom
ParseAddHelper(rom, statsOnly);
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
string message = $"'{filename}' - There was an error parsing line {svr.LineNumber} '{svr.CurrentLine}'";
logger.Error(ex, message);
if (throwOnError)
{
svr.Dispose();
throw new Exception(message, ex);
}
}
}
@@ -171,10 +166,9 @@ namespace SabreTools.DatFiles.Formats
svw.Dispose();
fs.Dispose();
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Error(ex);
if (throwOnError) throw ex;
return false;
}

10
SabreTools.DatFiles/Formats/ClrMamePro.cs
View File

@@ -81,15 +81,10 @@ namespace SabreTools.DatFiles.Formats
break;
}
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
string message = $"'{filename}' - There was an error parsing line {cmpr.LineNumber} '{cmpr.CurrentLine}'";
logger.Error(ex, message);
if (throwOnError)
{
cmpr.Dispose();
throw new Exception(message, ex);
}
}
}
@@ -507,10 +502,9 @@ namespace SabreTools.DatFiles.Formats
cmpw.Dispose();
fs.Dispose();
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Error(ex);
if (throwOnError) throw ex;
return false;
}

10
SabreTools.DatFiles/Formats/DosCenter.cs
View File

@@ -64,15 +64,10 @@ namespace SabreTools.DatFiles.Formats
break;
}
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
string message = $"'{filename}' - There was an error parsing line {cmpr.LineNumber} '{cmpr.CurrentLine}'";
logger.Error(ex, message);
if (throwOnError)
{
cmpr.Dispose();
throw new Exception(message, ex);
}
}
}
@@ -334,10 +329,9 @@ namespace SabreTools.DatFiles.Formats
cmpw.Dispose();
fs.Dispose();
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Error(ex);
if (throwOnError) throw ex;
return false;
}

10
SabreTools.DatFiles/Formats/EverdriveSmdb.cs
View File

@@ -87,15 +87,10 @@ namespace SabreTools.DatFiles.Formats
// Now process and add the rom
ParseAddHelper(rom, statsOnly);
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
string message = $"'{filename}' - There was an error parsing line {svr.LineNumber} '{svr.CurrentLine}'";
logger.Error(ex, message);
if (throwOnError)
{
svr.Dispose();
throw new Exception(message, ex);
}
}
}
@@ -159,10 +154,9 @@ namespace SabreTools.DatFiles.Formats
svw.Dispose();
fs.Dispose();
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Error(ex);
if (throwOnError) throw ex;
return false;
}

10
SabreTools.DatFiles/Formats/Hashfile.cs
View File

@@ -88,15 +88,10 @@ namespace SabreTools.DatFiles.Formats
// Now process and add the rom
ParseAddHelper(rom, statsOnly);
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
string message = $"'{filename}' - There was an error parsing at position {sr.BaseStream.Position}";
logger.Error(ex, message);
if (throwOnError)
{
sr.Dispose();
throw new Exception(message, ex);
}
}
}
@@ -160,10 +155,9 @@ namespace SabreTools.DatFiles.Formats
svw.Dispose();
fs.Dispose();
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Error(ex);
if (throwOnError) throw ex;
return false;
}

10
SabreTools.DatFiles/Formats/Listrom.cs
View File

@@ -244,15 +244,10 @@ namespace SabreTools.DatFiles.Formats
}
}
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
string message = $"'{filename}' - There was an error parsing at position {sr.BaseStream.Position}";
logger.Error(ex, message);
if (throwOnError)
{
sr.Dispose();
throw new Exception(message, ex);
}
}
}
}
@@ -323,10 +318,9 @@ namespace SabreTools.DatFiles.Formats
sw.Dispose();
fs.Dispose();
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Error(ex);
if (throwOnError) throw ex;
return false;
}

10
SabreTools.DatFiles/Formats/Listxml.cs
View File

@@ -254,14 +254,9 @@ namespace SabreTools.DatFiles.Formats
}
}
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Warning(ex, $"Exception found while parsing '{filename}'");
if (throwOnError)
{
xtr.Dispose();
throw ex;
}
// For XML errors, just skip the affected node
xtr?.Read();
@@ -1416,10 +1411,9 @@ namespace SabreTools.DatFiles.Formats
xtw.Dispose();
fs.Dispose();
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Error(ex);
if (throwOnError) throw ex;
return false;
}

10
SabreTools.DatFiles/Formats/Logiqx.cs
View File

@@ -208,14 +208,9 @@ namespace SabreTools.DatFiles.Formats
}
}
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Warning(ex, $"Exception found while parsing '{filename}'");
if (throwOnError)
{
xtr.Dispose();
throw ex;
}
// For XML errors, just skip the affected node
xtr?.Read();
@@ -848,10 +843,9 @@ namespace SabreTools.DatFiles.Formats
xtw.Dispose();
fs.Dispose();
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Error(ex);
if (throwOnError) throw ex;
return false;
}

3
SabreTools.DatFiles/Formats/Missfile.cs
View File

@@ -80,10 +80,9 @@ namespace SabreTools.DatFiles.Formats
sw.Dispose();
fs.Dispose();
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Error(ex);
if (throwOnError) throw ex;
return false;
}

10
SabreTools.DatFiles/Formats/OfflineList.cs
View File

@@ -78,14 +78,9 @@ namespace SabreTools.DatFiles.Formats
}
}
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Warning(ex, $"Exception found while parsing '{filename}'");
if (throwOnError)
{
xtr.Dispose();
throw ex;
}
// For XML errors, just skip the affected node
xtr?.Read();
@@ -729,10 +724,9 @@ namespace SabreTools.DatFiles.Formats
xtw.Dispose();
fs.Dispose();
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Error(ex);
if (throwOnError) throw ex;
return false;
}

10
SabreTools.DatFiles/Formats/OpenMSX.cs
View File

@@ -94,14 +94,9 @@ namespace SabreTools.DatFiles.Formats
}
}
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Warning(ex, $"Exception found while parsing '{filename}'");
if (throwOnError)
{
xtr.Dispose();
throw ex;
}
// For XML errors, just skip the affected node
xtr?.Read();
@@ -610,10 +605,9 @@ namespace SabreTools.DatFiles.Formats
xtw.Dispose();
fs.Dispose();
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Error(ex);
if (throwOnError) throw ex;
return false;
}

10
SabreTools.DatFiles/Formats/RomCenter.cs
View File

@@ -77,15 +77,10 @@ namespace SabreTools.DatFiles.Formats
}
}
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
string message = $"'{filename}' - There was an error parsing line {ir.LineNumber} '{ir.CurrentLine}'";
logger.Error(ex, message);
if (throwOnError)
{
ir.Dispose();
throw new Exception(message, ex);
}
}
ir.Dispose();
@@ -424,10 +419,9 @@ namespace SabreTools.DatFiles.Formats
iw.Dispose();
fs.Dispose();
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Error(ex);
if (throwOnError) throw ex;
return false;
}

6
SabreTools.DatFiles/Formats/SabreJSON.cs
View File

@@ -71,10 +71,9 @@ namespace SabreTools.DatFiles.Formats
}
}
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Warning($"Exception found while parsing '{filename}': {ex}");
if (throwOnError) throw ex;
}
jtr.Close();
@@ -404,10 +403,9 @@ namespace SabreTools.DatFiles.Formats
jtw.Close();
fs.Dispose();
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Error(ex);
if (throwOnError) throw ex;
return false;
}

10
SabreTools.DatFiles/Formats/SabreXML.cs
View File

@@ -76,14 +76,9 @@ namespace SabreTools.DatFiles.Formats
}
}
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Warning(ex, $"Exception found while parsing '{filename}'");
if (throwOnError)
{
xtr.Dispose();
throw ex;
}
// For XML errors, just skip the affected node
xtr?.Read();
@@ -253,10 +248,9 @@ namespace SabreTools.DatFiles.Formats
xtw.Dispose();
fs.Dispose();
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Error(ex);
if (throwOnError) throw ex;
return false;
}

10
SabreTools.DatFiles/Formats/SeparatedValue.cs
View File

@@ -104,15 +104,10 @@ namespace SabreTools.DatFiles.Formats
ParseAddHelper(datItem, statsOnly);
}
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
string message = $"'{filename}' - There was an error parsing line {svr.LineNumber} '{svr.CurrentLine}'";
logger.Error(ex, message);
if (throwOnError)
{
svr.Dispose();
throw new Exception(message, ex);
}
}
}
@@ -179,10 +174,9 @@ namespace SabreTools.DatFiles.Formats
svw.Dispose();
fs.Dispose();
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Error(ex);
if (throwOnError) throw ex;
return false;
}

10
SabreTools.DatFiles/Formats/SoftwareList.cs
View File

@@ -144,14 +144,9 @@ namespace SabreTools.DatFiles.Formats
}
}
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Warning(ex, $"Exception found while parsing '{filename}'");
if (throwOnError)
{
xtr.Dispose();
throw ex;
}
// For XML errors, just skip the affected node
xtr?.Read();
@@ -657,10 +652,9 @@ namespace SabreTools.DatFiles.Formats
xtw.Dispose();
fs.Dispose();
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Error(ex);
if (throwOnError) throw ex;
return false;
}

15
SabreTools.DatTools/Modification.cs
View File

@@ -79,10 +79,9 @@ namespace SabreTools.DatTools
if (cleaner?.KeepEmptyGames == false)
datFile.Items.ClearEmpty();
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Error(ex);
if (throwOnError) throw ex;
return false;
}
@@ -168,10 +167,9 @@ namespace SabreTools.DatTools
}
}
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Error(ex);
if (throwOnError) throw ex;
return false;
}
@@ -242,10 +240,9 @@ namespace SabreTools.DatTools
datFile.Items[key] = items;
}
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Error(ex);
if (throwOnError) throw ex;
return false;
}
@@ -291,10 +288,9 @@ namespace SabreTools.DatTools
break;
}
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Error(ex);
if (throwOnError) throw ex;
return false;
}
@@ -388,10 +384,9 @@ namespace SabreTools.DatTools
datFile.Items.AddRange(key, newItems);
});
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Warning(ex.ToString());
if (throwOnError) throw ex;
}
}

3
SabreTools.DatTools/Parser.cs
View File

@@ -108,10 +108,9 @@ namespace SabreTools.DatTools
var parsingDatFile = DatFile.Create(currentPathFormat, datFile, quotes);
parsingDatFile?.ParseFile(currentPath, indexId, keep, statsOnly: statsOnly, throwOnError: throwOnError);
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Error(ex, $"Error with file '{currentPath}'");
if (throwOnError) throw ex;
}
}

6
SabreTools.DatTools/Writer.cs
View File

@@ -83,18 +83,16 @@ namespace SabreTools.DatTools
{
DatFile.Create(datFormat, datFile, quotes)?.WriteToFile(outfile, ignoreblanks, throwOnError);
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Error(ex, $"Datfile {outfile} could not be written out");
if (throwOnError) throw ex;
}
});
}
catch (Exception ex)
catch (Exception ex) when (!throwOnError)
{
logger.Error(ex);
if (throwOnError) throw ex;
return false;
}

3
SabreTools.Logging/LoggerImpl.cs
View File

@@ -258,11 +258,10 @@ namespace SabreTools.Logging
_log.WriteLine((AppendPrefix ? $"{loglevel} - {DateTime.Now} - " : string.Empty) + output);
}
}
catch (Exception ex)
catch (Exception ex) when (ThrowOnError)
{
Console.WriteLine(ex);
Console.WriteLine("Could not write to log file!");
if (ThrowOnError) throw ex;
return;
}
}