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
Showing only changes of commit faa7e701fd - Show all commits

View File

@ -62,20 +62,14 @@ class CommandHandler(ABC):
if command.is_project_needed: if command.is_project_needed:
name = os.path.basename(self._env.working_directory) name = os.path.basename(self._env.working_directory)
project_path = os.path.join( for r, d, f in os.walk(self._env.working_directory):
self._env.working_directory, for file in f:
f'{name}.json' if file.endswith('.json'):
) f_name = file.split('.json')[0]
project_path_camel_case = os.path.join( if f_name == name or \
self._env.working_directory, String.convert_to_camel_case(f_name) == String.convert_to_camel_case(name):
f'{String.convert_to_camel_case(name)}.json' project_name = f_name
) break
if os.path.isfile(project_path):
project_name = os.path.basename(self._env.working_directory)
if os.path.isfile(project_path_camel_case):
project_name = String.convert_to_camel_case(name)
if not command.is_workspace_needed and project_name is None and workspace is None: if not command.is_workspace_needed and project_name is None and workspace is None:
self._project_not_found() self._project_not_found()