修复 当情景第一个节点出现循环时无法调出循环

新增 官方插件KitopiaEX
新增 情景支持选择本地搜索项目
插件新增 打开/运行本地搜索项目
移除 插件PluginDemo

Core/SDKs/CustomScenario/CustomScenario.cs

@@ -129,6 +129,7 @@ private void StartRun(bool notRealTime)
         var firstNodes = connectionItem.Target.Source;
         try
         {
+            _tasks.Add(firstNodes, null);
             ParsePointItem(firstNodes, false, notRealTime);
         }
         catch (Exception e)
@@ -232,10 +233,11 @@ private void ParsePointItem(PointItem nowPointItem, bool onlyForward, bool notRe
                         {
                             ParsePointItem(sourceSource, true, notRealTime);
                         });
-                        task.Start();
+
                         // Log.Debug(sourceSource.Title);
                         _tasks.Add(sourceSource, task);
                         sourceDataTask.Add(task);
+                        task.Start();
                     }
                 }
             }
@@ -262,7 +264,7 @@ private void ParsePointItem(PointItem nowPointItem, bool onlyForward, bool notRe
             }
         }
 
-        //源数据全部生成
+
         if (!valid)
         {
             goto finnish;
@@ -489,8 +491,9 @@ private void ParsePointItem(PointItem nowPointItem, bool onlyForward, bool notRe
                         {
                             ParsePointItem(nextPointItem, false, notRealTime);
                         });
-                        task.Start();
+
                         _tasks.Add(nextPointItem, task);
+                        task.Start();
                     }
                 }
             }

Core/SDKs/CustomScenario/CustomScenarioManger.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using Core.SDKs.CustomScenario;
 using Core.SDKs.Services.Plugin;
+using Core.ViewModel;
 using log4net;
 using Newtonsoft.Json;
 
@@ -91,6 +92,9 @@ public static void Init()
                         throw new CustomScenarioLoadFromJsonException(nodePlugin, node.MerthodName);
                     }
 
+                    //
+
+
                     deserializeObject.IsRunning = false;
                     CustomScenarios.Add(deserializeObject);
                 }
@@ -129,6 +133,30 @@ public static void Save(SDKs.CustomScenario.CustomScenario scenario)
             CustomScenarios.Add(scenario);
         }
 
+        if (scenario.ExecutionManual)
+        {
+            if (scenario.Keys.Any())
+            {
+                var viewItem1 = new SearchViewItem()
+                {
+                    FileName = "执行自定义情景:" + scenario.Name,
+                    FileType = FileType.自定义情景,
+                    OnlyKey = $"CustomScenario:{scenario.UUID}",
+                    Keys = scenario.Keys.ToHashSet(),
+                    Icon = null,
+                    IconSymbol = 0xF78B,
+                    IsVisible = true
+                };
+                ((SearchWindowViewModel)ServiceManager.Services.GetService(typeof(SearchWindowViewModel))!)
+                    ._collection.TryAdd($"CustomScenario:{scenario.UUID}", viewItem1);
+            }
+            else
+            {
+                ((SearchWindowViewModel)ServiceManager.Services.GetService(typeof(SearchWindowViewModel))!)
+                    ._collection.Remove($"CustomScenario:{scenario.UUID}");
+            }
+        }
+
         var configF = new FileInfo(AppDomain.CurrentDomain.BaseDirectory + $"customScenarios\\{scenario.UUID}.json");
 
         var setting = new JsonSerializerSettings();

Core/SDKs/Services/Plugin/PluginManager.cs

@@ -4,6 +4,7 @@
 using System.Windows;
 using Core.SDKs.Services.Config;
 using log4net;
+using PluginCore;
 
 #endregion
 
