feat: simplify logging

1 files changed, 67 insertions, 68 deletions

diff --git a/src/core/function/gpg/GpgKeyManager.cpp b/src/core/function/gpg/GpgKeyManager.cpp
index 66e28c4e..fda3173a 100644
--- a/src/core/function/gpg/GpgKeyManager.cpp
+++ b/src/core/function/gpg/GpgKeyManager.cpp
@@ -94,83 +94,82 @@ auto GpgFrontend::GpgKeyManager::SetExpire(
 auto GpgFrontend::GpgKeyManager::SetOwnerTrustLevel(const GpgKey& key,
                                                     int trust_level) -> bool {
   if (trust_level < 0 || trust_level > 5) {
-    qCWarning(core, "illegal owner trust level: %d", trust_level);
+    FLOG_W("illegal owner trust level: %d", trust_level);
   }
 
-  AutomatonNextStateHandler next_state_handler =
-      [](AutomatonState state, QString status, QString args) {
-        qCDebug(core) << "next_state_handler state: "
-                      << static_cast<unsigned int>(state)
-                      << ", gpg_status: " << status << ", args: " << args;
+  AutomatonNextStateHandler next_state_handler = [](AutomatonState state,
+                                                    QString status,
+                                                    QString args) {
+    LOG_D() << "next_state_handler state: " << static_cast<unsigned int>(state)
+            << ", gpg_status: " << status << ", args: " << args;
 
-        auto tokens = args.split(' ');
+    auto tokens = args.split(' ');
 
-        switch (state) {
-          case AS_START:
-            if (status == "GET_LINE" && args == "keyedit.prompt") {
-              return AS_COMMAND;
-            }
-            return AS_ERROR;
-          case AS_COMMAND:
-            if (status == "GET_LINE" && args == "edit_ownertrust.value") {
-              return AS_VALUE;
-            }
-            return AS_ERROR;
-          case AS_VALUE:
-            if (status == "GET_LINE" && args == "keyedit.prompt") {
-              return AS_QUIT;
-            } else if (status == "GET_BOOL" &&
-                       args == "edit_ownertrust.set_ultimate.okay") {
-              return AS_REALLY_ULTIMATE;
-            }
-            return AS_ERROR;
-          case AS_REALLY_ULTIMATE:
-            if (status == "GET_LINE" && args == "keyedit.prompt") {
-              return AS_QUIT;
-            }
-            return AS_ERROR;
-          case AS_QUIT:
-            if (status == "GET_LINE" && args == "keyedit.save.okay") {
-              return AS_SAVE;
-            }
-            return AS_ERROR;
-          case AS_ERROR:
-            if (status == "GET_LINE" && args == "keyedit.prompt") {
-              return AS_QUIT;
-            }
-            return AS_ERROR;
-          default:
-            return AS_ERROR;
-        };
-      };
-
-  AutomatonActionHandler action_handler = [trust_level](
-                                              AutomatonHandelStruct& handler,
-                                              AutomatonState state) {
-    qCDebug(core, "action_handler state: %d", static_cast<unsigned int>(state));
     switch (state) {
+      case AS_START:
+        if (status == "GET_LINE" && args == "keyedit.prompt") {
+          return AS_COMMAND;
+        }
+        return AS_ERROR;
       case AS_COMMAND:
-        return QString("trust");
+        if (status == "GET_LINE" && args == "edit_ownertrust.value") {
+          return AS_VALUE;
+        }
+        return AS_ERROR;
       case AS_VALUE:
-        handler.SetSuccess(true);
-        return QString::number(trust_level);
+        if (status == "GET_LINE" && args == "keyedit.prompt") {
+          return AS_QUIT;
+        } else if (status == "GET_BOOL" &&
+                   args == "edit_ownertrust.set_ultimate.okay") {
+          return AS_REALLY_ULTIMATE;
+        }
+        return AS_ERROR;
       case AS_REALLY_ULTIMATE:
-        handler.SetSuccess(true);
-        return QString("Y");
+        if (status == "GET_LINE" && args == "keyedit.prompt") {
+          return AS_QUIT;
+        }
+        return AS_ERROR;
       case AS_QUIT:
-        return QString("quit");
-      case AS_SAVE:
-        handler.SetSuccess(true);
-        return QString("Y");
-      case AS_START:
+        if (status == "GET_LINE" && args == "keyedit.save.okay") {
+          return AS_SAVE;
+        }
+        return AS_ERROR;
       case AS_ERROR:
-        return QString("");
+        if (status == "GET_LINE" && args == "keyedit.prompt") {
+          return AS_QUIT;
+        }
+        return AS_ERROR;
       default:
-        return QString("");
-    }
-    return QString("");
+        return AS_ERROR;
+    };
   };
 
+  AutomatonActionHandler action_handler =
+      [trust_level](AutomatonHandelStruct& handler, AutomatonState state) {
+        FLOG_D("action_handler state: %d", static_cast<unsigned int>(state));
+        switch (state) {
+          case AS_COMMAND:
+            return QString("trust");
+          case AS_VALUE:
+            handler.SetSuccess(true);
+            return QString::number(trust_level);
+          case AS_REALLY_ULTIMATE:
+            handler.SetSuccess(true);
+            return QString("Y");
+          case AS_QUIT:
+            return QString("quit");
+          case AS_SAVE:
+            handler.SetSuccess(true);
+            return QString("Y");
+          case AS_START:
+          case AS_ERROR:
+            return QString("");
+          default:
+            return QString("");
+        }
+        return QString("");
+      };
+
   auto key_fpr = key.GetFingerprint();
   AutomatonHandelStruct handel_struct(key_fpr);
   handel_struct.SetHandler(next_state_handler, action_handler);
@@ -196,8 +195,8 @@ auto GpgFrontend::GpgKeyManager::interactor_cb_fnc(void* handle,
     auto tokens = QString(args).split(' ');
 
     if (tokens.empty() || tokens[0] != handle_struct->KeyFpr()) {
-      qCWarning(core) << "handle struct key fpr " << handle_struct->KeyFpr()
-                      << "mismatch token: " << tokens[0] << ", exit...";
+      LOG_W() << "handle struct key fpr " << handle_struct->KeyFpr()
+              << "mismatch token: " << tokens[0] << ", exit...";
 
       return -1;
     }
@@ -206,13 +205,13 @@ auto GpgFrontend::GpgKeyManager::interactor_cb_fnc(void* handle,
   }
 
   if (status_s == "GOT_IT" || status_s.isEmpty()) {
-    qCDebug(core, "status GOT_IT, continue...");
+    FLOG_D("status GOT_IT, continue...");
     return 0;
   }
 
   AutomatonState next_state = handle_struct->NextState(status_s, args_s);
   if (next_state == AS_ERROR) {
-    qCDebug(core, "handle struct next state caught error, skipping...");
+    FLOG_D("handle struct next state caught error, skipping...");
     return GPG_ERR_FALSE;
   }