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

Rename Logging class to Logger

Browse Source
This commit is contained in:
Matt Nadareski
2016-03-28 18:40:35 -07:00
parent 0436671646
commit 9832c64f45
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DATabase/Core/Generate.cs
View File

@@ -22,9 +22,9 @@ namespace WoD
// Private required variables // Private required variables
private Dictionary<int, string> _headers; private Dictionary<int, string> _headers;
private Logging _logger; private Logger _logger;
public Generate(string systems, string sources, string connectionString, Logging logger, bool norename = false, bool old = false) public Generate(string systems, string sources, string connectionString, Logger logger, bool norename = false, bool old = false)
{ {
_systems = systems; _systems = systems;
_sources = sources; _sources = sources;

4
DATabase/Core/Import.cs
View File

@@ -13,7 +13,7 @@ namespace WoD
// Private instance variables // Private instance variables
private string _filepath; private string _filepath;
private string _connectionString; private string _connectionString;
private Logging _logger; private Logger _logger;
// Regex File Name Patterns // Regex File Name Patterns
private static string _defaultPattern = @"^(.+?) - (.+?) \((.*) (.*)\)\.dat$"; private static string _defaultPattern = @"^(.+?) - (.+?) \((.*) (.*)\)\.dat$";
@@ -50,7 +50,7 @@ namespace WoD
} }
// Constructor // Constructor
public Import(string filepath, string connectionString, Logging logger) public Import(string filepath, string connectionString, Logger logger)
{ {
if (File.Exists(filepath)) if (File.Exists(filepath))
{ {

5
DATabase/DATabase.cs
View File

@@ -9,7 +9,7 @@ namespace WoD
{ {
class DATabase class DATabase
{ {
private static Logging logger; private static Logger logger;
private static string _dbName = "DATabase.sqlite"; private static string _dbName = "DATabase.sqlite";
private static string _connectionString = "Data Source=" + _dbName + ";Version = 3;"; private static string _connectionString = "Data Source=" + _dbName + ";Version = 3;";
private static string _version = "0.1.1.0"; private static string _version = "0.1.1.0";
@@ -27,7 +27,7 @@ namespace WoD
// Perform initial setup and verification // Perform initial setup and verification
DBTools.EnsureDatabase(_dbName, _connectionString); DBTools.EnsureDatabase(_dbName, _connectionString);
Remapping.CreateRemappings(); Remapping.CreateRemappings();
logger = new Logging(false, "database.log"); logger = new Logger(false, "database.log");
logger.Start(); logger.Start();
Console.Clear(); Console.Clear();
Console.Title = "DATabase " + _version; Console.Title = "DATabase " + _version;
@@ -319,6 +319,7 @@ Make a selection:
return; return;
} }
/// TODO: Make this safe for auto-generating multiple files (such as auto-generate)
private static void InitGenerate(string systems, string sources, bool norename, bool old) private static void InitGenerate(string systems, string sources, bool norename, bool old)
{ {
Generate gen = new Generate(systems, sources, _connectionString, logger, norename, old); Generate gen = new Generate(systems, sources, _connectionString, logger, norename, old);

2
DATabase/DATabase.csproj
View File

@@ -71,7 +71,7 @@
<Compile Include="Core\Import.cs" /> <Compile Include="Core\Import.cs" />
<Compile Include="Helper\DBTools.cs" /> <Compile Include="Helper\DBTools.cs" />
<Compile Include="DATabase.cs" /> <Compile Include="DATabase.cs" />
<Compile Include="Helper\Logging.cs" /> <Compile Include="Helper\Logger.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Helper\Remapping.cs" /> <Compile Include="Helper\Remapping.cs" />
<Compile Include="Helper\Style.cs" /> <Compile Include="Helper\Style.cs" />

4
DATabase/Helper/Logging.cs → DATabase/Helper/Logger.cs
View File

@@ -3,7 +3,7 @@ using System.IO;
namespace WoD.Helper namespace WoD.Helper
{ {
public class Logging public class Logger
{ {
// Private instance variables // Private instance variables
private bool _tofile; private bool _tofile;
@@ -28,7 +28,7 @@ namespace WoD.Helper
} }
} }
public Logging(bool tofile, string filename = "") public Logger(bool tofile, string filename = "")
{ {
_tofile = tofile; _tofile = tofile;
_filename = filename; _filename = filename;