SemianiakaVY/BotSharp
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

rename

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.Pdf.cs
View file

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

4
src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.SelectFile.cs
View file

@ -16,10 +16,10 @@ public partial class FileInstructService
var dialogs = convService.GetDialogHistory(fromBreakpoint: options.FromBreakpoint); var dialogs = convService.GetDialogHistory(fromBreakpoint: options.FromBreakpoint);
var messageIds = GetMessageIds(dialogs, options.Offset); 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) 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); files = files.Concat(botFiles);
} }

16
src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.cs
View file

@ -2,31 +2,31 @@ namespace BotSharp.Core.Files.Services;
public partial class FileInstructService : IFileInstructService public partial class FileInstructService : IFileInstructService
{ {
private readonly IFileStorageService _fileBasic; private readonly IFileStorageService _fileStorage;
private readonly IServiceProvider _services; private readonly IServiceProvider _services;
private readonly ILogger<FileInstructService> _logger; private readonly ILogger<FileInstructService> _logger;
private const string SESSION_FOLDER = "sessions"; private const string SESSION_FOLDER = "sessions";
public FileInstructService( public FileInstructService(
IFileStorageService fileBasic, IFileStorageService fileStorate,
ILogger<FileInstructService> logger, ILogger<FileInstructService> logger,
IServiceProvider services) IServiceProvider services)
{ {
_fileBasic = fileBasic; _fileStorage = fileStorate;
_logger = logger; _logger = logger;
_services = services; _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);
} }
} }
} }