feat: fix on args on run methods and nex profiles

minkostaev · Dec 30, 2022 · 7ce4c2d · 7ce4c2d
1 parent 4cefaa6
commit 7ce4c2d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
@@ -80,7 +80,7 @@ jobs:
         cd ${{ env.Proj_Name }}
         #dotnet publish ShortcutsGrid.csproj /p:PublishProfile="Win System"
         #copy "bin\Win System\net6.0-windows\publish\win-x64\Win System.exe" ..\\${{ env.Test_Proj_Dir }}\\TestResults
-        $exes = "Win System","Win Admin","Office","Utils","Browsers","Connections","Disk Tools","Audio","Image","Video","Hardware"
+        $exes = "Win System","Win Admin","Office","Utils","Browsers","Connections","Disk Tools","Audio","Image","Video","Hardware","Virtual Machines","Programming","Games"
         foreach ($name in $exes){dotnet publish ShortcutsGrid.csproj /p:PublishProfile="$name"}
         foreach ($name in $exes){copy "bin\$name\net6.0-windows\publish\win-x64\$name.exe" ..\\${{ env.Test_Proj_Dir }}\\TestResults}
 

diff --git a/ShortcutsGrid/Services/Run/RunProcess.cs b/ShortcutsGrid/Services/Run/RunProcess.cs
@@ -2,6 +2,9 @@
 
 using System;
 using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Windows.Documents;
 
 public static class RunProcess
 {
@@ -27,8 +30,29 @@ public static string Run(string commandOrPath, bool admin = false)
             try
             {
                 string[] cmdAndArgs = commandOrPath.Split(' ');
-                string args = commandOrPath.Remove(0, cmdAndArgs[0].Length);
-                ProcessStart(cmdAndArgs[0], admin, args);
+                string processCommandOrPath = string.Empty;
+                string args = string.Empty;
+                if (commandOrPath.Contains('\\'))
+                {
+                    var pathStructure = cmdAndArgs.ToList();
+                    for (int i = cmdAndArgs.Length - 1; i > 0; i--)
+                    {
+                        pathStructure.RemoveAt(i);
+                        var fileOrFolder = String.Join(" ", pathStructure.ToArray());
+                        if (File.Exists(fileOrFolder))//to do case for folder if needed
+                        {
+                            processCommandOrPath = fileOrFolder;
+                            args = commandOrPath.Replace(processCommandOrPath, "");
+                            break;
+                        }
+                    }
+                }
+                else
+                {
+                    args = commandOrPath.Remove(0, cmdAndArgs[0].Length);
+                    processCommandOrPath = cmdAndArgs[0];
+                }
+                ProcessStart(processCommandOrPath, admin, args);
                 return string.Empty;
             }
             catch (Exception ex) { return ex.Message; }
@@ -39,7 +63,7 @@ private static void ProcessStart(string commandOrPath, bool admin, string args =
     {
         Process process = new Process();
         process.StartInfo.UseShellExecute = true;
-        //todo
+        //to do
         ///process.StartInfo.WorkingDirectory = "c:\\";
         process.StartInfo.FileName = commandOrPath;
         process.StartInfo.Arguments = args;

diff --git a/ShortcutsGrid/ShortcutsGrid.csproj b/ShortcutsGrid/ShortcutsGrid.csproj
@@ -6,7 +6,7 @@
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
-    <ApplicationIcon>Resources\hardware-128.ico</ApplicationIcon>
+    <ApplicationIcon>Resources\games-128.ico</ApplicationIcon>
     <AssemblyVersion>1.2.2.1</AssemblyVersion>
     <FileVersion>1.2.2.1</FileVersion>
     <VersionPrefix>1.2.2</VersionPrefix>