sh-edraft.de/sh_cpl
2
1
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects 1 Releases 12 Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Sven Heidemann
2021-03-10 14:16:03 +01:00
parent 1bff2ea168
commit 4e24662d90
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/cpl_cli/publish/publisher.py
View File

@@ -72,12 +72,22 @@ class Publisher(PublisherABC):
Console.error(f'{e}')
exit()
def _is_path_included(self, path: str) -> bool:
for included in self._build_settings.included:
if included.startswith('*'):
included = included.replace('*', '')
if included in path and path not in self._build_settings.excluded:
return True
return False
def _is_path_excluded(self, path: str) -> bool:
for excluded in self._build_settings.excluded:
if excluded.startswith('*'):
excluded = excluded.replace('*', '')
if excluded in path and path not in self._build_settings.included:
if excluded in path and not self._is_path_included(path):
return True
return False
@@ -96,8 +106,8 @@ class Publisher(PublisherABC):
elif os.path.isfile(rel_path):
self._included_files.append(rel_path)
else:
Console.error(f'Path not found: {rel_path}')
#else:
# Console.error(f'Path not found: {rel_path}')
for r, d, f in os.walk(self._build_settings.source_path):
for file in f:
@@ -304,4 +314,4 @@ class Publisher(PublisherABC):
Console.spinner('Generating setup_template.py:', self._create_setup)
Console.write_line('Running setup_template.py:\n')
self._run_setup()
Console.spinner('Cleaning dist path:', self._clean_dist_files)
# Console.spinner('Cleaning dist path:', self._clean_dist_files)