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

Add and implement Logger.Error

Browse Source
This commit is contained in:
Matt Nadareski
2016-03-30 13:36:52 -07:00
parent 5d43c48a17
commit 2d4a4fa668
4 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DATabase/Core/Generate.cs
View File

@@ -84,7 +84,7 @@ namespace SabreTools
// If there are no games for this combination, return nothing // If there are no games for this combination, return nothing
if (!sldr.HasRows) if (!sldr.HasRows)
{ {
_logger.Log("No system could be found with id in \"" + _systems + "\". Please check and try again."); _logger.Error("No system could be found with id in \"" + _systems + "\". Please check and try again.");
return false; return false;
} }
@@ -128,7 +128,7 @@ namespace SabreTools
// If there are no games for this combination, return nothing // If there are no games for this combination, return nothing
if (!sldr.HasRows) if (!sldr.HasRows)
{ {
_logger.Log("No source could be found with id in \"" + _sources + "\". Please check and try again."); _logger.Error("No source could be found with id in \"" + _sources + "\". Please check and try again.");
return false; return false;
} }
@@ -262,7 +262,7 @@ namespace SabreTools
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.Log(ex.ToString()); _logger.Error(ex.ToString());
return false; return false;
} }
@@ -314,7 +314,7 @@ JOIN checksums
// If there are no games for this combination, return nothing // If there are no games for this combination, return nothing
if (!sldr.HasRows) if (!sldr.HasRows)
{ {
_logger.Log("No games could be found with those inputs. Please check and try again."); _logger.Error("No games could be found with those inputs. Please check and try again.");
return null; return null;
} }

20
DATabase/Core/Import.cs
View File

@@ -146,7 +146,7 @@ namespace SabreTools
// If the type is still unmatched, the data can't be imported yet // If the type is still unmatched, the data can't be imported yet
else else
{ {
_logger.Log("File " + filename + " cannot be imported at this time because it is not a known pattern.\nPlease try again with an unrenamed version."); _logger.Error("File " + filename + " cannot be imported at this time because it is not a known pattern.\nPlease try again with an unrenamed version.");
return false; return false;
} }
@@ -162,7 +162,7 @@ namespace SabreTools
case DatType.MAME: case DatType.MAME:
if (!Remapping.MAME.ContainsKey(fileinfo[1].Value)) if (!Remapping.MAME.ContainsKey(fileinfo[1].Value))
{ {
_logger.Log("The filename " + fileinfo[1].Value + " could not be mapped! Please check the mappings and try again"); _logger.Error("The filename " + fileinfo[1].Value + " could not be mapped! Please check the mappings and try again");
return false; return false;
} }
GroupCollection mameInfo = Regex.Match(Remapping.MAME[fileinfo[1].Value], _remappedPattern).Groups; GroupCollection mameInfo = Regex.Match(Remapping.MAME[fileinfo[1].Value], _remappedPattern).Groups;
@@ -175,7 +175,7 @@ namespace SabreTools
case DatType.NoIntro: case DatType.NoIntro:
if (!Remapping.NoIntro.ContainsKey(fileinfo[1].Value)) if (!Remapping.NoIntro.ContainsKey(fileinfo[1].Value))
{ {
_logger.Log("The filename " + fileinfo[1].Value + " could not be mapped! Please check the mappings and try again"); _logger.Error("The filename " + fileinfo[1].Value + " could not be mapped! Please check the mappings and try again");
return false; return false;
} }
GroupCollection nointroInfo = Regex.Match(Remapping.NoIntro[fileinfo[1].Value], _remappedPattern).Groups; GroupCollection nointroInfo = Regex.Match(Remapping.NoIntro[fileinfo[1].Value], _remappedPattern).Groups;
@@ -191,7 +191,7 @@ namespace SabreTools
case DatType.Redump: case DatType.Redump:
if (!Remapping.Redump.ContainsKey(fileinfo[1].Value)) if (!Remapping.Redump.ContainsKey(fileinfo[1].Value))
{ {
_logger.Log("The filename " + fileinfo[1].Value + " could not be mapped! Please check the mappings and try again"); _logger.Error("The filename " + fileinfo[1].Value + " could not be mapped! Please check the mappings and try again");
return false; return false;
} }
GroupCollection redumpInfo = Regex.Match(Remapping.Redump[fileinfo[1].Value], _remappedPattern).Groups; GroupCollection redumpInfo = Regex.Match(Remapping.Redump[fileinfo[1].Value], _remappedPattern).Groups;
@@ -212,7 +212,7 @@ namespace SabreTools
if (!Remapping.TOSEC.ContainsKey(fileinfo[1].Value)) if (!Remapping.TOSEC.ContainsKey(fileinfo[1].Value))
{ {
_logger.Log("The filename " + fileinfo[1].Value + " could not be mapped! Please check the mappings and try again"); _logger.Error("The filename " + fileinfo[1].Value + " could not be mapped! Please check the mappings and try again");
return false; return false;
} }
} }
@@ -228,7 +228,7 @@ namespace SabreTools
case DatType.TruRip: case DatType.TruRip:
if (!Remapping.TruRip.ContainsKey(fileinfo[1].Value)) if (!Remapping.TruRip.ContainsKey(fileinfo[1].Value))
{ {
_logger.Log("The filename " + fileinfo[1].Value + " could not be mapped! Please check the mappings and try again"); _logger.Error("The filename " + fileinfo[1].Value + " could not be mapped! Please check the mappings and try again");
return false; return false;
} }
GroupCollection truripInfo = Regex.Match(Remapping.TruRip[fileinfo[1].Value], _remappedPattern).Groups; GroupCollection truripInfo = Regex.Match(Remapping.TruRip[fileinfo[1].Value], _remappedPattern).Groups;
@@ -264,7 +264,7 @@ namespace SabreTools
// If nothing is found, tell the user and exit // If nothing is found, tell the user and exit
if (!sldr.HasRows) if (!sldr.HasRows)
{ {
_logger.Log("Error: No suitable system for '" + filename + "' found! Please add the system and then try again."); _logger.Error("Error: No suitable system for '" + filename + "' found! Please add the system and then try again.");
return false; return false;
} }
@@ -288,7 +288,7 @@ namespace SabreTools
// If nothing is found, tell the user and exit // If nothing is found, tell the user and exit
if (!sldr.HasRows) if (!sldr.HasRows)
{ {
_logger.Log("Error: No suitable source for '" + filename + "' found! Please add the source and then try again."); _logger.Error("Error: No suitable source for '" + filename + "' found! Please add the source and then try again.");
return false; return false;
} }
@@ -562,14 +562,14 @@ INSERT INTO files (setid, name, type, lastupdated)
// If the insert of the checksums failed, that's bad // If the insert of the checksums failed, that's bad
if (affected < 1) if (affected < 1)
{ {
_logger.Log("There was an error adding checksums for " + name + " to the database!"); _logger.Error("There was an error adding checksums for " + name + " to the database!");
return false; return false;
} }
} }
// Otherwise, something happened which is bad // Otherwise, something happened which is bad
else else
{ {
_logger.Log("There was an error adding " + name + " to the database!"); _logger.Error("There was an error adding " + name + " to the database!");
return false; return false;
} }
} }

