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 ParentablePath issues; fix parse logging

Browse Source
This commit is contained in:
Matt Nadareski
2020-09-21 13:04:11 -07:00
parent 07066c2299
commit a04a3485ef
20 changed files with 517 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
SabreTools.Library/DatFiles/AttractMode.cs
View File

@@ -59,13 +59,6 @@ namespace SabreTools.Library.DatFiles
{
// Get the current line, split and parse
svr.ReadNextLine();
}
catch (InvalidDataException ex)
{
Globals.Logger.Error(ex, $"Malformed line found in '{filename}' at line {svr.LineNumber}");
if (throwOnError) throw ex;
continue;
}
Rom rom = new Rom
{
@@ -107,6 +100,17 @@ namespace SabreTools.Library.DatFiles
// Now process and add the rom
ParseAddHelper(rom);
}
catch (Exception ex)
{
string message = $"'{filename}' - There was an error parsing line {svr.LineNumber} '{svr.CurrentLine}'";
Globals.Logger.Error(ex, message);
if (throwOnError)
{
svr.Dispose();
throw new Exception(message, ex);
}
}
}
svr.Dispose();
}

13
SabreTools.Library/DatFiles/ClrMamePro.cs
View File

@@ -53,6 +53,8 @@ namespace SabreTools.Library.DatFiles
};
while (!cmpr.EndOfStream)
{
try
{
cmpr.ReadNextLine();
@@ -83,6 +85,17 @@ namespace SabreTools.Library.DatFiles
break;
}
}
catch (Exception ex)
{
string message = $"'{filename}' - There was an error parsing line {cmpr.LineNumber} '{cmpr.CurrentLine}'";
Globals.Logger.Error(ex, message);
if (throwOnError)
{
cmpr.Dispose();
throw new Exception(message, ex);
}
}
}
cmpr.Dispose();
}

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

@@ -1802,10 +1802,11 @@ namespace SabreTools.Library.DatFiles
/// Create a DatFile and parse a file into it
/// </summary>
/// <param name="filename">Name of the file to be parsed</param>
public static DatFile CreateAndParse(string filename)
/// <param name="throwOnError">True if the error that is thrown should be thrown back to the caller, false otherwise</param>
public static DatFile CreateAndParse(string filename, bool throwOnError = false)
{
DatFile datFile = Create();
datFile.Parse(new ParentablePath(filename));
datFile.Parse(new ParentablePath(filename), throwOnError: throwOnError);
return datFile;
}
@@ -1833,22 +1834,22 @@ namespace SabreTools.Library.DatFiles
/// <summary>
/// Parse a DAT and return all found games and roms within
/// </summary>
/// <param name="filename">Name of the file to be parsed</param>
/// <param name="input">Name of the file to be parsed</param>
/// <param name="indexId">Index ID for the DAT</param>
/// <param name="keep">True if full pathnames are to be kept, false otherwise (default)</param>
/// <param name="keepext">True if original extension should be kept, false otherwise (default)</param>
/// <param name="quotes">True if quotes are assumed in supported types (default), false otherwise</param>
/// <param name="throwOnError">True if the error that is thrown should be thrown back to the caller, false otherwise</param>
public void Parse(
ParentablePath filename,
ParentablePath input,
int indexId = 0,
bool keep = false,
bool keepext = false,
bool quotes = true,
bool throwOnError = false)
bool throwOnError = true)
{
// Get the current path from the filename
string currentPath = filename.CurrentPath;
string currentPath = input.CurrentPath;
// Check the file extension first as a safeguard
if (!PathExtensions.HasValidDatExtension(currentPath))
@@ -1868,7 +1869,7 @@ namespace SabreTools.Library.DatFiles
}
catch (Exception ex)
{
Globals.Logger.Error(ex, $"Error with file '{filename}'");
Globals.Logger.Error(ex, $"Error with file '{currentPath}'");
if (throwOnError) throw ex;
}
}

13
SabreTools.Library/DatFiles/DosCenter.cs
View File

@@ -42,6 +42,8 @@ namespace SabreTools.Library.DatFiles
};
while (!cmpr.EndOfStream)
{
try
{
cmpr.ReadNextLine();
@@ -66,6 +68,17 @@ namespace SabreTools.Library.DatFiles
break;
}
}
catch (Exception ex)
{
string message = $"'{filename}' - There was an error parsing line {cmpr.LineNumber} '{cmpr.CurrentLine}'";
Globals.Logger.Error(ex, message);
if (throwOnError)
{
cmpr.Dispose();
throw new Exception(message, ex);
}
}
}
cmpr.Dispose();
}

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

