From c1a5fff98cab4adf04210ba8120459b8e87a8fa3 Mon Sep 17 00:00:00 2001 From: saturneric Date: Sun, 15 Oct 2023 16:17:28 +0800 Subject: fix: solve some issues on linux .desktop file --- src/ui/thread/KeyServerSearchTask.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ui/thread/KeyServerSearchTask.cpp') diff --git a/src/ui/thread/KeyServerSearchTask.cpp b/src/ui/thread/KeyServerSearchTask.cpp index 863a4ca3..55c116a1 100644 --- a/src/ui/thread/KeyServerSearchTask.cpp +++ b/src/ui/thread/KeyServerSearchTask.cpp @@ -36,7 +36,7 @@ GpgFrontend::UI::KeyServerSearchTask::KeyServerSearchTask( manager_(new QNetworkAccessManager(this)) {} void GpgFrontend::UI::KeyServerSearchTask::run() { - SetFinishAfterRun(false); + HoldOnLifeCycle(true); QUrl url_from_remote = QString::fromStdString(keyserver_url_) + -- cgit v1.2.3 From 95997d27106daf91336847f50efaaa32279b7fc7 Mon Sep 17 00:00:00 2001 From: saturneric Date: Mon, 16 Oct 2023 17:54:05 +0800 Subject: fix: check and update copyright at files --- src/ui/thread/KeyServerSearchTask.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/ui/thread/KeyServerSearchTask.cpp') diff --git a/src/ui/thread/KeyServerSearchTask.cpp b/src/ui/thread/KeyServerSearchTask.cpp index 55c116a1..5da50c6e 100644 --- a/src/ui/thread/KeyServerSearchTask.cpp +++ b/src/ui/thread/KeyServerSearchTask.cpp @@ -1,5 +1,5 @@ /** - * Copyright (C) 2021 Saturneric + * Copyright (C) 2021 Saturneric * * This file is part of GpgFrontend. * @@ -19,8 +19,10 @@ * The initial version of the source code is inherited from * the gpg4usb project, which is under GPL-3.0-or-later. * - * The source code version of this software was modified and released - * by Saturneric starting on May 12, 2021. + * All the source code of GpgFrontend was modified and released by + * Saturneric starting on May 12, 2021. + * + * SPDX-License-Identifier: GPL-3.0-or-later * */ -- cgit v1.2.3 From 70196cf01757824a578e4d9c49a210bf136de266 Mon Sep 17 00:00:00 2001 From: saturneric Date: Wed, 18 Oct 2023 22:45:33 +0800 Subject: feat: using pool for concurrent executions, not stable yet --- src/ui/thread/KeyServerSearchTask.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/ui/thread/KeyServerSearchTask.cpp') diff --git a/src/ui/thread/KeyServerSearchTask.cpp b/src/ui/thread/KeyServerSearchTask.cpp index 5da50c6e..2aaa95f0 100644 --- a/src/ui/thread/KeyServerSearchTask.cpp +++ b/src/ui/thread/KeyServerSearchTask.cpp @@ -35,11 +35,11 @@ GpgFrontend::UI::KeyServerSearchTask::KeyServerSearchTask( : Task("key_server_search_task"), keyserver_url_(std::move(keyserver_url)), search_string_(std::move(search_string)), - manager_(new QNetworkAccessManager(this)) {} - -void GpgFrontend::UI::KeyServerSearchTask::run() { + manager_(new QNetworkAccessManager(this)) { HoldOnLifeCycle(true); +} +void GpgFrontend::UI::KeyServerSearchTask::run() { QUrl url_from_remote = QString::fromStdString(keyserver_url_) + "/pks/lookup?search=" + QString::fromStdString(search_string_) + @@ -58,5 +58,5 @@ void GpgFrontend::UI::KeyServerSearchTask::dealing_reply_from_server() { buffer = reply_->readAll(); } emit SignalKeyServerSearchResult(network_reply, buffer); - emit SignalTaskRunnableEnd(0); + emit SignalTaskShouldEnd(0); } -- cgit v1.2.3 From 0266ff1bbce2feccec34ab789f9e378948d1b24d Mon Sep 17 00:00:00 2001 From: saturneric Date: Thu, 11 Jan 2024 11:05:45 +0800 Subject: feat: improve api and ui of keys import and export --- src/ui/thread/KeyServerSearchTask.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ui/thread/KeyServerSearchTask.cpp') diff --git a/src/ui/thread/KeyServerSearchTask.cpp b/src/ui/thread/KeyServerSearchTask.cpp index 2aaa95f0..dfaa6474 100644 --- a/src/ui/thread/KeyServerSearchTask.cpp +++ b/src/ui/thread/KeyServerSearchTask.cpp @@ -39,7 +39,7 @@ GpgFrontend::UI::KeyServerSearchTask::KeyServerSearchTask( HoldOnLifeCycle(true); } -void GpgFrontend::UI::KeyServerSearchTask::run() { +void GpgFrontend::UI::KeyServerSearchTask::Run() { QUrl url_from_remote = QString::fromStdString(keyserver_url_) + "/pks/lookup?search=" + QString::fromStdString(search_string_) + -- cgit v1.2.3 From bf538056b24a68b8fd235b1c50991ee8eb46a776 Mon Sep 17 00:00:00 2001 From: saturneric Date: Fri, 12 Jan 2024 14:02:37 +0800 Subject: refactor: use QString instead of std::string and improve threading system --- src/ui/thread/KeyServerSearchTask.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/ui/thread/KeyServerSearchTask.cpp') diff --git a/src/ui/thread/KeyServerSearchTask.cpp b/src/ui/thread/KeyServerSearchTask.cpp index dfaa6474..b0e253f0 100644 --- a/src/ui/thread/KeyServerSearchTask.cpp +++ b/src/ui/thread/KeyServerSearchTask.cpp @@ -30,8 +30,8 @@ #include -GpgFrontend::UI::KeyServerSearchTask::KeyServerSearchTask( - std::string keyserver_url, std::string search_string) +GpgFrontend::UI::KeyServerSearchTask::KeyServerSearchTask(QString keyserver_url, + QString search_string) : Task("key_server_search_task"), keyserver_url_(std::move(keyserver_url)), search_string_(std::move(search_string)), @@ -40,10 +40,9 @@ GpgFrontend::UI::KeyServerSearchTask::KeyServerSearchTask( } void GpgFrontend::UI::KeyServerSearchTask::Run() { - QUrl url_from_remote = - QString::fromStdString(keyserver_url_) + - "/pks/lookup?search=" + QString::fromStdString(search_string_) + - "&op=index&options=mr"; + QUrl url_from_remote = keyserver_url_ + + "/pks/lookup?search=" + search_string_ + + "&op=index&options=mr"; reply_ = manager_->get(QNetworkRequest(url_from_remote)); -- cgit v1.2.3 From 4994f4eaa1211d402b791660ad6221154a4c2405 Mon Sep 17 00:00:00 2001 From: saturneric Date: Tue, 16 Jan 2024 11:49:50 +0800 Subject: fix: make task and threading system safer --- src/ui/thread/KeyServerSearchTask.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/ui/thread/KeyServerSearchTask.cpp') diff --git a/src/ui/thread/KeyServerSearchTask.cpp b/src/ui/thread/KeyServerSearchTask.cpp index b0e253f0..2f05b774 100644 --- a/src/ui/thread/KeyServerSearchTask.cpp +++ b/src/ui/thread/KeyServerSearchTask.cpp @@ -28,8 +28,6 @@ #include "ui/thread/KeyServerSearchTask.h" -#include - GpgFrontend::UI::KeyServerSearchTask::KeyServerSearchTask(QString keyserver_url, QString search_string) : Task("key_server_search_task"), @@ -39,15 +37,16 @@ GpgFrontend::UI::KeyServerSearchTask::KeyServerSearchTask(QString keyserver_url, HoldOnLifeCycle(true); } -void GpgFrontend::UI::KeyServerSearchTask::Run() { +auto GpgFrontend::UI::KeyServerSearchTask::Run() -> int { QUrl url_from_remote = keyserver_url_ + "/pks/lookup?search=" + search_string_ + "&op=index&options=mr"; reply_ = manager_->get(QNetworkRequest(url_from_remote)); - connect(reply_, &QNetworkReply::finished, this, &KeyServerSearchTask::dealing_reply_from_server); + + return 0; } void GpgFrontend::UI::KeyServerSearchTask::dealing_reply_from_server() { -- cgit v1.2.3