Merge pull request #111 from minhe7735/add-openAny

AlbertMN · web-flow · commit 25560779353c · 2021-10-10T21:11:12.000+02:00
Add `open_any` action + possible fix for PowerShell opening + implement new setting - due for testing
diff --git a/AssistantComputerControl/Actions.cs b/AssistantComputerControl/Actions.cs
@@ -445,6 +445,37 @@ public void Open(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)) {
+                DirectoryInfo d = new DirectoryInfo(fileLocation);
+                bool opened = false;
+                foreach (var dirFile in d.GetFiles()) {
+                    if (!MainProgram.testingAction) {
+                        bool result = rx.IsMatch(dirFile.Name);
+                        if (result) {
+                            Process.Start(dirFile.FullName);
+                            opened = true;
+                            break;
+                        }
+                    }
+                }
+                
+                if (!opened) {
+                    Error("File(" + parameter + ") doesn't exist  at" + " (" + fileLocation + ")");
+                } else {
+                    if (!MainProgram.testingAction) {
+                        successMessage = "OPEN: opened " + parameter;
+                    } else {
+                        successMessage = "OPEN: simulated opening " + parameter;
+                    }
+                }
+            } else {
+                Error("Directory doesn't exist (" + fileLocation + ")");
+            }
+        }
         public void OpenAll(string parameter) {
             string fileLocation = (!parameter.Contains(@":\") || !parameter.Contains(@":/")) ? Path.Combine(MainProgram.shortcutLocation, parameter) : parameter;
 
diff --git a/AssistantComputerControl/App.config b/AssistantComputerControl/App.config
@@ -86,6 +86,9 @@
       <setting name="StartsUsingRegistry" serializeAs="String">
         <value>False</value>
       </setting>
+      <setting name="ActionMessageBox" serializeAs="String">
+        <value>True</value>
+      </setting>
     </AssistantComputerControl.Properties.Settings>
   </userSettings>
   <runtime>
diff --git a/AssistantComputerControl/MainProgram.cs b/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;
         }
     }
-}
+}
diff --git a/AssistantComputerControl/Properties/Settings.Designer.cs b/AssistantComputerControl/Properties/Settings.Designer.cs
diff --git a/AssistantComputerControl/Properties/Settings.settings b/AssistantComputerControl/Properties/Settings.settings
@@ -83,5 +83,8 @@
     <Setting Name="StartsUsingRegistry" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="ActionMessageBox" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/AssistantComputerControl/SettingsForm.Designer.cs b/AssistantComputerControl/SettingsForm.Designer.cs
diff --git a/AssistantComputerControl/SettingsForm.cs b/AssistantComputerControl/SettingsForm.cs
@@ -38,6 +38,7 @@ void FreakingStopDingSound(Object o, KeyEventArgs e) {
             //Set values
             startWithWindows.Checked = MainProgram.ACCStartsWithWindows();
             checkUpdates.Checked = Properties.Settings.Default.CheckForUpdates;
+            actionErrorMessageBox.Checked = Properties.Settings.Default.ActionMessageBox;
             betaProgram.Checked = Properties.Settings.Default.BetaProgram;
             warnDeletion.Checked = Properties.Settings.Default.WarnWhenDeletingManyFiles;
             defaultComputer.Checked = Properties.Settings.Default.DefaultComputer;
@@ -106,6 +107,14 @@ private void checkUpdates_CheckedChanged(object sender, EventArgs e) {
             }
         }
 
+        private void actionErrorMessageBox_CheckedChanged(object sender, EventArgs e) {
+            if (Properties.Settings.Default.ActionMessageBox != actionErrorMessageBox.Checked) {
+                Properties.Settings.Default.ActionMessageBox = actionErrorMessageBox.Checked;
+                Properties.Settings.Default.Save();
+            }
+            
+        }
+
         private void betaProgram_CheckedChanged(object sender, EventArgs e) {
             if (Properties.Settings.Default.BetaProgram != betaProgram.Checked) {
                 Properties.Settings.Default.BetaProgram = betaProgram.Checked;
@@ -214,5 +223,7 @@ private void saveLanguageButton_Click(object sender, EventArgs e) {
         private void changelogOpen_Click(object sender, EventArgs e) {
             new NewVersion().Show();
         }
+
+        
     }
-}
+}
diff --git a/AssistantComputerControl/Translations/Danish.json b/AssistantComputerControl/Translations/Danish.json
@@ -31,6 +31,7 @@
       "save_language_btn": "gem",
       "start_with_windows": "Åben med Windows?",
       "check_for_updates": "Søg automatisk efter opdateringer?",
+      "action_error_message_box": "Show action errors?",
       "join_beta_program": "Vær en del af beta-programmet (og få opdateringer tidligt)",
 
       "file_edited_margin": "Filændring margen (sekunder)",
diff --git a/AssistantComputerControl/Translations/Dutch.json b/AssistantComputerControl/Translations/Dutch.json
@@ -33,6 +33,7 @@
         "save_language_btn": "bewaren",
         "start_with_windows": "Start met Windows?",
         "check_for_updates": "Controleren op updates?",
+        "action_error_message_box": "Show action errors?",
         "join_beta_program": "Sluit je aan bij het beta programma?",
   
         "file_edited_margin": "Bestand bewerkt marge (seconden)",
diff --git a/AssistantComputerControl/Translations/English.json b/AssistantComputerControl/Translations/English.json
@@ -33,6 +33,7 @@
       "save_language_btn": "save",
       "start_with_windows": "Start with Windows?",
       "check_for_updates": "Check for updates?",