@@ -33,11 +33,14 @@ namespace SabreTools.Library.DatFiles
/// <param name="throwOnError">True if the error that is thrown should be thrown back to the caller, false otherwise</param>
protected override void ParseFile(string filename, int indexId, bool keep, bool throwOnError = false)
{
// TODO: Use SeparatedValueReader
// Open a file reader
Encoding enc = FileExtensions.GetEncoding(filename);
StreamReader sr = new StreamReader(FileExtensions.TryOpenRead(filename), enc);
while (!sr.EndOfStream)
{
try
{
string line = sr.ReadLine();
@@ -79,6 +82,17 @@ namespace SabreTools.Library.DatFiles
// Now process and add the rom
ParseAddHelper(rom);
}
catch (Exception ex)
{
string message = $"'{filename}' - There was an error parsing at position {sr.BaseStream.Position}";
Globals.Logger.Error(ex, message);
if (throwOnError)
{
sr.Dispose();
throw new Exception(message, ex);
}
}
}
sr.Dispose();
}

13
SabreTools.Library/DatFiles/Hashfile.cs
View File

@@ -42,6 +42,8 @@ namespace SabreTools.Library.DatFiles
StreamReader sr = new StreamReader(FileExtensions.TryOpenRead(filename), enc);
while (!sr.EndOfStream)
{
try
{
string line = sr.ReadLine();
@@ -94,6 +96,17 @@ namespace SabreTools.Library.DatFiles
// Now process and add the rom
ParseAddHelper(rom);
}
catch (Exception ex)
{
string message = $"'{filename}' - There was an error parsing at position {sr.BaseStream.Position}";
Globals.Logger.Error(ex, message);
if (throwOnError)
{
sr.Dispose();
throw new Exception(message, ex);
}
}
}
sr.Dispose();
}

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

@@ -1410,13 +1410,13 @@ namespace SabreTools.Library.DatFiles
dirStats.ResetStatistics();
}
Globals.Logger.Verbose($"Beginning stat collection for '{file}'", false);
Globals.Logger.Verbose($"Beginning stat collection for '{file.CurrentPath}'", false);
List<string> games = new List<string>();
DatFile datdata = DatFile.CreateAndParse(file.CurrentPath);
datdata.Items.BucketBy(Field.Machine_Name, DedupeType.None, norename: true);
// Output single DAT stats (if asked)
Globals.Logger.User($"Adding stats for file '{file}'\n", false);
Globals.Logger.User($"Adding stats for file '{file.CurrentPath}'\n", false);
if (single)
{
reports.ForEach(report => report.ReplaceStatistics(datdata.Header.FileName, datdata.Items.Keys.Count, datdata.Items));

13
SabreTools.Library/DatFiles/Listrom.cs
View File

@@ -49,6 +49,8 @@ namespace SabreTools.Library.DatFiles
string gamename = string.Empty;
while (!sr.EndOfStream)
{
try
{
string line = sr.ReadLine().Trim();
@@ -248,6 +250,17 @@ namespace SabreTools.Library.DatFiles
}
}
}
catch (Exception ex)
{
string message = $"'{filename}' - There was an error parsing at position {sr.BaseStream.Position}";
Globals.Logger.Error(ex, message);
if (throwOnError)
{
sr.Dispose();
throw new Exception(message, ex);
}
}
}
}
/// <inheritdoc/>

8
SabreTools.Library/DatFiles/Listxml.cs
View File

