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

Merge pull request #92 from codingo/dup-clean-targets

Browse Source 
Dup clean targets
This commit is contained in:
Sajeeb Lohani
2020-02-11 10:56:52 +11:00
committed by GitHub
parent 223bd4bd75 3b5ecb1010
commit c6630d056c
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Interlace/lib/core/__version__.py
View File

@@ -1 +1 @@
__version__ = '1.7.4' __version__ = '1.7.5'

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

@@ -172,9 +172,14 @@ class InputHelper(object):
variable = '_cleantarget_' variable = '_cleantarget_'
tasks = [] tasks = []
temp = set() # this helps avoid command duplication and re/deconstructing of temporary set temp = set() # this helps avoid command duplication and re/deconstructing of temporary set
for command in commands: # changed order to ensure different combinations of commands aren't created
for dirty_target in dirty_targets: for dirty_target in dirty_targets:
for command in commands:
if command.name().find(variable) != -1: if command.name().find(variable) != -1:
new_task = command.clone()
new_task.replace("_target_", dirty_target)
# replace all https:// or https:// with nothing # replace all https:// or https:// with nothing
dirty_target = dirty_target.replace('http://', '') dirty_target = dirty_target.replace('http://', '')
dirty_target = dirty_target.replace('https://', '') dirty_target = dirty_target.replace('https://', '')
@@ -183,11 +188,12 @@ class InputHelper(object):
dirty_target = dirty_target.strip('/') dirty_target = dirty_target.strip('/')
# replace all remaining '/' with '-' and that's enough cleanup for the day # replace all remaining '/' with '-' and that's enough cleanup for the day
clean_target = dirty_target.replace('/', '-') clean_target = dirty_target.replace('/', '-')
new_task = command.clone()
new_task.replace(variable, clean_target) new_task.replace(variable, clean_target)
add_task(new_task, tasks, temp) add_task(new_task, tasks, temp)
else: else:
command.replace("_target_", dirty_target)
add_task(command, tasks, temp) add_task(command, tasks, temp)
return tasks return tasks
@staticmethod @staticmethod
@@ -273,9 +279,9 @@ class InputHelper(object):
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._process_clean_targets(commands, targets) commands = InputHelper._process_clean_targets(commands, targets)
commands = InputHelper._replace_variable_with_commands(commands, "_host_", targets)
if arguments.port: if arguments.port:
commands = InputHelper._replace_variable_with_commands(commands, "_port_", ports) commands = InputHelper._replace_variable_with_commands(commands, "_port_", ports)