From b591a77b2bcb4ed650e2f8e31edb03b074b2698e Mon Sep 17 00:00:00 2001
From: filesite <release@filesite.io>
Date: Tue, 21 May 2024 11:09:26 +0800
Subject: [PATCH] status counter improve

---
 heroUnion.mjs | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/heroUnion.mjs b/heroUnion.mjs
index 8833ed2..3a35873 100644
--- a/heroUnion.mjs
+++ b/heroUnion.mjs
@@ -353,16 +353,16 @@ class HeroUnion {
         if (taskIndex > -1) {
             this.tasks[taskIndex].notified = notified;
             this.tasks[taskIndex].notify_time ++;
-        }
 
-        //更新任务通知状态数据
-        if (notified) {
-            this.taskNotifyStatus.total ++;
-            this.taskNotifyStatus.done ++;
-        }else if (!notified && this.tasks[taskIndex].notify_time == this.notify_max_try) {
-            this.taskNotifyStatus.total ++;
-            this.taskNotifyStatus.failed ++;
-            common.error('[FAILED] Finally failed after %s try, notify to %s', this.notify_max_try, notify_url);
+            //更新任务通知状态数据
+            if (notified) {
+                this.taskNotifyStatus.done ++;
+                this.taskNotifyStatus.total = this.taskNotifyStatus.done + this.taskNotifyStatus.failed;
+            }else if (!notified && this.tasks[taskIndex].notify_time == this.notify_max_try) {
+                this.taskNotifyStatus.failed ++;
+                this.taskNotifyStatus.total = this.taskNotifyStatus.done + this.taskNotifyStatus.failed;
+                common.error('[FAILED] Finally failed after %s try, notify to %s', this.notify_max_try, notify_url);
+            }
         }
 
         return notified;
@@ -471,17 +471,17 @@ class HeroUnion {
                 ) {
                     if (_self.taskStatus[item.status] >= 1) {
                         _self.taskStatus[item.status] --;
-                    }
-                    if (_self.taskStatus.total >= 1) {
-                        _self.taskStatus.total --;
+
+                        if (_self.taskStatus.total >= 1) {
+                            _self.taskStatus.total --;
+                        }
                     }
 
                     let notify_status = item.notified ? 'done' : 'failed';
                     if (_self.taskNotifyStatus[notify_status] >= 1) {
                         _self.taskNotifyStatus[notify_status] --;
-                    }
-                    if (_self.taskNotifyStatus.total >= 1) {
-                        _self.taskNotifyStatus.total --;
+
+                        _self.taskNotifyStatus.total = _self.taskNotifyStatus.done + _self.taskNotifyStatus.failed;
                     }
 
                     common.log('Task %s is expired, which is created at %s', item.id, item.created);