@@ -90,8 +90,12 @@ namespace SabreTools.Library.DatFiles
}
catch (Exception ex)
{
Globals.Logger.Warning($"Exception found while parsing '{filename}': {ex}");
if (throwOnError) throw ex;
Globals.Logger.Warning(ex, $"Exception found while parsing '{filename}'");
if (throwOnError)
{
xtr.Dispose();
throw ex;
}
// For XML errors, just skip the affected node
xtr?.Read();

8
SabreTools.Library/DatFiles/Logiqx.cs
View File

@@ -107,8 +107,12 @@ namespace SabreTools.Library.DatFiles
}
catch (Exception ex)
{
Globals.Logger.Warning($"Exception found while parsing '{filename}': {ex}");
if (throwOnError) throw ex;
Globals.Logger.Warning(ex, $"Exception found while parsing '{filename}'");
if (throwOnError)
{
xtr.Dispose();
throw ex;
}
// For XML errors, just skip the affected node
xtr?.Read();

8
SabreTools.Library/DatFiles/OfflineList.cs
View File

@@ -78,8 +78,12 @@ namespace SabreTools.Library.DatFiles
}
catch (Exception ex)
{
Globals.Logger.Warning($"Exception found while parsing '{filename}': {ex}");
if (throwOnError) throw ex;
Globals.Logger.Warning(ex, $"Exception found while parsing '{filename}'");
if (throwOnError)
{
xtr.Dispose();
throw ex;
}
// For XML errors, just skip the affected node
xtr?.Read();

8
SabreTools.Library/DatFiles/OpenMSX.cs
View File

@@ -80,8 +80,12 @@ namespace SabreTools.Library.DatFiles
}
catch (Exception ex)
{
Globals.Logger.Warning($"Exception found while parsing '{filename}': {ex}");
if (throwOnError) throw ex;
Globals.Logger.Warning(ex, $"Exception found while parsing '{filename}'");
if (throwOnError)
{
xtr.Dispose();
throw ex;
}
// For XML errors, just skip the affected node
xtr?.Read();

11
SabreTools.Library/DatFiles/RomCenter.cs
View File

@@ -84,8 +84,13 @@ namespace SabreTools.Library.DatFiles
}
catch (Exception ex)
{
Globals.Logger.Warning($"Exception found while parsing '{filename}': {ex}");
if (throwOnError) throw ex;
string message = $"'{filename}' - There was an error parsing line {ir.LineNumber} '{ir.CurrentLine}'";
Globals.Logger.Error(ex, message);
if (throwOnError)
{
ir.Dispose();
throw new Exception(message, ex);
}
}
ir.Dispose();
@@ -304,7 +309,7 @@ namespace SabreTools.Library.DatFiles
}
// Roms are not valid row formats, usually
string line = reader.Line;
string line = reader.CurrentLine;
// If we don't have a valid game, keep reading
if (!line.StartsWith("¬"))

8
SabreTools.Library/DatFiles/SabreXML.cs
View File

@@ -77,8 +77,12 @@ namespace SabreTools.Library.DatFiles
}
catch (Exception ex)
{
Globals.Logger.Warning($"Exception found while parsing '{filename}': {ex}");
if (throwOnError) throw ex;
Globals.Logger.Warning(ex, $"Exception found while parsing '{filename}'");
if (throwOnError)
{
xtr.Dispose();
throw ex;
}
// For XML errors, just skip the affected node
xtr?.Read();

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

@@ -65,8 +65,14 @@ namespace SabreTools.Library.DatFiles
}
catch (InvalidDataException ex)
{
Globals.Logger.Warning($"Malformed line found in '{filename}' at line {svr.LineNumber}");
if (throwOnError) throw ex;
string message = $"'{filename}' - There was an error parsing line {svr.LineNumber} '{svr.CurrentLine}'";
Globals.Logger.Error(ex, message);
if (throwOnError)
{
svr.Dispose();
throw new Exception(message, ex);
}
continue;
}

8
SabreTools.Library/DatFiles/SoftwareList.cs
View File

