Merge pull request #2 from Skitzum/rev1

Rev1

Author: Skitzum

main.py

@@ -4,6 +4,7 @@
 import subprocess
 import ctypes
 import re
+import shlex
 
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import (
@@ -675,15 +676,15 @@ def on_execute_clicked(self):
     def run_selected_command(self):
         selected_items = self.table.selectedItems()
         if not selected_items:
-            return  # no selection
+            return  # No selection
 
         row = selected_items[0].row()
         shortcut, original_index = self.displayed_pairs[row]
 
         command = shortcut.get("command", "").strip()
         requires_input = shortcut.get("requires_input", False)
 
-        # If it has placeholders, handle them
+        # 1) Placeholder handling
         if requires_input:
             placeholders = re.findall(r"{(.*?)}", command)
             if placeholders:
@@ -692,23 +693,52 @@ def run_selected_command(self):
                     if not val:
                         self.info_label.setText("Command cancelled or no input provided.")
                         return
+                    # Replace placeholders
                     command = command.replace(f"{{{ph}}}", val)
 
-        # Determine if it's PowerShell, PS1, .exe, or default to cmd
-        if command.lower().endswith(".exe"):
-            # Just run it via subprocess
-            full_cmd = [command]
-        elif command.lower().startswith("powershell") or command.lower().endswith(".ps1"):
-            full_cmd = ["powershell.exe", "-NoExit", "-Command", command]
+        # 2) Parse the final command string into tokens with shlex
+        try:
+            tokens = shlex.split(command)
+        except ValueError as e:
+            # If there's a quoting error, or user typed something unparseable
+            self.info_label.setText(f"Shlex parse error: {e}")
+            return
+
+        if not tokens:
+            self.info_label.setText("No command tokens found.")
+            return
+
+        # For debugging: print(tokens)
+        print("Parsed tokens:", tokens)
+
+        # 3) Decide how to run
+        first_token_lower = tokens[0].lower()
+
+        # A) If first token ends with .exe, run it directly
+        if first_token_lower.endswith(".exe"):
+            full_cmd = tokens  # e.g. ["E:\\HwInfo64.exe", "--someArg"]
+        # B) If first token is powershell.exe or second token is .ps1, run powershell
+        elif first_token_lower.startswith("powershell") or (len(tokens) > 0 and tokens[0].lower().endswith(".ps1")):
+            # If user typed "powershell.exe ..." => just use tokens as-is
+            full_cmd = tokens
+            # If you want to enforce something like "powershell.exe -NoExit", you can insert tokens here
+        elif (len(tokens) > 1 and tokens[1].lower().endswith(".ps1")):
+            # e.g. user typed "powershell -File something.ps1"
+            full_cmd = tokens
         else:
-            full_cmd = ["cmd.exe", "/k", command]
+            # C) Default: pass tokens to cmd /k
+            # i.e. run cmd, /k, and then your tokens as arguments
+            full_cmd = ["cmd.exe", "/k"] + tokens
+
+        print("Final cmd to execute:", full_cmd)
 
+        # 4) Execute
         try:
-            subprocess.Popen(full_cmd, shell=True)
+            subprocess.Popen(full_cmd, shell=False)
         except Exception as e:
+            print(f"Error executing command: {full_cmd}, Error: {e}")
             self.info_label.setText(f"Error executing: {e}")
 
-
     def prompt_for_variable(self, placeholder_label: str = "value"):
         text, ok = QInputDialog.getText(
             self,

shortcuts.json

@@ -21,6 +21,17 @@
       "category": "Networking",
       "group": "Startup Tools"
     },
+    {
+      "name": "Speed Test",
+      "command": "powershell -Command & {Invoke-WebRequest -Uri \"https://www.speedtest.net/\" -UseBasicParsing}",
+      "description": "Performs a basic speed test by accessing the SpeedTest website.",
+      "tags": [
+        "network",
+        "speed",
+        "test"
+      ],
+      "category": "Networking"
+    },
     {
       "name": "IPConfig",
       "command": "ipconfig /all",
@@ -360,7 +371,8 @@
       "tags": [
         "pihole",
         "update",
-        "ssh"
+        "ssh",
+        "server"
       ],
       "category": "BAT",
       "requires_input": false
@@ -385,6 +397,45 @@
       "tags": [],
       "category": "",
       "requires_input": false
+    },
+    {
+      "name": "Copy Files to Remote Server",
+      "command": "scp {file target} {login@IP} {Directory Target}",
+      "description": "Uses SCP to copy files securely to a remote server",
+      "tags": [
+        "copy",
+        "remote",
+        "server",
+        "scp"
+      ],
+      "category": "Networking",
+      "requires_input": true
+    },
+    {
+      "name": "Reboot to BIOS/UEFI",
+      "command": "shutdown /r /fw /t 0",
+      "description": "Restarts the computer immediately to BIOS/UEFI",
+      "tags": [
+        "troubleshooting",
+        "restart",
+        "bios",
+        "reset"
+      ],
+      "category": "System Management",
+      "requires_input": false
+    },
+    {
+      "name": "Encrypt a Folder",
+      "command": "cipher /e /s:{path}",
+      "description": "Encrypts a directory and all contents",
+      "tags": [
+        "files",
+        "folder",
+        "encrypt",
+        "cypher"
+      ],
+      "category": "System Management",
+      "requires_input": true
     }
   ],
   "settings": {