fix: 修复在没有pipeline文件夹时无法创建文件的bug

SweetSmellFox · Dec 24, 2024 · 9f791a7 · 9f791a7
1 parent 7147ad6
commit 9f791a7
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 41 deletions.
diff --git a/MFAWPF.csproj b/MFAWPF.csproj
@@ -347,9 +347,5 @@
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </Resource>
       <None Remove="NLog.config" />
-      <Resource Include="Resource\base\model\ocr\det.onnx" />
-      <Resource Include="Resource\base\model\ocr\keys.txt" />
-      <Resource Include="Resource\base\model\ocr\README.md" />
-      <Resource Include="Resource\base\model\ocr\rec.onnx" />
     </ItemGroup>
 </Project>
diff --git a/Utils/MaaProcessor.cs b/Utils/MaaProcessor.cs
@@ -785,7 +785,10 @@ public static string HandleStringsWithVariables(string content)
             };
             RegisterCustomRecognitionsAndActions(tasker);
             if (!DataSet.GetData("EnableGPU", true))
+            {
                 tasker.Resource.SetOptionInferenceDevice(InferenceDevice.CPU);
+                LoggerService.LogInfo("已禁用GPU加速！");
+            }
             tasker.Utility.SetOptionSaveDraw(DataSet.GetData("EnableSaveDraw", false));
             return tasker;
         }
@@ -868,53 +871,55 @@ static List<MetadataReference> GetMetadataReferences()
     public static IEnumerable<CustomValue<object>> LoadAndInstantiateCustomClasses(string directory, string[] interfacesToImplement)
     {
         var customClasses = new List<CustomValue<object>>();
-        var csFiles = Directory.GetFiles(directory, "*.cs");
-
-        var references = GetMetadataReferences();
-
-        foreach (var filePath in csFiles)
+        if (Path.Exists(directory))
         {
-            var name = Path.GetFileNameWithoutExtension(filePath);
-            LoggerService.LogInfo("Trying to parse " + name);
-            string code = File.ReadAllText(filePath);
+            var csFiles = Directory.GetFiles(directory, "*.cs");
 
-            var syntaxTree = CSharpSyntaxTree.ParseText(code);
-            var compilation = CSharpCompilation.Create("DynamicAssembly")
-                .WithOptions(new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary))
-                .AddSyntaxTrees(syntaxTree)
-                .AddReferences(references);
+            var references = GetMetadataReferences();
 
-            using (var ms = new MemoryStream())
+            foreach (var filePath in csFiles)
             {
-                EmitResult result = compilation.Emit(ms);
-                if (!result.Success)
+                var name = Path.GetFileNameWithoutExtension(filePath);
+                LoggerService.LogInfo("Trying to parse " + name);
+                string code = File.ReadAllText(filePath);
+
+                var syntaxTree = CSharpSyntaxTree.ParseText(code);
+                var compilation = CSharpCompilation.Create("DynamicAssembly")
+                    .WithOptions(new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary))
+                    .AddSyntaxTrees(syntaxTree)
+                    .AddReferences(references);
+
+                using (var ms = new MemoryStream())
                 {
-                    var failures = result.Diagnostics.Where(d => d.Severity == DiagnosticSeverity.Error);
-                    foreach (var diagnostic in failures)
+                    EmitResult result = compilation.Emit(ms);
+                    if (!result.Success)
                     {
-                        LoggerService.LogError($"{diagnostic.Id}: {diagnostic.GetMessage()}");
+                        var failures = result.Diagnostics.Where(d => d.Severity == DiagnosticSeverity.Error);
+                        foreach (var diagnostic in failures)
+                        {
+                            LoggerService.LogError($"{diagnostic.Id}: {diagnostic.GetMessage()}");
+                        }
+                        continue;
                     }
-                    continue;
-                }
 
-                ms.Seek(0, SeekOrigin.Begin);
-                var assembly = Assembly.Load(ms.ToArray());
+                    ms.Seek(0, SeekOrigin.Begin);
+                    var assembly = Assembly.Load(ms.ToArray());
 
-                foreach (var type in assembly.GetTypes())
-                {
-                    foreach (var iface in interfacesToImplement)
+                    foreach (var type in assembly.GetTypes())
                     {
-                        if (type.GetInterfaces().Any(i => i.Name == iface))
+                        foreach (var iface in interfacesToImplement)
                         {
-                            var instance = Activator.CreateInstance(type);
-                            if (instance != null)
-                                customClasses.Add(new CustomValue<object>(name, instance));
+                            if (type.GetInterfaces().Any(i => i.Name == iface))
+                            {
+                                var instance = Activator.CreateInstance(type);
+                                if (instance != null)
+                                    customClasses.Add(new CustomValue<object>(name, instance));
+                            }
                         }
                     }
                 }
             }
         }
-
         return customClasses;
     }
 

diff --git a/Views/MainWindow.xaml.cs b/Views/MainWindow.xaml.cs
@@ -239,6 +239,8 @@ private bool LoadTask()
             {
                 foreach (var resourcePath in MaaProcessor.CurrentResources)
                 {
+                    if (!Path.Exists($"{resourcePath}/pipeline/"))
+                        break;
                     var jsonFiles = Directory.GetFiles($"{resourcePath}/pipeline/", "*.json");
                     var taskDictionaryA = new Dictionary<string, TaskModel>();
                     foreach (var file in jsonFiles)
@@ -264,12 +266,12 @@ private bool LoadTask()
 
             if (taskDictionary.Count == 0)
             {
-                string? directoryPath = Path.GetDirectoryName($"{MaaProcessor.ResourceBase}/pipeline");
-                if (!string.IsNullOrWhiteSpace(directoryPath) && !Directory.Exists(directoryPath))
+
+                if (!string.IsNullOrWhiteSpace($"{MaaProcessor.ResourceBase}/pipeline") && !Directory.Exists($"{MaaProcessor.ResourceBase}/pipeline"))
                 {
                     try
                     {
-                        Directory.CreateDirectory(directoryPath);
+                        Directory.CreateDirectory($"{MaaProcessor.ResourceBase}/pipeline");
                     }
                     catch (Exception ex)
                     {
@@ -517,7 +519,7 @@ public async void AutoDetectDevice()
                 if (!string.IsNullOrWhiteSpace(emulatorConfig))
                 {
                     var extractedNumber = ExtractNumberFromEmulatorConfig(emulatorConfig);
-                    
+
                     foreach (var device in devices)
                     {
                         if (TryGetIndexFromConfig(device.Config, out int index))
@@ -607,7 +609,7 @@ public async void AutoDetectDevice()
                         if (win32Controller?.Win32 != null)
                         {
                             var filteredWindows = windows.Where(win => !string.IsNullOrWhiteSpace(win.Name) || !string.IsNullOrWhiteSpace(win.ClassName)).ToList();
-                            
+
                             if (!string.IsNullOrWhiteSpace(win32Controller.Win32.WindowRegex))
                             {
                                 var windowRegex = new Regex(win32Controller.Win32.WindowRegex);
@@ -625,7 +627,7 @@ public async void AutoDetectDevice()
                                     ? windows.FindIndex(win => win.ClassName.Equals(filteredWindowsByClass.First().ClassName))
                                     : 0;
                             }
-                    
+
                             if (win32Controller.Win32.Input != null)
                             {
                                 int result = 0;