Merge pull request #148 from saturneric/develop

Develop 2.1.3.1

1 files changed, 42 insertions, 33 deletions

diff --git a/src/module/integrated/version_checking_module/VersionCheckTask.cpp b/src/module/mods/ver_check/VersionCheckTask.cpp
index 83844af8..5ea9c48e 100644
--- a/src/module/integrated/version_checking_module/VersionCheckTask.cpp
+++ b/src/module/mods/ver_check/VersionCheckTask.cpp
@@ -28,30 +28,30 @@
 
 #include "VersionCheckTask.h"
 
+#include <GFSDKBasic.h>
+#include <GFSDKExtra.h>
+#include <GFSDKLog.h>
+
 #include <QMetaType>
 #include <QtNetwork>
 
-#include "GpgFrontendBuildInfo.h"
-
-namespace GpgFrontend::Module::Integrated::VersionCheckingModule {
-
 VersionCheckTask::VersionCheckTask()
-    : Task("version_check_task"),
-      network_manager_(new QNetworkAccessManager(this)),
-      current_version_(QString("v") + VERSION_MAJOR + "." + VERSION_MINOR +
-                       "." + VERSION_PATCH) {
-  HoldOnLifeCycle(true);
+    : network_manager_(new QNetworkAccessManager(this)),
+      current_version_(GFProjectVersion()) {
   qRegisterMetaType<SoftwareVersion>("SoftwareVersion");
   version_.current_version = current_version_;
 }
 
 auto VersionCheckTask::Run() -> int {
-  MODULE_LOG_DEBUG("current project version: {}", current_version_);
+  GFModuleLogDebug(
+      fmt::format("current project version: {}", current_version_).c_str());
   QString latest_version_url =
       "https://api.github.com/repos/saturneric/gpgfrontend/releases/latest";
 
-  QNetworkRequest latest_request;
-  latest_request.setUrl(QUrl(latest_version_url));
+  QNetworkRequest latest_request(latest_version_url);
+  latest_request.setHeader(QNetworkRequest::UserAgentHeader,
+                           GFHttpRequestUserAgent());
+
   latest_reply_ = network_manager_->get(latest_request);
   connect(latest_reply_, &QNetworkReply::finished, this,
           &VersionCheckTask::slot_parse_latest_version_info);
@@ -63,8 +63,9 @@ void VersionCheckTask::slot_parse_latest_version_info() {
     version_.latest_version = current_version_;
     version_.loading_done = false;
   } else if (latest_reply_->error() != QNetworkReply::NoError) {
-    MODULE_LOG_ERROR("latest version request error: ",
-                     latest_reply_->errorString());
+    GFModuleLogError(fmt::format("latest version request error: ",
+                                 latest_reply_->errorString())
+                         .c_str());
     version_.latest_version = current_version_;
   } else {
     latest_reply_bytes_ = latest_reply_->readAll();
@@ -77,11 +78,15 @@ void VersionCheckTask::slot_parse_latest_version_info() {
       auto version_match = re.match(latest_version);
       if (version_match.hasMatch()) {
         latest_version = version_match.captured(0);
-        MODULE_LOG_INFO("latest version from github: {}", latest_version);
+        GFModuleLogInfo(fmt::format("latest released version from github: {}",
+                                    latest_version)
+                            .c_str());
       } else {
         latest_version = current_version_;
-        MODULE_LOG_WARN("latest version unknown, set to current version: {}",
-                        current_version_);
+        GFModuleLogWarn(
+            fmt::format("latest version unknown, set to current version: {}",
+                        current_version_)
+                .c_str());
       }
 
       bool prerelease = latest_reply_json["prerelease"].toBool();
@@ -94,8 +99,9 @@ void VersionCheckTask::slot_parse_latest_version_info() {
       version_.publish_date = publish_date;
       version_.release_note = release_note;
     } else {
-      MODULE_LOG_WARN("cannot parse data got from github: {}",
-                      latest_reply_bytes_);
+      GFModuleLogWarn(fmt::format("cannot parse data got from github: {}",
+                                  latest_reply_bytes_)
+                          .c_str());
     }
   }
 
@@ -107,17 +113,20 @@ void VersionCheckTask::slot_parse_latest_version_info() {
     QString current_version_url =
         "https://api.github.com/repos/saturneric/gpgfrontend/releases/tags/" +
         current_version_;
-    MODULE_LOG_DEBUG("current version info query url: {}", current_version_url);
+    GFModuleLogDebug(
+        fmt::format("current version info query url: {}", current_version_url)
+            .c_str());
+
+    QNetworkRequest current_request(current_version_url);
+    current_request.setHeader(QNetworkRequest::UserAgentHeader,
+                              GFHttpRequestUserAgent());
 
-    QNetworkRequest current_request;
-    current_request.setUrl(QUrl(current_version_url));
     current_reply_ = network_manager_->get(current_request);
 
     connect(current_reply_, &QNetworkReply::finished, this,
             &VersionCheckTask::slot_parse_current_version_info);
   } catch (...) {
-    MODULE_LOG_ERROR("current version request create error");
-    emit SignalTaskShouldEnd(-1);
+    GFModuleLogError("current version request create error");
   }
 }
 
@@ -127,8 +136,9 @@ void VersionCheckTask::slot_parse_current_version_info() {
     version_.loading_done = false;
 
   } else if (current_reply_->error() != QNetworkReply::NoError) {
-    MODULE_LOG_ERROR("current version request network error: {}",
-                     current_reply_->errorString());
+    GFModuleLogError(fmt::format("current version request network error: {}",
+                                 current_reply_->errorString())
+                         .c_str());
 
     // loading done
     version_.loading_done = true;
@@ -146,17 +156,16 @@ void VersionCheckTask::slot_parse_current_version_info() {
       // loading done
       version_.loading_done = true;
     } else {
-      MODULE_LOG_WARN("cannot parse data got from github: {}",
-                      current_reply_bytes_);
+      GFModuleLogWarn(fmt::format("cannot parse data got from github: {}",
+                                  current_reply_bytes_)
+                          .c_str());
     }
   }
 
-  MODULE_LOG_DEBUG("current version parse done: {}",
-                   version_.current_version_publish_in_remote);
+  GFModuleLogDebug(fmt::format("current version parse done: {}",
+                               version_.current_version_publish_in_remote)
+                       .c_str());
 
   if (current_reply_ != nullptr) current_reply_->deleteLater();
   emit SignalUpgradeVersion(version_);
-  emit SignalTaskShouldEnd(0);
 }
-
-}  // namespace GpgFrontend::Module::Integrated::VersionCheckingModule