|
|
|
@ -1933,7 +1933,6 @@ class DirectoryProcessor:
|
|
|
|
|
template_directories, template_files = self._scan_directory(
|
|
|
|
|
current_directory_path)
|
|
|
|
|
template_files = sorted(template_files)
|
|
|
|
|
print('template files:', template_files)
|
|
|
|
|
|
|
|
|
|
# обрабатываем в первую очередь шаблон директории.
|
|
|
|
|
if '.calculate_directory' in template_files:
|
|
|
|
@ -2040,9 +2039,6 @@ class DirectoryProcessor:
|
|
|
|
|
|
|
|
|
|
# Просто псевдоним, чтобы меньше путаницы было далее.
|
|
|
|
|
template_parameters = directory_parameters
|
|
|
|
|
print("\nLET'S USE TEMPLATE FILES: {}\n".format(template_files))
|
|
|
|
|
print("THIS PARAMETERS WOULD BE INHERITED BY TEMPLATE FILES:")
|
|
|
|
|
print(template_parameters)
|
|
|
|
|
|
|
|
|
|
# Обрабатываем файлы шаблонов.
|
|
|
|
|
for template_name in template_files:
|
|
|
|
@ -2073,7 +2069,6 @@ class DirectoryProcessor:
|
|
|
|
|
# добавляем ее в словарь обработчиков и пропускаем ее.
|
|
|
|
|
self._handlers.update({template_parameters.handler:
|
|
|
|
|
(FILE, template_path)})
|
|
|
|
|
print('SKIPPED:', template_path)
|
|
|
|
|
|
|
|
|
|
# * * * ПРИДУМАТЬ ОПТИМИЗАЦИЮ * * *
|
|
|
|
|
# TODO Потому что накладывать дерево каждый раз, когда
|
|
|
|
@ -2357,12 +2352,8 @@ class DirectoryProcessor:
|
|
|
|
|
|
|
|
|
|
elif parameters.package != self.for_package:
|
|
|
|
|
if directory_tree is not None:
|
|
|
|
|
print('IS ADDED TO TREE')
|
|
|
|
|
template_name = os.path.basename(template_path)
|
|
|
|
|
directory_tree[template_name] = None
|
|
|
|
|
print('CURRENT TREE:', self.directory_tree)
|
|
|
|
|
else:
|
|
|
|
|
print('IS NOT ADDED TO TREE')
|
|
|
|
|
self.output.set_warning(
|
|
|
|
|
("'package' parameter value '{0}' does not "
|
|
|
|
|
"match its current target package '{1}'. "
|
|
|
|
|