🐛 Fix Script

xygkevin · Dec 5, 2023 · 81d39b5 · 81d39b5
1 parent 4bff860
commit 81d39b5
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 14 deletions.
diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/Mappers/AcceleratorAutoMapperProfile.cs b/src/BD.WTTS.Client.Plugins.Accelerator/Mappers/AcceleratorAutoMapperProfile.cs
@@ -11,13 +11,15 @@ public AcceleratorAutoMapperProfile()
             .ForMember(x => x.Icon, d => d.MapFrom(x => x.IconUrl))
             .ForMember(x => x.Description, d => d.MapFrom(x => x.Describe))
             .ForMember(x => x.Enable, d => d.MapFrom(x => !x.Disable))
+            .ForMember(x => x.IsBuild, d => d.MapFrom(x => x.IsCompile))
             .ForMember(x => x.Id, d => d.MapFrom(x => x.LocalId));
         CreateMap<Script, ScriptDTO>()
             .ForMember(x => x.LocalId, d => d.MapFrom(x => x.Id))
             .ForMember(x => x.AuthorName, d => d.MapFrom(x => x.Author))
             .ForMember(x => x.Describe, d => d.MapFrom(x => x.Description))
             .ForMember(x => x.IconUrl, d => d.MapFrom(x => x.Icon))
             .ForMember(x => x.Disable, d => d.MapFrom(x => !x.Enable))
+            .ForMember(x => x.IsCompile, d => d.MapFrom(x => x.IsBuild))
             .ForMember(x => x.Id, d => d.MapFrom(x => x.Pid));
     }
 }
diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/Services.Implementation/ScriptManager.cs b/src/BD.WTTS.Client.Plugins.Accelerator/Services.Implementation/ScriptManager.cs
@@ -376,20 +376,6 @@ public async Task<IEnumerable<ScriptDTO>> CheckFiles(IEnumerable<ScriptDTO> list
         var scripts = list.ToList();
         foreach (var item in list)
         {
-            //检查缓存文件夹如果不是  IScriptManager.DirName_Build 替换成 IScriptManager.DirName_Build 开头
-            if (!item.CachePath.StartsWith($"{IScriptManager.DirName_Build}{Path.DirectorySeparatorChar}"))
-            {
-                item.CachePath = Path.Combine(IScriptManager.DirName_Build, item.FileName!);
-                var cachePath = Path.Combine(Plugin.Instance.CacheDirectory, item.CachePath);
-                if (File.Exists(cachePath))
-                {
-                    File.Delete(cachePath);
-                }
-                await TryReadFileAsync(item, true);
-                //清理 脚本内容 后续 IPC 传递 插件进程读取。
-                item.Content = string.Empty;
-                await scriptRepository.SaveScriptCachePathAsync(item, default);
-            }
             if (!CheckFile(item))
             {
                 var temp = await DeleteScriptAsync(item);
@@ -404,6 +390,38 @@ public async Task<IEnumerable<ScriptDTO>> CheckFiles(IEnumerable<ScriptDTO> list
                     //toast.Show($"脚本:{item.Name}_文件丢失，删除失败去尝试手动删除");
                     Toast.Show(ToastIcon.Error, Strings.Script_NoFileDeleteError_.Format(item.Name));
                 }
+                continue;
+            }
+
+            //检查缓存文件夹如果不是  IScriptManager.DirName_Build 替换成 IScriptManager.DirName_Build 开头
+            if (!item.CachePath.StartsWith($"{IScriptManager.DirName_Build}{Path.DirectorySeparatorChar}"))
+            {
+                var oldCachePath = Path.Combine(Plugin.Instance.CacheDirectory, item.CachePath);
+                item.CachePath = Path.Combine(IScriptManager.DirName_Build, item.FileName!);
+                if (File.Exists(oldCachePath))
+                {
+                    File.Delete(oldCachePath);
+                }
+                await TryReadFileAsync(item, true);
+                //清理 脚本内容 后续 IPC 传递 插件进程读取。
+                item.Content = string.Empty;
+                await scriptRepository.SaveScriptCachePathAsync(item, default);
+            }
+            else
+            {
+                var cachePath = Path.Combine(Plugin.Instance.CacheDirectory, item.CachePath);
+                var file = new FileInfo(cachePath);
+                //检查缓存文件是否为空 为空则 刷新
+                if (file.Exists)
+                {
+                    if (file.Length == 0)
+                    {
+                        file.Delete();
+                        await TryReadFileAsync(item, true);
+                        //清理 脚本内容 后续 IPC 传递 插件进程读取。
+                        item.Content = string.Empty;
+                    }
+                }
             }
         }
         return scripts;

diff --git a/src/BD.WTTS.Client/Migrations/Migrations.cs b/src/BD.WTTS.Client/Migrations/Migrations.cs
@@ -65,10 +65,24 @@ public static void Up()
                 {
                     MoveAccelerator();
                 }
+
+                var v_3_0_rc4 = new Version(3, 0, 407);
+                if (IApplication.IsDesktop() && PreviousVersion < v_3_0_rc4)
+                {
+                    ClearScriptFile();
+                }
             }
         }
     }
 
+    static void ClearScriptFile()
+    {
+        var scriptDirectory = Path.Combine(IOPath.AppDataDirectory, AssemblyInfo.Plugins, AssemblyInfo.Accelerator, DirName_Scripts);
+        Directory.Delete(scriptDirectory, true);
+        var scriptCacheDirectory = Path.Combine(IOPath.CacheDirectory, AssemblyInfo.Plugins, AssemblyInfo.Accelerator, DirName_BuildScripts);
+        Directory.Delete(scriptCacheDirectory, true);
+    }
+
     static void MoveDirByScripts(string rootPath, string? newDirName = null)
     {
         try