update

ZFFramework · Jun 21, 2024 · 091db8f · 091db8f
1 parent d5ca635
commit 091db8f
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 0 deletions.
diff --git a/ZF/ZFUtility/zfsrc/ZFUtility/ZFTask.cpp b/ZF/ZFUtility/zfsrc/ZFUtility/ZFTask.cpp
@@ -79,6 +79,31 @@ ZFOBJECT_ON_INIT_DEFINE_2(ZFTask
     this->implStop(implStop);
 }
 
+void ZFTask::objectInfoT(ZF_IN_OUT zfstring &ret) {
+    ret += ZFTOKEN_ZFObjectInfoLeft;
+    if(this->started()) {
+        zfstringAppend(ret, "%s running"
+                , this->classData()->className()
+                );
+    }
+    else {
+        zfstringAppend(ret, "%s %s"
+                , this->classData()->className()
+                , this->resultType()
+                );
+        if(!this->errorHint().isEmpty()) {
+            ret += ":\"";
+            ret += this->errorHint();
+            ret += "\"";
+        }
+        if(this->result() != zfnull) {
+            ret += ", result: ";
+            this->result()->objectInfoT(ret);
+        }
+    }
+    ret += ZFTOKEN_ZFObjectInfoRight;
+}
+
 // ============================================================
 ZFOBJECT_REGISTER(ZFTaskGroup)
 
@@ -148,6 +173,29 @@ void ZFTaskGroup::taskOnStop(void) {
     zfsuper::taskOnStop();
 }
 
+void ZFTaskGroup::objectInfoT(ZF_IN_OUT zfstring &ret) {
+    ret += ZFTOKEN_ZFObjectInfoLeft;
+    if(this->started()) {
+        zfstringAppend(ret, "%s running"
+                , this->classData()->className()
+                );
+    }
+    else {
+        zfstringAppend(ret, "%s %s"
+                , this->classData()->className()
+                , this->resultType()
+                );
+        if(!this->errorHint().isEmpty()) {
+            ret += ":\"";
+            ret += this->errorHint();
+            ret += "\"";
+        }
+        ret += " ";
+        this->childArray()->objectInfoOfContentT(ret);
+    }
+    ret += ZFTOKEN_ZFObjectInfoRight;
+}
+
 // ============================================================
 ZFOBJECT_REGISTER(ZFTaskQueue)
 
@@ -225,4 +273,27 @@ void ZFTaskQueue::taskOnStop(void) {
     zfsuper::taskOnStop();
 }
 
+void ZFTaskQueue::objectInfoT(ZF_IN_OUT zfstring &ret) {
+    ret += ZFTOKEN_ZFObjectInfoLeft;
+    if(this->started()) {
+        zfstringAppend(ret, "%s running"
+                , this->classData()->className()
+                );
+    }
+    else {
+        zfstringAppend(ret, "%s %s"
+                , this->classData()->className()
+                , this->resultType()
+                );
+        if(!this->errorHint().isEmpty()) {
+            ret += ":\"";
+            ret += this->errorHint();
+            ret += "\"";
+        }
+        ret += " ";
+        this->childArray()->objectInfoOfContentT(ret);
+    }
+    ret += ZFTOKEN_ZFObjectInfoRight;
+}
+
 ZF_NAMESPACE_GLOBAL_END
diff --git a/ZF/ZFUtility/zfsrc/ZFUtility/ZFTask.h b/ZF/ZFUtility/zfsrc/ZFUtility/ZFTask.h
@@ -116,6 +116,8 @@ zfclass ZFLIB_ZFUtility ZFTask : zfextend ZFObject {
         this->stop();
         zfsuper::objectOnDeallocPrepare();
     }
+    zfoverride
+    virtual void objectInfoT(ZF_IN_OUT zfstring &ret);
 
 private:
     zfbool _ZFP_started;
@@ -166,6 +168,8 @@ zfclass ZFLIB_ZFUtility ZFTaskGroup : zfextend ZFTask {
     virtual void taskOnStart(void);
     zfoverride
     virtual void taskOnStop(void);
+    zfoverride
+    virtual void objectInfoT(ZF_IN_OUT zfstring &ret);
 };
 
 /**
@@ -204,6 +208,8 @@ zfclass ZFLIB_ZFUtility ZFTaskQueue : zfextend ZFTask {
     virtual void taskOnStart(void);
     zfoverride
     virtual void taskOnStop(void);
+    zfoverride
+    virtual void objectInfoT(ZF_IN_OUT zfstring &ret);
 };
 
 ZF_NAMESPACE_GLOBAL_END