@@ -81,8 +81,12 @@ namespace SabreTools.Library.DatFiles
}
catch (Exception ex)
{
Globals.Logger.Warning($"Exception found while parsing '{filename}': {ex}");
if (throwOnError) throw ex;
Globals.Logger.Warning(ex, $"Exception found while parsing '{filename}'");
if (throwOnError)
{
xtr.Dispose();
throw ex;
}
// For XML errors, just skip the affected node
xtr?.Read();

2
SabreTools.Library/Filtering/ExtraIniItem.cs
View File

@@ -74,7 +74,7 @@ namespace SabreTools.Library.Filtering
{
// Get the key and value
string key = ir.Section;
string value = ir.Line.Trim();
string value = ir.CurrentLine.Trim();
// If the section is "ROOT_FOLDER", then we use the value "true" instead.
// This is done because some INI files use the name of the file as the

19
SabreTools.Library/IO/ClrMameProReader.cs
View File

@@ -16,6 +16,16 @@ namespace SabreTools.Library.IO
/// </summary>
private StreamReader sr;
/// <summary>
/// Contents of the current line, unprocessed
/// </summary>
public string CurrentLine { get; private set; } = string.Empty;
/// <summary>
/// Get the current line number
/// </summary>
public long LineNumber { get; private set; } = 0;
/// <summary>
/// Get if at end of stream
/// </summary>
@@ -74,7 +84,6 @@ namespace SabreTools.Library.IO
public ClrMameProReader(string filename)
{
sr = new StreamReader(filename);
DosCenter = true;
}
/// <summary>
@@ -83,7 +92,6 @@ namespace SabreTools.Library.IO
public ClrMameProReader(Stream stream, Encoding encoding)
{
sr = new StreamReader(stream, encoding);
DosCenter = true;
}
/// <summary>
@@ -94,8 +102,11 @@ namespace SabreTools.Library.IO
if (!(sr.BaseStream?.CanRead ?? false) || sr.EndOfStream)
return false;
string line = sr.ReadLine().Trim();
ProcessLine(line);
CurrentLine = sr.ReadLine().Trim();
LineNumber++;
// TODO: Act like IniReader here
ProcessLine(CurrentLine);
return true;
}

28
SabreTools.Library/IO/IniReader.cs
View File

@@ -30,9 +30,14 @@ namespace SabreTools.Library.IO
public KeyValuePair<string, string>? KeyValuePair { get; private set; } = null;
/// <summary>
/// Contents of the currently read line
/// Contents of the current line, unprocessed
/// </summary>
public string Line { get; private set; } = string.Empty;
public string CurrentLine { get; private set; } = string.Empty;
/// <summary>
/// Get the current line number
/// </summary>
public long LineNumber { get; private set; } = 0;
/// <summary>
/// Current row type
@@ -73,7 +78,8 @@ namespace SabreTools.Library.IO
if (!(sr.BaseStream?.CanRead ?? false) || sr.EndOfStream)
return false;
Line = sr.ReadLine().Trim();
CurrentLine = sr.ReadLine().Trim();
LineNumber++;
ProcessLine();
return true;
}
@@ -84,25 +90,25 @@ namespace SabreTools.Library.IO
private void ProcessLine()
{
// Comment
if (Line.StartsWith(";"))
if (CurrentLine.StartsWith(";"))
{
KeyValuePair = null;
RowType = IniRowType.Comment;
}
// Section
else if (Line.StartsWith("[") && Line.EndsWith("]"))
else if (CurrentLine.StartsWith("[") && CurrentLine.EndsWith("]"))
{
KeyValuePair = null;
RowType = IniRowType.SectionHeader;
Section = Line.TrimStart('[').TrimEnd(']');
Section = CurrentLine.TrimStart('[').TrimEnd(']');
}
// KeyValuePair
else if (Line.Contains("="))
else if (CurrentLine.Contains("="))
{
// Split the line by '=' for key-value pairs
string[] data = Line.Split('=');
string[] data = CurrentLine.Split('=');
// If the value field contains an '=', we need to put them back in
string key = data[0].Trim();
@@ -113,10 +119,10 @@ namespace SabreTools.Library.IO
}
// Empty
else if (string.IsNullOrEmpty(Line))
else if (string.IsNullOrEmpty(CurrentLine))
{
KeyValuePair = null;
Line = string.Empty;
CurrentLine = string.Empty;
RowType = IniRowType.None;
}
@@ -127,7 +133,7 @@ namespace SabreTools.Library.IO
RowType = IniRowType.Invalid;
if (ValidateRows)
throw new InvalidDataException($"Invalid INI row found, cannot continue: {Line}");
throw new InvalidDataException($"Invalid INI row found, cannot continue: {CurrentLine}");
}
}

16
SabreTools.Library/IO/SeparatedValueReader.cs
View File

@@ -30,6 +30,16 @@ namespace SabreTools.Library.IO
}
}
/// <summary>
/// Contents of the current line, unprocessed
/// </summary>
public string CurrentLine { get; private set; } = string.Empty;
/// <summary>
/// Get the current line number
/// </summary>
public long LineNumber { get; private set; } = 0;
/// <summary>
/// Assume the first row is a header
/// </summary>
@@ -45,11 +55,6 @@ namespace SabreTools.Library.IO
/// </summary>
public List<string> Line { get; private set; } = null;
/// <summary>
/// Get the current line number
/// </summary>
public long LineNumber { get; private set; } = -1;
/// <summary>
/// Assume that values are wrapped in quotes
/// </summary>
@@ -104,6 +109,7 @@ namespace SabreTools.Library.IO
return false;
string fullLine = sr.ReadLine();
CurrentLine = fullLine;
LineNumber++;
// If we have quotes, we need to split specially