+      "action_error_message_box": "Show action errors?",
       "join_beta_program": "Join the beta program?",
 
       "file_edited_margin": "File edited margin (seconds)",
diff --git a/AssistantComputerControl/Translations/Francais.json b/AssistantComputerControl/Translations/Francais.json
@@ -31,6 +31,7 @@
       "save_language_btn": "enreg",
       "start_with_windows": "Démarrer avec Windows",
       "check_for_updates": "Autoriser la recherche de mises à jour ?",
+      "action_error_message_box": "Show action errors?",
       "join_beta_program": "Rejoindre le programme Beta",
 
       "file_edited_margin": "Délai pour un fichier édité (secondes)",
diff --git a/AssistantComputerControl/Translations/Italian.json b/AssistantComputerControl/Translations/Italian.json
@@ -30,6 +30,7 @@
       "save_language_btn": "salva",
       "start_with_windows": "Avvia con Windows?",
       "check_for_updates": "Controlla gli aggiornamenti?",
+      "action_error_message_box": "Show action errors?",
       "join_beta_program": "Unisciti al programma beta?",
 
       "file_edited_margin": "Limite di modifica del file (secondi)",
diff --git a/AssistantComputerControl/Translations/Portuguese - Brasil.json b/AssistantComputerControl/Translations/Portuguese - Brasil.json
@@ -29,6 +29,7 @@
       "save_language_btn": "Salvar",
       "start_with_windows": "Iniciar com o Windows?",
       "check_for_updates": "Verifique se há atualizações?",
+      "action_error_message_box": "Show action errors?",
       "join_beta_program": "Participe do programa beta?",
 
       "file_edited_margin": "Margem editada pelo arquivo (segundos)",
diff --git a/AssistantComputerControl/Translations/Spanish.json b/AssistantComputerControl/Translations/Spanish.json
@@ -33,6 +33,7 @@
       "save_language_btn": "Guardar",
       "start_with_windows": "¿Iniciar junto con Windows?",
       "check_for_updates": "¿Buscar actualizaciones?",
+      "action_error_message_box": "Show action errors?",
       "join_beta_program": "¿Te unes al programa BETA?",
 
       "file_edited_margin": "Margen de edición de archivo (segundos)",
diff --git a/AssistantComputerControl/Translations/Turkce.json b/AssistantComputerControl/Translations/Turkce.json
@@ -31,6 +31,7 @@
       "save_language_btn": "Kaydet",
       "start_with_windows": "Windows ile beraber başlasın mı?",
       "check_for_updates": "Güncellemeler denetlensin mi?",
+      "action_error_message_box": "Show action errors?",
       "join_beta_program": "Beta programına katılmak ister misiniz?",
 
       "file_edited_margin": "Dosya düzenlenmiş kenar boşluğu (saniye)",
diff --git a/AssistantComputerControl/actionChecker.cs b/AssistantComputerControl/actionChecker.cs
@@ -384,7 +384,10 @@ private static void CheckAction(string theLine, string theFile) {
 
             if (!String.IsNullOrEmpty(theActionExecution.errorMessage)) {
                 MainProgram.DoDebug("[ERROR]: " + theActionExecution.errorMessage);
-                ErrorMessageBox(theActionExecution.errorMessage, "Action Error  " + MainProgram.messageBoxTitle);
+                if (Properties.Settings.Default.ActionMessageBox) {
+                    ErrorMessageBox(theActionExecution.errorMessage, "Action Error  " + MainProgram.messageBoxTitle);
+                }
+
             } else {
                 if (!String.IsNullOrEmpty(theActionExecution.successMessage)) {
                     MainProgram.DoDebug("\nSUCCESS: " + theActionExecution.successMessage + "\n");
@@ -470,6 +473,11 @@ public static Actions ExecuteAction(string action, string line, string parameter
                             actionExecution.Open(parameter);
                         }
                         break;
+                    case "open_any":
+                        if (RequireParameter(parameter)) {
+                            actionExecution.OpenAny(parameter);
+                        }
+                        break;
                     case "open_all":
                         if (RequireParameter(parameter)) {
                             actionExecution.OpenAll(parameter);
@@ -558,4 +566,4 @@ public static Actions ExecuteAction(string action, string line, string parameter
             return actionExecution;
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -437,8 +437,8 @@ public static void TaskSchedulerSetup () {`
`437`	`437`	`td.RegistrationInfo.Author = "Albert MN. \| AssistantComputerControl";`
`438`	`438`	`td.RegistrationInfo.Description = "AssistantComputerControl cleanup - clears the action folder to prevent the same action being executed twice";`
`439`	`439`
`440`		`- td.Actions.Add(new ExecAction("powershell.exe", $"-WindowStyle Hidden -file \"{ps1File}\" \"{Path.Combine(MainProgram.CheckPath(), "")}\" \".{Properties.Settings.Default.ActionFileExtension}\"", null));`
`441`		`-`
	`440`	`+ 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));`
	`441`	`+`
`442`	`442`	`td.Triggers.Add(new LogonTrigger { UserId = userId, });`
`443`	`443`	`ts.RootFolder.RegisterTaskDefinition(@"AssistantComputerControl cleanup", td);`
`444`	`444`	`}`
`@@ -936,4 +936,4 @@ public static bool IsValidPath(string path, bool allowRelativePaths = false) {`
`936`	`936`	`return isValid;`
`937`	`937`	`}`
`938`	`938`	`}`
`939`		`-}`
	`939`	`+}`