2021.4.6 #25

Merged
edraft merged 57 commits from 2021.4.6 into 2021.4.post1 2021-04-11 15:54:38 +02:00
3 changed files with 15 additions and 3 deletions
Showing only changes of commit f6fc5d09e7 - Show all commits

View File

@ -13,10 +13,14 @@ class String:
:param name: :param name:
:return: :return:
""" """
# convert to train-case to CamelCase
if '-' in name:
name = ''.join(word.title() for word in name.split('-'))
pattern1 = re.compile(r'(.)([A-Z][a-z]+)') pattern1 = re.compile(r'(.)([A-Z][a-z]+)')
pattern2 = re.compile(r'([a-z0-9])([A-Z])') pattern2 = re.compile(r'([a-z0-9])([A-Z])')
file_name = re.sub(pattern1, r'\1_\2', name) file_name = re.sub(pattern1, r'\1_\2', name)
return re.sub(pattern2, r'\1_\2', file_name).lower().replace('-', '_') return re.sub(pattern2, r'\1_\2', file_name).lower()
@staticmethod @staticmethod
def first_to_upper(string: str) -> str: def first_to_upper(string: str) -> str:

View File

@ -129,8 +129,12 @@ class ConsoleBuilder:
) )
for template in templates: for template in templates:
divider = ''
if not template.path.endswith('/'):
divider = '/'
Console.spinner( Console.spinner(
f'Creating {proj_name}/{template.path}{template.name}', f'Creating {proj_name}/{template.path}{divider}{template.name}',
TemplateBuilder.build, TemplateBuilder.build,
project_path, project_path,
template, template,

View File

@ -129,8 +129,12 @@ class LibraryBuilder:
) )
for template in templates: for template in templates:
divider = ''
if not template.path.endswith('/'):
divider = '/'
Console.spinner( Console.spinner(
f'Creating {proj_name}/{template.path}{template.name}', f'Creating {proj_name}/{template.path}{divider}{template.name}',
TemplateBuilder.build, TemplateBuilder.build,
project_path, project_path,
template, template,