@@ -18,6 +19,7 @@ public static void Init()
     {
         ThreadPool.QueueUserWorkItem((e) =>
         {
+            Kitopia.ISearchItemTool = (ISearchItemTool)ServiceManager.Services.GetService(typeof(ISearchItemTool))!;
             var pluginsDirectoryInfo = new DirectoryInfo(AppDomain.CurrentDomain.BaseDirectory + "plugins");
             if (!pluginsDirectoryInfo.Exists)
             {
@@ -57,7 +59,7 @@ public static void Init()
             Log.Debug("Debug加载测试插件");
 
             var pluginInfoEx1 = Plugin.GetPluginInfoEx(
-                @"D:\WPF.net\uToolkitopia\PluginDemo\bin\Debug\net7.0-windows\PluginDemo.dll",
+                @"D:\WPF.net\uToolkitopia\KitopiaEx\bin\Debug\net7.0-windows\KitopiaEx.dll",
                 out var alcWeakRef1);
 
 

Core/SDKs/Tools/AppTools.cs

@@ -1,6 +1,5 @@
 #region
 
-using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices.ComTypes;
 using System.Text;
@@ -162,17 +161,32 @@ public static void GetAllApps(Dictionary<string, SearchViewItem> collection,
         bool logging = false)
     {
         log.Debug("索引全部软件及收藏项目");
-        Stopwatch stopwatch = new Stopwatch();
-        stopwatch.Start();
+        foreach (var customScenario in CustomScenarioManger.CustomScenarios)
+        {
+            if (customScenario.ExecutionManual)
+            {
+                if (customScenario.Keys.Any())
+                {
+                    var viewItem1 = new SearchViewItem()
+                    {
+                        FileName = "执行自定义情景:" + customScenario.Name,
+                        FileType = FileType.自定义情景,
+                        OnlyKey = $"CustomScenario:{customScenario.UUID}",
+                        Keys = customScenario.Keys.ToHashSet(),
+                        Icon = null,
+                        IconSymbol = 0xF78B,
+                        IsVisible = true
+                    };
+
+                    collection.TryAdd($"CustomScenario:{customScenario.UUID}", viewItem1);
+                }
+            }
+        }
 
 
         UwpTools.GetAll(collection);
-        stopwatch.Stop();
 
-        log.Debug($"索引UWP软件耗时{stopwatch.ElapsedMilliseconds}ms");
 
-        stopwatch.Reset();
-        stopwatch.Start();
         // 创建一个空的文件路径集合
         List<string> filePaths = new();
 
@@ -221,8 +235,7 @@ public static void GetAllApps(Dictionary<string, SearchViewItem> collection,
         {
         }
 
-        stopwatch.Stop();
-        log.Debug($"索引软件耗时{stopwatch.ElapsedMilliseconds}ms");
+
         //AutoStartEverything(collection);
         if (ErrorLnkList.Any())
         {

Core/SDKs/Tools/BaseNodeMethodsGen.cs

@@ -16,7 +16,7 @@ public class BaseNodeMethodsGen
         { "字符串", typeof(string) },
         { "布尔", typeof(bool) },
         { "整型", typeof(int) },
-        { "双精度浮点数", typeof(double) }
+        { "双精度浮点数", typeof(double) },
     };
 
     public static Dictionary<string, string> _i18n = new()
@@ -26,7 +26,7 @@ public class BaseNodeMethodsGen
         { "System.Int32", "整数" },
         { "System.Double", "浮点" },
         { "System.Object", "任意" },
-        { "PluginCore.NodeConnectorClass", "节点" }
+        { "PluginCore.NodeConnectorClass", "节点" },
     };
 
     public static string GetI18N(string key)
@@ -78,6 +78,40 @@ public static void GenBaseNodeMethods(BindingList<BindingList<object>> nodeMetho
             nodes.Add(String);
         } //基本数值类型
 
+        //SearchItem
+        var point = new PointItem()
+        {
+            Plugin = "Kitopia",
+            MerthodName = "本地项目",
+            Title = "本地项目"
+        };
+        ObservableCollection<ConnectorItem> pointOutItems = new()
+        {
+            new ConnectorItem()
+            {
+                Source = point,
+                Type = typeof(string),
+                Title = "本地项目",
+                TypeName = "字符串",
+                IsOut = true
+            }
+        };
+        point.Output = pointOutItems;
+        ObservableCollection<ConnectorItem> pointInItems = new()
+        {
+            new ConnectorItem()
+            {
+                Source = point,
+                Type = typeof(string),
+                RealType = typeof(SearchViewItem),
+                InputObject = "",
+                Title = "本地项目",
+                TypeName = "字符串",
+                IsSelf = true
+            }
+        };
+        point.Input = pointInItems;
+        nodes.Add(point);
         //if
         {
             var String = new PointItem()

Core/SDKs/Tools/Math.cs

@@ -3,7 +3,7 @@
 
 namespace Core.SDKs.Tools;
 
-public class Math
+public static class Math
 {
     private static readonly ILog log = LogManager.GetLogger(nameof(Math));