Merge branch 'add-openAny' of https://github.com/minhe7735/AssistantComputerControl into add-openAny

Author: minhe7735

AssistantComputerControl/Actions.cs

@@ -445,46 +445,34 @@ public void Open(string parameter) {
                 }
             }
         }
-        public void OpenAny(string parameter)
-        {
+        public void OpenAny(string parameter) {
             string fileLocation = MainProgram.shortcutLocation;
             Regex rx = new Regex("^" + parameter + Regex.Escape(".") + ".*", RegexOptions.IgnoreCase);
-            if (Directory.Exists(fileLocation) || Uri.IsWellFormedUriString(fileLocation, UriKind.Absolute))
-            {
+            
+            if (Directory.Exists(fileLocation) || Uri.IsWellFormedUriString(fileLocation, UriKind.Absolute)) {
                 DirectoryInfo d = new DirectoryInfo(fileLocation);
                 bool opened = false;
-                foreach (var dirFile in d.GetFiles())
-                {
-                    if (!MainProgram.testingAction)
-                    {
+                foreach (var dirFile in d.GetFiles()) {
+                    if (!MainProgram.testingAction) {
                         bool result = rx.IsMatch(dirFile.Name);
-                        if (result)
-                        {
+                        if (result) {
                             Process.Start(dirFile.FullName);
                             opened = true;
                             break;
                         }
                     }
                 }
-                if (!opened)
-                {
+                
+                if (!opened) {
                     Error("File(" + parameter + ") doesn't exist  at" + " (" + fileLocation + ")");
-                }
-                else
-                {
-                    if (!MainProgram.testingAction)
-                    {
+                } else {
+                    if (!MainProgram.testingAction) {
                         successMessage = "OPEN: opened " + parameter;
-                    }
-                    else
-                    {
+                    } else {
                         successMessage = "OPEN: simulated opening " + parameter;
                     }
                 }
-
-            }
-            else
-            {
+            } else {
                 Error("Directory doesn't exist (" + fileLocation + ")");
             }
         }

AssistantComputerControl/MainProgram.cs

@@ -437,8 +437,8 @@ public static void TaskSchedulerSetup () {
                     td.RegistrationInfo.Author = "Albert MN. | AssistantComputerControl";
                     td.RegistrationInfo.Description = "AssistantComputerControl cleanup - clears the action folder to prevent the same action being executed twice";
 
-                    td.Actions.Add(new ExecAction("powershell.exe", $"-WindowStyle Hidden -file \"{ps1File}\" \"{Path.Combine(MainProgram.CheckPath(), "*")}\" \"*.{Properties.Settings.Default.ActionFileExtension}\"", null));
-
+                    td.Actions.Add(new ExecAction("mshta.exe", $"vbscript:Execute(\"CreateObject(\"\"WScript.Shell\"\").Run \"\"powershell -ExecutionPolicy Bypass & '{ps1File}' '{Path.Combine(MainProgram.CheckPath(), "*")}' '*.{Properties.Settings.Default.ActionFileExtension}'\"\", 0:close\")", null));
+                    
                     td.Triggers.Add(new LogonTrigger { UserId = userId, });
                     ts.RootFolder.RegisterTaskDefinition(@"AssistantComputerControl cleanup", td);
                 }
@@ -936,4 +936,4 @@ public static bool IsValidPath(string path, bool allowRelativePaths = false) {
             return isValid;
         }
     }
-}
+}

AssistantComputerControl/actionChecker.cs

@@ -474,8 +474,7 @@ public static Actions ExecuteAction(string action, string line, string parameter
                         }
                         break;
                     case "open_any":
-                        if (RequireParameter(parameter))
-                        {
+                        if (RequireParameter(parameter)) {
                             actionExecution.OpenAny(parameter);
                         }
                         break;
@@ -567,4 +566,4 @@ public static Actions ExecuteAction(string action, string line, string parameter
             return actionExecution;
         }
     }
-}
+}