Serilog
This commit is contained in:
@ -1,6 +1,6 @@
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Phares.Shared;
|
||||
using Serilog;
|
||||
using ShellProgressBar;
|
||||
using System.Drawing;
|
||||
using System.Drawing.Imaging;
|
||||
@ -30,7 +30,7 @@ public class OffsetDateTimeOriginal
|
||||
private readonly IConfigurationRoot _ConfigurationRoot;
|
||||
private readonly Property.Models.Configuration _PropertyConfiguration;
|
||||
|
||||
public OffsetDateTimeOriginal(List<string> args, IsEnvironment isEnvironment, IConfigurationRoot configurationRoot, AppSettings appSettings, string workingDirectory, bool isSilent, IConsole console)
|
||||
public OffsetDateTimeOriginal(List<string> args, ILogger<Program> logger, IsEnvironment isEnvironment, IConfigurationRoot configurationRoot, AppSettings appSettings, string workingDirectory, bool isSilent, IConsole console)
|
||||
{
|
||||
if (isSilent)
|
||||
{ }
|
||||
@ -40,14 +40,13 @@ public class OffsetDateTimeOriginal
|
||||
_IsEnvironment = isEnvironment;
|
||||
_WorkingDirectory = workingDirectory;
|
||||
_ConfigurationRoot = configurationRoot;
|
||||
ILogger? log = Log.ForContext<OffsetDateTimeOriginal>();
|
||||
Property.Models.Configuration propertyConfiguration = Property.Models.Binder.Configuration.Get(isEnvironment, configurationRoot);
|
||||
Configuration configuration = Models.Binder.Configuration.Get(isEnvironment, configurationRoot, propertyConfiguration);
|
||||
_PropertyConfiguration = propertyConfiguration;
|
||||
_Configuration = configuration;
|
||||
log.Information(propertyConfiguration.RootDirectory);
|
||||
logger?.LogInformation(propertyConfiguration.RootDirectory);
|
||||
Verify();
|
||||
List<string> lines = OffsetDateTimeOriginalFilesInDirectories(log);
|
||||
List<string> lines = OffsetDateTimeOriginalFilesInDirectories(logger);
|
||||
if (lines.Any())
|
||||
File.WriteAllLines($"D:/Tmp/Phares/{DateTime.Now.Ticks}.tsv", lines);
|
||||
}
|
||||
@ -154,7 +153,7 @@ public class OffsetDateTimeOriginal
|
||||
|
||||
#pragma warning restore CA1416
|
||||
|
||||
private void DateFix(ILogger log, string sourceDirectory)
|
||||
private void DateFix(ILogger<Program>? logger, string sourceDirectory)
|
||||
{
|
||||
string checkDirectory;
|
||||
ASCIIEncoding asciiEncoding = new();
|
||||
@ -166,14 +165,14 @@ public class OffsetDateTimeOriginal
|
||||
{
|
||||
checkDirectory = Path.Combine(sourceDirectory, "1");
|
||||
if (!Directory.Exists(checkDirectory))
|
||||
log.Error($"<{checkDirectory}> doesn't exist!");
|
||||
logger?.LogError($"<{checkDirectory}> doesn't exist!");
|
||||
else
|
||||
{
|
||||
string badDirectory = Path.Combine(sourceDirectory, "Bad");
|
||||
string targetDirectory = Path.Combine(sourceDirectory, "Target");
|
||||
string[] minimumDirectory = Directory.GetDirectories(targetDirectory, "*", SearchOption.TopDirectoryOnly);
|
||||
if (minimumDirectory.Length != 1)
|
||||
log.Error($"<{checkDirectory}> doesn't exist!");
|
||||
logger?.LogError($"<{checkDirectory}> doesn't exist!");
|
||||
else
|
||||
{
|
||||
string format = "yyyy-MM-dd";
|
||||
@ -181,7 +180,7 @@ public class OffsetDateTimeOriginal
|
||||
string[] badFiles = !Directory.Exists(badDirectory) ? Array.Empty<string>() : Directory.GetFiles(badDirectory, "*", SearchOption.TopDirectoryOnly);
|
||||
string[] targetFiles = !Directory.Exists(targetDirectory) ? Array.Empty<string>() : Directory.GetFiles(targetDirectory, "*", SearchOption.TopDirectoryOnly);
|
||||
if (badFiles.Length != 1 || targetFiles.Length != 1 || maximumDirectory.Length != 1)
|
||||
log.Error("bad file(s) or target file(s) or maximum directory doesn't equal 1!");
|
||||
logger?.LogError("bad file(s) or target file(s) or maximum directory doesn't equal 1!");
|
||||
else
|
||||
{
|
||||
int? badId;
|
||||
@ -213,7 +212,7 @@ public class OffsetDateTimeOriginal
|
||||
if (!targetDateTimes.Any() || targetId is null)
|
||||
throw new Exception(targetMessage);
|
||||
if (badDateTimeOriginal is null || targetDateTimeOriginal is null)
|
||||
log.Error("Date is null!");
|
||||
logger?.LogError("Date is null!");
|
||||
else
|
||||
{
|
||||
TimeSpan timeSpan = new(targetDateTimeOriginal.Value.Ticks - badDateTimeOriginal.Value.Ticks);
|
||||
@ -225,10 +224,10 @@ public class OffsetDateTimeOriginal
|
||||
}
|
||||
}
|
||||
|
||||
private List<string> OffsetDateTimeOriginalFilesInDirectories(ILogger log)
|
||||
private List<string> OffsetDateTimeOriginalFilesInDirectories(ILogger<Program>? logger)
|
||||
{
|
||||
List<string> results = new();
|
||||
DateFix(log, _PropertyConfiguration.RootDirectory);
|
||||
DateFix(logger, _PropertyConfiguration.RootDirectory);
|
||||
return results;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user