This commit is contained in:
Jicheng Lu 2024-08-07 21:10:45 -05:00
parent 1ecec6b21a
commit be260034bd
3 changed files with 19 additions and 19 deletions

View file

@ -16,8 +16,8 @@ public partial class FileInstructService
var guid = Guid.NewGuid().ToString();
var sessionDir = _fileBasic.BuildDirectory(SESSION_FOLDER, guid);
DeleteIfExistDirectory(sessionDir);
var sessionDir = _fileStorage.BuildDirectory(SESSION_FOLDER, guid);
DeleteIfExistDirectory(sessionDir, true);
try
{
@ -46,7 +46,7 @@ public partial class FileInstructService
}
finally
{
_fileBasic.DeleteDirectory(sessionDir);
_fileStorage.DeleteDirectory(sessionDir);
}
}
@ -78,11 +78,11 @@ public partial class FileInstructService
if (!bytes.IsNullOrEmpty())
{
var guid = Guid.NewGuid().ToString();
var fileDir = _fileBasic.BuildDirectory(dir, guid);
DeleteIfExistDirectory(fileDir);
var fileDir = _fileStorage.BuildDirectory(dir, guid);
DeleteIfExistDirectory(fileDir, true);
var pdfDir = _fileBasic.BuildDirectory(fileDir, $"{guid}.{extension}");
_fileBasic.SaveFileBytesToPath(pdfDir, bytes);
var pdfDir = _fileStorage.BuildDirectory(fileDir, $"{guid}.{extension}");
_fileStorage.SaveFileBytesToPath(pdfDir, bytes);
locs.Add(pdfDir);
}
}
@ -108,8 +108,8 @@ public partial class FileInstructService
{
try
{
var dir = _fileBasic.GetParentDir(file);
var folder = _fileBasic.BuildDirectory(dir, "screenshots");
var dir = _fileStorage.GetParentDir(file);
var folder = _fileStorage.BuildDirectory(dir, "screenshots");
var urls = await converter.ConvertPdfToImages(file, folder);
images.AddRange(urls);
}

View file

@ -16,10 +16,10 @@ public partial class FileInstructService
var dialogs = convService.GetDialogHistory(fromBreakpoint: options.FromBreakpoint);
var messageIds = GetMessageIds(dialogs, options.Offset);
var files = _fileBasic.GetMessageFiles(conversationId, messageIds, FileSourceType.User, options.ContentTypes);
var files = _fileStorage.GetMessageFiles(conversationId, messageIds, FileSourceType.User, options.ContentTypes);
if (options.IncludeBotFile)
{
var botFiles = _fileBasic.GetMessageFiles(conversationId, messageIds, FileSourceType.Bot, options.ContentTypes);
var botFiles = _fileStorage.GetMessageFiles(conversationId, messageIds, FileSourceType.Bot, options.ContentTypes);
files = files.Concat(botFiles);
}

View file

@ -2,31 +2,31 @@ namespace BotSharp.Core.Files.Services;
public partial class FileInstructService : IFileInstructService
{
private readonly IFileStorageService _fileBasic;
private readonly IFileStorageService _fileStorage;
private readonly IServiceProvider _services;
private readonly ILogger<FileInstructService> _logger;
private const string SESSION_FOLDER = "sessions";
public FileInstructService(
IFileStorageService fileBasic,
IFileStorageService fileStorate,
ILogger<FileInstructService> logger,
IServiceProvider services)
{
_fileBasic = fileBasic;
_fileStorage = fileStorate;
_logger = logger;
_services = services;
}
private void DeleteIfExistDirectory(string? dir)
private void DeleteIfExistDirectory(string? dir, bool createNew = false)
{
if (_fileBasic.ExistDirectory(dir))
if (_fileStorage.ExistDirectory(dir))
{
_fileBasic.DeleteDirectory(dir);
_fileStorage.DeleteDirectory(dir);
}
else
else if (createNew)
{
_fileBasic.CreateDirectory(dir);
_fileStorage.CreateDirectory(dir);
}
}
}