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

Improved publisher

Browse Source
This commit is contained in:
Sven Heidemann
2020-12-15 17:27:52 +01:00
parent 6f82bd8b35
commit 7ee2eff483
7 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/sh_edraft/publishing/model/publish_settings_model.py
View File

@@ -15,10 +15,10 @@ class PublishSettings(ConfigurationModelBase):
self._source_path: Optional[str] = None
self._dist_path: Optional[str] = None
self._templates: Optional[list[Template]] = None
self._templates: list[Template] = []
self._included_files: Optional[list[str]] = None
self._excluded_files: Optional[list[str]] = None
self._included_files: list[str] = []
self._excluded_files: list[str] = []
self._template_ending: Optional[str] = None
@@ -74,7 +74,11 @@ class PublishSettings(ConfigurationModelBase):
try:
self._source_path = settings[PublishSettingsName.source_path.value]
self._dist_path = settings[PublishSettingsName.dist_path.value]
self._templates = Template().from_dict(settings[PublishSettingsName.templates.value])
for template in settings[PublishSettingsName.templates.value]:
temp = Template()
temp.from_dict(template)
self._templates.append(temp)
self._included_files = settings[PublishSettingsName.included_files.value]
self._excluded_files = settings[PublishSettingsName.excluded_files.value]
self._template_ending = settings[PublishSettingsName.template_ending.value]

5
src/sh_edraft/publishing/model/template.py
View File

@@ -19,7 +19,7 @@ class Template(ConfigurationModelBase):
license_description: Optional[str] = None,
title: Optional[str] = None,
author: Optional[str] = None,
version: Optional[dict] = None
version: Optional[Version] = Version()
):
ConfigurationModelBase.__init__(self)
self._template_path: Optional[str] = template_path
@@ -33,8 +33,7 @@ class Template(ConfigurationModelBase):
self._title: Optional[str] = title
self._author: Optional[str] = author
self._version: Optional[Version] = Version()
self._version.from_dict(version)
self._version: Optional[Version] = version
self._file_content: Optional[str] = None