From 9a0d36ca860dc96247580dce12cd9b3492131d1e Mon Sep 17 00:00:00 2001
From: Sven Heidemann <sven.heidemann@sh-edraft.de>
Date: Fri, 5 Mar 2021 16:31:27 +0100
Subject: [PATCH] Improved publisher

---
 .idea/workspace.xml              | 24 +++++++++++-------------
 src/cpl_cli/publish/publisher.py | 11 ++++++-----
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a2684fb2..bd98c606 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -22,10 +22,8 @@
     <select />
   </component>
   <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$/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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -487,13 +485,6 @@
       <option name="presentableId" value="Default" />
       <updated>1605881914521</updated>
     </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">
       <created>1608125743068</created>
       <option name="number" value="00048" />
@@ -830,7 +821,14 @@
       <option name="project" value="LOCAL" />
       <updated>1614956114719</updated>
     </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 />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -846,7 +844,6 @@
     <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Added pycharm files to gitignore" />
     <MESSAGE value="Added more development tests" />
     <MESSAGE value="Added new tester and CredentialManager TestCase" />
     <MESSAGE value="Bugfix" />
@@ -871,7 +868,8 @@
     <MESSAGE value="Readded workspace.xml" />
     <MESSAGE value="Improved workspace" />
     <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 name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/src/cpl_cli/publish/publisher.py b/src/cpl_cli/publish/publisher.py
index 08f18e7d..4cae7ed2 100644
--- a/src/cpl_cli/publish/publisher.py
+++ b/src/cpl_cli/publish/publisher.py
@@ -1,5 +1,6 @@
 import os
 import shutil
+import time
 from string import Template as stringTemplate
 
 from cpl.application.application_runtime_abc import ApplicationRuntimeABC
@@ -59,6 +60,7 @@ class Publisher(PublisherABC):
                 exit()
 
     def _read_sources(self):
+        time.sleep(2)
         for file in self._project.included:
             rel_path = os.path.relpath(file)
             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}')
 
     def include(self, path: str):
-        pass
+        self._project.included.append(path)
 
     def exclude(self, path: str):
-        pass
+        self._project.excluded.append(path)
 
     def build(self):
-        self._read_sources()
-        Console.write_line('Creating internal packages:')
-        self._create_packages()
+        Console.spinner('Reading source files:', self._read_sources)
+        Console.spinner('Creating internal packages:', self._create_packages)
         Console.write_line('Building application:')
         self._dist_files()