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

2021.4.1 #11

Merged
edraft merged 172 commits from 2021.04.01 into 2021.04 2021-03-21 20:04:24 +01:00
Conversation 1 Commits 172 Files Changed 269 +17 -18
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9a0d36ca86 - Show all commits

24
.idea/workspace.xml
View File

@ -22,10 +22,8 @@
<select /> <select />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="7e2256bc-a6b8-4880-83a6-8b0e3372d0a4" name="Default Changelist" comment="Added spinner"> <list default="true" id="7e2256bc-a6b8-4880-83a6-8b0e3372d0a4" name="Default Changelist" comment="Improved spinner">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/cpl/console/console.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl/console/console.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/cpl/console/spinner_thread.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl/console/spinner_thread.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/cpl_cli/publish/publisher.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl_cli/publish/publisher.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/cpl_cli/publish/publisher.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl_cli/publish/publisher.py" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@ -487,13 +485,6 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1605881914521</updated> <updated>1605881914521</updated>
</task> </task>
<task id="LOCAL-00047" summary="Improved cli">
<created>1608122289003</created>
<option name="number" value="00047" />
<option name="presentableId" value="LOCAL-00047" />
<option name="project" value="LOCAL" />
<updated>1608122289003</updated>
</task>
<task id="LOCAL-00048" summary="Added version command to cli"> <task id="LOCAL-00048" summary="Added version command to cli">
<created>1608125743068</created> <created>1608125743068</created>
<option name="number" value="00048" /> <option name="number" value="00048" />
@ -830,7 +821,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1614956114719</updated> <updated>1614956114719</updated>
</task> </task>
<option name="localTasksCounter" value="96" /> <task id="LOCAL-00096" summary="Improved spinner">
<created>1614958058304</created>
<option name="number" value="00096" />
<option name="presentableId" value="LOCAL-00096" />
<option name="project" value="LOCAL" />
<updated>1614958058304</updated>
</task>
<option name="localTasksCounter" value="97" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
@ -846,7 +844,6 @@
<option name="oldMeFiltersMigrated" value="true" /> <option name="oldMeFiltersMigrated" value="true" />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="Added pycharm files to gitignore" />
<MESSAGE value="Added more development tests" /> <MESSAGE value="Added more development tests" />
<MESSAGE value="Added new tester and CredentialManager TestCase" /> <MESSAGE value="Added new tester and CredentialManager TestCase" />
<MESSAGE value="Bugfix" /> <MESSAGE value="Bugfix" />
@ -871,7 +868,8 @@
<MESSAGE value="Readded workspace.xml" /> <MESSAGE value="Readded workspace.xml" />
<MESSAGE value="Improved workspace" /> <MESSAGE value="Improved workspace" />
<MESSAGE value="Added spinner" /> <MESSAGE value="Added spinner" />
<option name="LAST_COMMIT_MESSAGE" value="Added spinner" /> <MESSAGE value="Improved spinner" />
<option name="LAST_COMMIT_MESSAGE" value="Improved spinner" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>

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

@ -1,5 +1,6 @@
import os import os
import shutil import shutil
import time
from string import Template as stringTemplate from string import Template as stringTemplate
from cpl.application.application_runtime_abc import ApplicationRuntimeABC from cpl.application.application_runtime_abc import ApplicationRuntimeABC
@ -59,6 +60,7 @@ class Publisher(PublisherABC):
exit() exit()
def _read_sources(self): def _read_sources(self):
time.sleep(2)
for file in self._project.included: for file in self._project.included:
rel_path = os.path.relpath(file) rel_path = os.path.relpath(file)
if os.path.isdir(rel_path): if os.path.isdir(rel_path):
@ -168,15 +170,14 @@ class Publisher(PublisherABC):
Console.error(__name__, f'Cannot copy file: {file} to {output_path} -> {e}') Console.error(__name__, f'Cannot copy file: {file} to {output_path} -> {e}')
def include(self, path: str): def include(self, path: str):
pass self._project.included.append(path)
def exclude(self, path: str): def exclude(self, path: str):
pass self._project.excluded.append(path)
def build(self): def build(self):
self._read_sources() Console.spinner('Reading source files:', self._read_sources)
Console.write_line('Creating internal packages:') Console.spinner('Creating internal packages:', self._create_packages)
self._create_packages()
Console.write_line('Building application:') Console.write_line('Building application:')
self._dist_files() self._dist_files()