Структура

This commit is contained in:
Mikhail Kuznetsov
2023-08-31 12:04:05 +10:00
parent db47a670c3
commit ffb95ccf41
19 changed files with 159 additions and 26 deletions

View File

@@ -18,8 +18,10 @@ namespace PARR.EsppTemplateSync
configuration.GetSection(nameof(GlobalSettings)).Bind(globalSettings);
services.AddSingleton(globalSettings);
services.AddTransient<ITemplateSyncer, TemplateSyncer>();
//services.AddTransient<ITemplateSyncer, TemplateFileSyncer>();
services.AddTransient<ITemplateSyncer, TemplateMQSyncer>();
services.AddTransient<IParserService, ParserService>();
services.AddTransient<IManager, Manager>();
}
}
}

View File

@@ -2,7 +2,7 @@
{
public interface ITemplateSyncer
{
Task StartWatchingAsync();
void StopWatching();
Task StartAsync();
void Stop();
}
}

View File

@@ -0,0 +1,8 @@
namespace PARR.EsppTemplateSync.Services
{
internal interface IManager
{
Task<bool> ManageFileAsync(string path);
Task<bool> ManageStringAsync(string str);
}
}

View File

@@ -2,6 +2,7 @@
{
internal interface IParserService
{
Task<bool> ParseAsync(string path);
Task<bool> ParseStringAsync(string str);
}
}

View File

@@ -0,0 +1,15 @@
namespace PARR.EsppTemplateSync.Services
{
internal class Manager : IManager
{
public Task<bool> ManageFileAsync(string path)
{
throw new NotImplementedException();
}
public Task<bool> ManageStringAsync(string str)
{
throw new NotImplementedException();
}
}
}

View File

@@ -2,7 +2,17 @@
{
internal class ParserService : IParserService
{
public async Task<bool> ParseAsync(string path)
public async Task<bool> ParseFileAsync(string path)
{
//TODO:
bool isSuccess = true;
return isSuccess;
}
public async Task<bool> ParseStringAsync(string str)
{
//TODO:

View File

@@ -1,6 +1,18 @@
namespace PARR.EsppTemplateSync.Settings
{
internal class GlobalSettings
{
public MqSettings? MqSettings { get; set; }
public StorageSettings? StorageSettings { get; set; }
}
internal class MqSettings
{
}
internal class StorageSettings
{
public int CheckIntervalSeconds { get; set; } = 5;
}

View File

@@ -6,29 +6,29 @@ using PARR.EsppTemplateSync.Settings;
namespace PARR.EsppTemplateSync
{
internal class TemplateSyncer : ITemplateSyncer
internal class TemplateFileSyncer : ITemplateSyncer
{
private readonly ILogger<TemplateSyncer> logger;
private readonly IParserService parserService;
private readonly ILogger<TemplateFileSyncer> logger;
private readonly IFileService fileService;
private readonly GlobalSettings globalSettings;
private readonly IManager manager;
private readonly string dirPath;
private readonly string filterExtensions;
//private FileSystemWatcher? watcher;
public TemplateSyncer(
StorageSettings storageSettings,
ILogger<TemplateSyncer> logger,
IParserService parserService,
public TemplateFileSyncer(
BLL.Settings.StorageSettings storageSettings,
ILogger<TemplateFileSyncer> logger,
IFileService fileService,
GlobalSettings globalSettings
GlobalSettings globalSettings,
IManager manager
)
{
this.logger = logger;
this.parserService = parserService;
this.fileService = fileService;
this.globalSettings = globalSettings;
this.manager = manager;
if (storageSettings.EsppTemplates == null)
{
logger.LogError("Нет секции настроек хранилища. StorageSettings, EsppTemplates");
@@ -41,7 +41,7 @@ namespace PARR.EsppTemplateSync
filterExtensions = string.Join(",", storageSettings.EsppTemplates!.AllowedExtensions).Replace(".", "*.");
}
public async Task StartWatchingAsync()
public async Task StartAsync()
{
//смотрим, доступна ли папка
if (!Directory.Exists(dirPath))
@@ -50,12 +50,12 @@ namespace PARR.EsppTemplateSync
throw new Exception($"Не найдена папка: {dirPath}.");
}
logger.LogInformation($"Запущена проверка директории. Интервал: {globalSettings.CheckIntervalSeconds} секунд. Фильтр: {filterExtensions}");
logger.LogInformation($"Запущена проверка директории. Интервал: {globalSettings.StorageSettings!.CheckIntervalSeconds} секунд. Фильтр: {filterExtensions}");
while (true)
{
await GetFilesAsync();
await Task.Delay(globalSettings.CheckIntervalSeconds * 1000);
await Task.Delay(globalSettings.StorageSettings!.CheckIntervalSeconds * 1000);
}
@@ -81,7 +81,7 @@ namespace PARR.EsppTemplateSync
}
public void StopWatching()
public void Stop()
{
//watcher?.Dispose();
logger.LogInformation($"=== === === FileWatcher остановлен === === ===");
@@ -120,7 +120,7 @@ namespace PARR.EsppTemplateSync
private async Task ParseFileAsync(string path)
{
logger.LogInformation($"--- --- Найден файл. Готов для парсинга {path} --- ---");
var parseResult = await parserService.ParseAsync(path);
var parseResult = await manager.ManageFileAsync(path);//parserService.ParseFileAsync(path);
if (parseResult)
{

View File

@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PARR.EsppTemplateSync
{
internal class TemplateMQSyncer : ITemplateSyncer
{
public async Task StartAsync()
{
// throw new NotImplementedException();
}
public void Stop()
{
//throw new NotImplementedException();
}
}
}