修复 部分程序启动错误

Author: MakesYT

Core.Window/AppTools.cs

@@ -322,6 +322,8 @@ internal static void AppSolverA(ConcurrentDictionary<string, SearchViewItem> col
                     ((Shell32.IShellLinkW)link).GetPath(sb, sb.Capacity, out data, 0);
                     var argSb = new StringBuilder(260);
                     link.GetArguments(argSb, argSb.Capacity);
+                    var workingDirectorySb = new StringBuilder(260);
+                    link.GetWorkingDirectory(workingDirectorySb, workingDirectorySb.Capacity);
                     var arg = argSb.Length > 0 ? argSb.ToString() : null;
                     if (arg != null && arg.Contains('%'))
                     {
@@ -417,7 +419,8 @@ internal static void AppSolverA(ConcurrentDictionary<string, SearchViewItem> col
                                 PinyinItem = _pinyinProcessor.GetPinyin(localizedName,true),
                                 IsVisible = true, ItemDisplayName = localizedName,
                                 OnlyKey = fullName, IsStared = star, Arguments = arg,
-                                FileType = FileType.应用程序, Icon = null
+                                FileType = FileType.应用程序, Icon = null,
+                                StartDirectory = workingDirectorySb.ToString()
                             });
                         }
 

Core.Window/SearchItemTool.cs

@@ -28,7 +28,7 @@ public void OpenFile(SearchViewItem? searchViewItem)
                 try
                 {
                     var bitmap = ((IClipboardService)ServiceManager.Services!.GetService(typeof(IClipboardService))!)
-                        .GetImage();
+                       .GetImage();
                     var ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0);
                     var timeStamp = Convert.ToInt64(ts.TotalMilliseconds);
                     var f = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + "\\Downloads\\Kitopia" +
@@ -43,7 +43,7 @@ public void OpenFile(SearchViewItem? searchViewItem)
                 {
                     Log.Error("剪贴板图片保存失败");
                     ((IToastService)ServiceManager.Services.GetService(typeof(IToastService))!)
-                        .Show("剪贴板", "剪贴板图片保存失败");
+                       .Show("剪贴板", "剪贴板图片保存失败");
                     return;
                 }
 
@@ -61,11 +61,11 @@ public void OpenFile(SearchViewItem? searchViewItem)
                         break;
                     case FileType.自定义情景:
                         CustomScenarioManger.CustomScenarios
-                            .FirstOrDefault((e) => $"CustomScenario:{e.UUID}" == searchViewItem.OnlyKey)?.Run();
+                                            .FirstOrDefault((e) => $"CustomScenario:{e.UUID}" == searchViewItem.OnlyKey)?.Run();
                         break;
                     case FileType.便签:
                         ((ILabelWindowService)ServiceManager.Services.GetService(typeof(ILabelWindowService))!)
-                            .Show(searchViewItem.OnlyKey);
+                           .Show(searchViewItem.OnlyKey);
                         break;
                     case FileType.自定义:
                         searchViewItem.Action?.Invoke(searchViewItem);
@@ -109,17 +109,10 @@ public void OpenFile(SearchViewItem? searchViewItem)
                         break;
                     }
                     default:
-                        if (searchViewItem.Arguments == null)
-                        {
-                            Shell32.ShellExecute(IntPtr.Zero, "open", "explorer.exe", searchViewItem.OnlyKey, searchViewItem.OnlyKey.Remove(searchViewItem.OnlyKey.LastIndexOf('\\')),
-                                ShowWindowCommand.SW_NORMAL);
-                        }
-                        else
-                        {
-                            Shell32.ShellExecute(IntPtr.Zero, "open", "explorer.exe",
-                                $"{searchViewItem.OnlyKey} {searchViewItem.Arguments}", searchViewItem.OnlyKey.Remove(searchViewItem.OnlyKey.LastIndexOf('\\')),
-                                ShowWindowCommand.SW_SHOWNORMAL);
-                        }
+                      
+                        Shell32.ShellExecute(IntPtr.Zero, "open", searchViewItem.OnlyKey, searchViewItem.Arguments, searchViewItem.StartDirectory,
+                            ShowWindowCommand.SW_NORMAL);
+                        Log.Debug($"打开指定内容{searchViewItem.OnlyKey}_{searchViewItem.Arguments}_{searchViewItem.StartDirectory}");
 
                         break;
                 }
@@ -365,7 +358,7 @@ public void OpenFolderInTerminal(SearchViewItem? item)
     public void OpenSearchItemByOnlyKey(string onlyKey)
     {
         if (((SearchWindowViewModel)ServiceManager.Services!.GetService(typeof(SearchWindowViewModel))!)._collection
-            .TryGetValue(onlyKey, out var item))
+           .TryGetValue(onlyKey, out var item))
         {
             OpenFile(item);
         }

KitopiaAvalonia/KitopiaAvalonia.csproj

@@ -28,7 +28,7 @@
         <ApplicationIcon>Assets\icon.ico</ApplicationIcon>
         <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
         <DebugType Condition="'$(Configuration)' == 'Release'">none</DebugType>
-        <Version>0.0.2.043</Version>
+        <Version>0.0.2.044</Version>
     </PropertyGroup>
     <ItemGroup>
         <AvaloniaResource Include="Assets\FluentSystemIcons-Filled.ttf"/>