From be260034bdabe4e162c4d6069ef7bcd429783f60 Mon Sep 17 00:00:00 2001
From: Jicheng Lu <franklujc@gmail.com>
Date: Wed, 7 Aug 2024 21:10:45 -0500
Subject: [PATCH] rename

---
 .../Instruct/FileInstructService.Pdf.cs        | 18 +++++++++---------
 .../Instruct/FileInstructService.SelectFile.cs |  4 ++--
 .../Services/Instruct/FileInstructService.cs   | 16 ++++++++--------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.Pdf.cs b/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.Pdf.cs
index d4413983..67dd8cb9 100644
--- a/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.Pdf.cs
+++ b/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.Pdf.cs
@@ -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);
             }
diff --git a/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.SelectFile.cs b/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.SelectFile.cs
index c6a9e06c..70b3b80f 100644
--- a/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.SelectFile.cs
+++ b/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.SelectFile.cs
@@ -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);
         }
 
diff --git a/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.cs b/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.cs
index 4109145d..acd0ddaa 100644
--- a/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.cs
+++ b/src/Infrastructure/BotSharp.Core/Files/Services/Instruct/FileInstructService.cs
@@ -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);
         }
     }
 }