aljaz/Interlace
1
1
Fork 0
mirror of https://github.com/codingo/Interlace.git synced 2025-12-17 23:04:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added support for anonymous block

Browse Source
This commit is contained in:
Joshua Ogunyinka
2019-08-22 13:33:51 +01:00
parent bfa5ca4bd0
commit 3f69c04d3e
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Interlace/lib/core/input.py
View File

@@ -91,10 +91,10 @@ class InputHelper(object):
return [port_type] return [port_type]
@staticmethod @staticmethod
def _pre_process_commands(command_list, task_name, is_global_task=True): def _pre_process_commands(command_list, task_name=None, is_global_task=True):
""" """
:param command_list: :param command_list:
:param task_name: all tasks have 'scope' and all scopes have unique names, global scope defaults '' :param task_name: all tasks have 'scope' and all scopes have unique names, global scope defaults None
:param is_global_task: when True, signifies that all global tasks are meant to be run concurrently :param is_global_task: when True, signifies that all global tasks are meant to be run concurrently
:return: list of possibly re-adjusted commands :return: list of possibly re-adjusted commands
""" """
@@ -103,13 +103,16 @@ class InputHelper(object):
blocker = None blocker = None
for command in command_list: for command in command_list:
command = str(command).strip() command = str(command).strip()
if not command: if len(command) == 0:
continue continue
# the start or end of a command block # the start or end of a command block
if command.startswith('_block:') and command.endswith('_'): if (command.startswith('_block:') and command.endswith('_')) or\
new_task_name = command.split('_block:')[1][:-1].strip() command == '_block_':
# if this is the end of a block, then we're done # if this is the end of a block, then we're done
if task_name == new_task_name: new_task_name = ''
if command.startswith('_block:'):
new_task_name = command.split('_block:')[1][:-1].strip()
if task_name and task_name == new_task_name:
return task_block return task_block
# otherwise pre-process all the commands in this new `new_task_name` block # otherwise pre-process all the commands in this new `new_task_name` block
tasks = InputHelper._pre_process_commands(command_list, new_task_name, False) tasks = InputHelper._pre_process_commands(command_list, new_task_name, False)
@@ -238,7 +241,7 @@ class InputHelper(object):
if arguments.command: if arguments.command:
commands.append(arguments.command.rstrip('\n')) commands.append(arguments.command.rstrip('\n'))
else: else:
commands = InputHelper._pre_process_commands(arguments.command_list, '') commands = InputHelper._pre_process_commands(arguments.command_list)
commands = InputHelper._replace_variable_with_commands(commands, "_target_", targets) commands = InputHelper._replace_variable_with_commands(commands, "_target_", targets)
commands = InputHelper._replace_variable_with_commands(commands, "_host_", targets) commands = InputHelper._replace_variable_with_commands(commands, "_host_", targets)