Allow nested commands to be set from the settings only (#4)

Author: Tom-Stowe

main.py

@@ -13,27 +13,43 @@ def resetProgram():
 
 options = Options(resetProgram)
 
-# Convert the command list to a tuple list
-updatedCommands = []
-for command in options.commands:
-    icon = command.icon
-    if (command.icon == "" or command.icon == None):
-        icon = None
-    else:
-        _, extension = splitext(command.icon)
-        
-        # Ensure that the icon is valid
-        if (not(exists(command.icon) and extension == ".ico")):
+def addCommandsToTuple(commands, tuple):
+    for command in commands:
+        icon = command.icon
+        if (command.icon == "" or command.icon == None):
             icon = None
+        else:
+            _, extension = splitext(command.icon)
+            
+            # Ensure that the icon is valid
+            if (not(exists(command.icon) and extension == ".ico")):
+                icon = None
+            
+        # Recursively add items if a command list
+        if (command.commandList != None):
+            tuple = tuple + ((command.name, icon, addCommandsToTuple(command.commandList, ())),)
+                
+        else:
+            tuple = tuple + (((
+                command.name,
+                icon,
+                command.getActionableCommand())),
+            )
+    return tuple
 
-    updatedCommands.append((
-        command.name,
-        icon,
-        command.getActionableCommand())
-    )
+# Convert the command list to a tuple list
+updatedCommands = ()
+updatedCommands = addCommandsToTuple(options.commands, updatedCommands)
 
-# Add the options page
-updatedCommands.append(("Options", "icons/settings.ico", options.showOptionsPage))
+# Are there nested commands?
+nestedCommands = False
+for command in options.commands:
+    if command.commandList != None:
+        nestedCommands = True    
+
+# Add the options page if there are no nested commands as the options page currently doesn't support them
+if not nestedCommands:
+    updatedCommands = updatedCommands + ((("Options", "icons/settings.ico", options.showOptionsPage)),)
 
-sysTrayIcon = SysTrayIcon("icons/main.ico", "Tray Script", tuple(updatedCommands), default_menu_index=len(updatedCommands)-1)
+sysTrayIcon = SysTrayIcon("icons/main.ico", "Tray Script", updatedCommands, default_menu_index=len(updatedCommands)-1 if not nestedCommands else 0)
 sysTrayIcon.start()

src/Command.py

@@ -28,12 +28,14 @@ class Command:
         The constructor for the Command datatype
         name: The name of the command
         command: The command to perform
+        commandList: The list of commands nested in the command
         runCommandInBackground: Whether to run the command in the background
         icon: The icon to use
     """
-    def __init__(self, name, command, runCommandInBackground, icon=None):
+    def __init__(self, name, command, commandList, runCommandInBackground, icon=None):
         self.name = name
         self.command = command
+        self.commandList = commandList
         self.runCommandInBackground = runCommandInBackground
         self.icon = icon
 
@@ -44,9 +46,13 @@ def __init__(self, name, command, runCommandInBackground, icon=None):
     def __dict__(self):
         outDict = {
             "name": self.name,
-            "command": self.command,
             "runCommandInBackground": self.runCommandInBackground
         }
+        if (self.commandList != None and len(self.commandList) != 0):
+            outDict["commandList"] = self.commandList
+        else:
+            outDict["command"] = self.command
+        
         if (self.icon != None):
             outDict["icon"] = self.icon
 

src/ConfigReader.py

@@ -7,7 +7,6 @@
     Returns: The commands
 """
 def loadSettings(filePath):
-    print(os.getcwd())
     # Open file
     f = open(os.getcwd() + "\\" + filePath, "r")
     data = json.loads(f.read())
@@ -19,15 +18,22 @@ def loadSettings(filePath):
         return []
 
     # Get the valid commands
+    return __getCommands(jsonCommands)
+        
+def __getCommands(jsonCommands):
     commands = []
     for jsonCommand in jsonCommands:
         name = jsonCommand.get("name", None)
         command = jsonCommand.get("command", None)
+        commandList = jsonCommand.get("commandList", None)
         runCommandInBackground = jsonCommand.get("runCommandInBackground", False)
         icon = jsonCommand.get("icon", None)
 
-        if (name != None and command != None):
-            commands.append(Command(name, command, runCommandInBackground, icon))
+        if (name != None and (command != None or commandList != None)):
+            if (commandList != None and isinstance(commandList, list)):
+                commands.append(Command(name, None, __getCommands(commandList), runCommandInBackground, icon))
+            else:
+                commands.append(Command(name, command, None, runCommandInBackground, icon))
 
     return commands
 

src/Options.py

@@ -290,7 +290,8 @@ def __getCommandFromTextInputs(self):
                 self.errorText.set("Please ensure that the icon exists and is an ico file")
                 return
 
-        return Command(commandName, command, toRunInBackground, icon)
+        # Currently set to empty list until the options menu is implemented
+        return Command(commandName, command, [], toRunInBackground, icon)
 
     """
         A function to update the settings stored in the settings file and updates the options window