From 26e3c103ce982a993f57def4dd638f3ae46c4bae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=B7=E4=BA=8C=E7=8C=9B?= <live1989@foxmail.com>
Date: Sun, 22 Dec 2019 12:40:05 +0800
Subject: [PATCH] A web update

---
 spug_api/apps/deploy/utils.py         | 21 +++++++++++++++++++--
 spug_web/src/pages/deploy/do/index.js |  3 ++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/spug_api/apps/deploy/utils.py b/spug_api/apps/deploy/utils.py
index 01b100a..31b1226 100644
--- a/spug_api/apps/deploy/utils.py
+++ b/spug_api/apps/deploy/utils.py
@@ -59,8 +59,16 @@ def _ext1_deploy(request, req, helper, env):
         helper.send_step('local', 4, f'{human_time()} 检出后任务...\r\n')
         helper.local(f'cd {os.path.join(REPOS_DIR, env.VERSION)} && {extend.hook_post_server}', env)
 
-    helper.send_step('local', 5, f'\r\n{human_time()} ** 执行完毕 **')
-    helper.local(f'cd {REPOS_DIR} && tar zcf {env.VERSION}.tar.gz {env.VERSION}')
+    helper.send_step('local', 5, f'\r\n{human_time()} 执行打包...        ')
+    filter_rule, exclude, contain = json.loads(extend.filter_rule), '', env.VERSION
+    files = helper.parse_filter_rule(filter_rule['data'])
+    if files:
+        if filter_rule['type'] == 'exclude':
+            exclude = ' '.join(f'--exclude={x}' for x in files)
+        else:
+            contain = ' '.join(f'{env.VERSION}/{x}' for x in files)
+    helper.local(f'cd {REPOS_DIR} && tar zcf {env.VERSION}.tar.gz {exclude} {contain}')
+    helper.send_step('local', 6, f'完成')
     for h_id in json.loads(req.host_ids):
         Thread(target=_deploy_host, args=(helper, h_id, extend, env)).start()
 
@@ -116,6 +124,15 @@ class Helper:
         self.rds = rds
         self.token = token
 
+    def parse_filter_rule(self, data: str):
+        data, files = data.strip(), []
+        if data:
+            for line in data.split('\n'):
+                line = line.strip()
+                if line and not line.startswith('#'):
+                    files.append(line)
+        return files
+
     def send_info(self, key, message):
         self.rds.rpush(self.token, json.dumps({'key': key, 'status': 'info', 'data': message}))
 
diff --git a/spug_web/src/pages/deploy/do/index.js b/spug_web/src/pages/deploy/do/index.js
index 49cc89b..7eab23c 100644
--- a/spug_web/src/pages/deploy/do/index.js
+++ b/spug_web/src/pages/deploy/do/index.js
@@ -72,7 +72,7 @@ class Index extends React.Component {
 
   getStatusAlias = () => {
     if (store.targets.length !== 0) {
-      for (let item of store.targets) {
+      for (let item of [{id: 'local'}, ...store.targets]) {
         if (lds.get(store.outputs, `${item.id}.status`) === 'error') {
           return <Tag color="orange">发布异常</Tag>
         } else if (lds.get(store.outputs, `${item.id}.step`, -1) < 5) {
@@ -105,6 +105,7 @@ class Index extends React.Component {
               <Steps.Step {...this.getStatus('local', 2)} title="检出前任务"/>
               <Steps.Step {...this.getStatus('local', 3)} title="执行检出"/>
               <Steps.Step {...this.getStatus('local', 4)} title="检出后任务"/>
+              <Steps.Step {...this.getStatus('local', 5)} title="执行打包"/>
             </Steps>}>
             <pre className={styles.console}>{lds.get(store.outputs, 'local.data')}</pre>
           </Collapse.Panel>