20
DATabase/DATabase.cs
View File

@@ -372,7 +372,7 @@ or 'b' to go back to the previous menu:");
} }
else else
{ {
logger.Log("I'm sorry but " + filename + "doesn't exist!"); logger.Error("I'm sorry but " + filename + "doesn't exist!");
} }
return; return;
} }
@@ -510,7 +510,7 @@ Make a selection:
// If nothing is found, tell the user and exit // If nothing is found, tell the user and exit
if (!sldr.HasRows) if (!sldr.HasRows)
{ {
logger.Log("Error: No systems found! Please add a source and then try again."); logger.Error("Error: No systems found! Please add a source and then try again.");
return; return;
} }
@@ -535,7 +535,7 @@ Make a selection:
// If nothing is found, tell the user and exit // If nothing is found, tell the user and exit
if (!ssldr.HasRows) if (!ssldr.HasRows)
{ {
logger.Log("Error: No sources found! Please add a source and then try again."); logger.Error("Error: No sources found! Please add a source and then try again.");
return; return;
} }
@@ -563,7 +563,7 @@ Make a selection:
// If nothing is found, tell the user and exit // If nothing is found, tell the user and exit
if (!sldr.HasRows) if (!sldr.HasRows)
{ {
logger.Log("Error: No systems found! Please add a source and then try again."); logger.Error("Error: No systems found! Please add a source and then try again.");
return; return;
} }
@@ -781,7 +781,7 @@ Make a selection:
} }
else else
{ {
logger.Log("Source " + name + " could not be added!"); logger.Error("Source " + name + " could not be added!");
} }
} }
@@ -800,12 +800,12 @@ Make a selection:
} }
else else
{ {
logger.Log("Source with id '" + srcid + "' could not be removed."); logger.Error("Source with id '" + srcid + "' could not be removed.");
} }
} }
else else
{ {
logger.Log("Invalid input"); logger.Error("Invalid input");
} }
} }
@@ -822,7 +822,7 @@ Make a selection:
} }
else else
{ {
logger.Log("System " + manufacturer + " - " + system + " could not be added!"); logger.Error("System " + manufacturer + " - " + system + " could not be added!");
} }
} }
@@ -841,12 +841,12 @@ Make a selection:
} }
else else
{ {
logger.Log("System with id '" + sysid + "' could not be removed."); logger.Error("System with id '" + sysid + "' could not be removed.");
} }
} }
else else
{ {
logger.Log("Invalid input"); logger.Error("Invalid input");
} }
} }
} }

10
DATabase/Helper/Logger.cs
View File

@@ -116,5 +116,15 @@ namespace SabreTools.Helper
return true; return true;
} }
/// <summary>
/// Writes the given string as an error in the log
/// </summary>
/// <param name="output">String to be written log</param>
/// <returns>True if the output could be written, false otherwise</returns>
public bool Error(string output)
{
return Log("Error: " + output);
}
} }
} }