jmm/kiwi-scp
2
0
Fork 0
Code Projects Wiki Activity

marker

Browse source
This commit is contained in:
Jörn-Michael Miehe 2020-08-19 12:02:46 +02:00
parent 267f85fa8d
commit 0060bf8878
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
example/kiwi.yml
View file

@ -12,7 +12,7 @@ runtime:
markers: markers:
project: .project project: .project
down: .down disabled: .disabled
network: network:
name: kiwi_hub name: kiwi_hub

2
src/etc/kiwi_default.yml
View file

@ -6,7 +6,7 @@ runtime:
env: null env: null
markers: markers:
project: .project project: .project
down: .down disabled: .disabled
network: network:
name: kiwi_hub name: kiwi_hub
cidr: 10.22.46.0/24 cidr: 10.22.46.0/24

2
src/kiwi/subcommands/init.py
View file

@ -58,7 +58,7 @@ class InitCommand(SubCommand):
# markers # markers
user_input(config, 'markers:project', "Enter marker string for project directories") user_input(config, 'markers:project', "Enter marker string for project directories")
user_input(config, 'markers:down', "Enter marker string for disabled projects") user_input(config, 'markers:disabled', "Enter marker string for disabled projects")
# network # network
user_input(config, 'network:name', "Enter name for local docker network") user_input(config, 'network:name', "Enter name for local docker network")

4
src/kiwi/subcommands/utils/project.py
View file

@ -26,7 +26,7 @@ class Project:
return f"{self.__name}{LoadedConfig.get()['markers:project']}" return f"{self.__name}{LoadedConfig.get()['markers:project']}"
def disabled_dir_name(self): def disabled_dir_name(self):
return f"{self.enabled_dir_name()}{LoadedConfig.get()['markers:down']}" return f"{self.enabled_dir_name()}{LoadedConfig.get()['markers:disabled']}"
def conf_dir_name(self): def conf_dir_name(self):
return os.path.join(self.dir_name(), CONF_DIRECTORY_NAME) return os.path.join(self.dir_name(), CONF_DIRECTORY_NAME)
@ -81,7 +81,7 @@ class Project:
def _extract_project_name(file_name): def _extract_project_name(file_name):
config = LoadedConfig.get() config = LoadedConfig.get()
enabled_suffix = config['markers:project'] enabled_suffix = config['markers:project']
disabled_suffix = f"{enabled_suffix}{config['markers:down']}" disabled_suffix = f"{enabled_suffix}{config['markers:disabled']}"
if os.path.isdir(file_name): if os.path.isdir(file_name):
# all subdirectories # all subdirectories