GpgFrontend/Modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: GpgFrontend:fcc31759f8c09e24f001c17549e95d65fc1a484c
Branches Tags
GpgFrontend:main
..
compare: GpgFrontend:5f436558c23ade79b72516c882f345946e2586f9
Branches Tags
GpgFrontend:main

No commits in common. "fcc31759f8c09e24f001c17549e95d65fc1a484c" and "5f436558c23ade79b72516c882f345946e2586f9" have entirely different histories.
fcc31759f8 ... 5f436558c2

11 changed files with 157 additions and 277 deletions
Show Stats Expand all files Collapse all files

2
src/m_email/CMakeLists.txt
View File

@ -23,7 +23,7 @@
# #
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
# com.bktus.gpgfrontend.module.integrated.email # com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering
set(INTEGRATED_MODULE_SOURCE "") set(INTEGRATED_MODULE_SOURCE "")
aux_source_directory(. INTEGRATED_MODULE_SOURCE) aux_source_directory(. INTEGRATED_MODULE_SOURCE)

106
src/m_gpg_info/GnuPGInfo.ui
View File

@ -14,18 +14,6 @@
<string>GnuPG Info</string> <string>GnuPG Info</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0"> <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0">
<property name="spacing"> <property name="spacing">
@ -55,10 +43,10 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap>:/icons/gnupg.png</pixmap> <pixmap resource="../gpgfrontend.qrc">:/icons/gnupg.png</pixmap>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignmentFlag::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
<property name="margin"> <property name="margin">
<number>10</number> <number>10</number>
@ -71,7 +59,7 @@
<string>Version</string> <string>Version</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignmentFlag::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
<property name="margin"> <property name="margin">
<number>5</number> <number>5</number>
@ -87,60 +75,49 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Orientation::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="tabPosition">
<enum>QTabWidget::TabPosition::South</enum>
</property>
<property name="tabShape"> <property name="tabShape">
<enum>QTabWidget::TabShape::Triangular</enum> <enum>QTabWidget::Rounded</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>0</number>
</property> </property>
<property name="elideMode">
<enum>Qt::TextElideMode::ElideMiddle</enum>
</property>
<property name="documentMode">
<bool>true</bool>
</property>
<property name="tabsClosable">
<bool>false</bool>
</property>
<property name="tabBarAutoHide"> <property name="tabBarAutoHide">
<bool>true</bool> <bool>false</bool>
</property> </property>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="title"> <attribute name="title">
<string>Components</string> <string>Components</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTableWidget" name="componentDetailsTable"> <widget class="QTableWidget" name="componentDetailsTable">
<property name="sizeAdjustPolicy"> <property name="sizeAdjustPolicy">
<enum>QAbstractScrollArea::SizeAdjustPolicy::AdjustIgnored</enum> <enum>QAbstractScrollArea::AdjustToContents</enum>
</property> </property>
<property name="autoScrollMargin"> <property name="autoScrollMargin">
<number>16</number> <number>16</number>
</property> </property>
<property name="editTriggers"> <property name="editTriggers">
<set>QAbstractItemView::EditTrigger::NoEditTriggers</set> <set>QAbstractItemView::NoEditTriggers</set>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QProgressBar" name="loadProgressBar">
<property name="maximum">
<number>0</number>
</property>
<property name="value">
<number>-1</number>
</property>
<property name="textVisible">
<bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
@ -151,25 +128,13 @@
<string>Directories</string> <string>Directories</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTableWidget" name="directoriesDetailsTable"> <widget class="QTableWidget" name="directoriesDetailsTable">
<property name="sizeAdjustPolicy"> <property name="sizeAdjustPolicy">
<enum>QAbstractScrollArea::SizeAdjustPolicy::AdjustIgnored</enum> <enum>QAbstractScrollArea::AdjustToContents</enum>
</property> </property>
<property name="editTriggers"> <property name="editTriggers">
<set>QAbstractItemView::EditTrigger::NoEditTriggers</set> <set>QAbstractItemView::NoEditTriggers</set>
</property> </property>
</widget> </widget>
</item> </item>
@ -180,18 +145,6 @@
<string>Options</string> <string>Options</string>
</attribute> </attribute>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QTableWidget" name="optionDetailsTable"/> <widget class="QTableWidget" name="optionDetailsTable"/>
</item> </item>
@ -201,19 +154,6 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0">
<widget class="QProgressBar" name="loadProgressBar">
<property name="maximum">
<number>0</number>
</property>
<property name="value">
<number>-1</number>
</property>
<property name="textVisible">
<bool>false</bool>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<resources> <resources>

2
src/m_gpg_info/GnuPGInfoGatheringModule.cpp
View File

@ -47,7 +47,7 @@
#include "GpgInfo.h" #include "GpgInfo.h"
GF_MODULE_API_DEFINE("com.bktus.gpgfrontend.module.gnupg_info_gathering", GF_MODULE_API_DEFINE("com.bktus.gpgfrontend.module.gnupg_info_gathering",
"GatherGnupgInfo", "1.1.0", "GatherGnupgInfo", "1.0.1",
"Try gathering gnupg information.", "Saturneric") "Try gathering gnupg information.", "Saturneric")
DEFINE_TRANSLATIONS_STRUCTURE(ModuleGnuPGInfoGathering); DEFINE_TRANSLATIONS_STRUCTURE(ModuleGnuPGInfoGathering);

16
src/m_gpg_info/GnupgTab.cpp
View File

@ -108,14 +108,14 @@ GnupgTab::GnupgTab(QWidget* parent)
ui_->optionDetailsTable->setFocusPolicy(Qt::NoFocus); ui_->optionDetailsTable->setFocusPolicy(Qt::NoFocus);
ui_->optionDetailsTable->setAlternatingRowColors(true); ui_->optionDetailsTable->setAlternatingRowColors(true);
if (GFModuleRetrieveRTValueOrDefaultBool( auto future = (QThreadPool::globalInstance(), [=]() {
DUP("ui"), DUP("env.state.gnupg_info_gathering"), 0) == 1) { if (GFModuleRetrieveRTValueOrDefaultBool(
process_software_info(); DUP("ui"), DUP("env.state.gnupg_info_gathering"), 0) == 1) {
process_software_info();
} else { } else {
auto future = QtConcurrent::run(QThreadPool::globalInstance(), gather_gnupg_info();
[=]() { gather_gnupg_info(); }); }
} });
} }
void GnupgTab::process_software_info() { void GnupgTab::process_software_info() {

2
src/m_paper_key/CMakeLists.txt
View File

@ -23,7 +23,7 @@
# #
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
# com.bktus.gpgfrontend.module.integrated.paper_key # com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering
set(INTEGRATED_MODULE_SOURCE "") set(INTEGRATED_MODULE_SOURCE "")
aux_source_directory(. INTEGRATED_MODULE_SOURCE) aux_source_directory(. INTEGRATED_MODULE_SOURCE)

19
src/m_ver_check/SoftwareVersion.cpp
View File

@ -44,24 +44,21 @@ auto SoftwareVersion::NeedUpgrade() const -> bool {
GFModuleStrDup(current_version.toUtf8()), GFModuleStrDup(current_version.toUtf8()),
GFModuleStrDup(latest_version.toUtf8())))); GFModuleStrDup(latest_version.toUtf8()))));
FLOG_DEBUG("load done: %1, pre-release: %2, draft: %3", latest_version, MLogDebug(QString("load done: %1, pre-release: %2, draft: %3")
latest_prerelease_version_from_remote, latest_draft_from_remote); .arg(static_cast<int>(loading_done))
return !latest_version.isEmpty() && !latest_prerelease_version_from_remote && .arg(static_cast<int>(latest_prerelease_version_from_remote))
.arg(static_cast<int>(latest_draft_from_remote)));
return loading_done && !latest_prerelease_version_from_remote &&
!latest_draft_from_remote && !latest_draft_from_remote &&
GFCompareSoftwareVersion(GFModuleStrDup(current_version.toUtf8()), GFCompareSoftwareVersion(GFModuleStrDup(current_version.toUtf8()),
GFModuleStrDup(latest_version.toUtf8())) < 0; GFModuleStrDup(latest_version.toUtf8())) < 0;
} }
auto SoftwareVersion::VersionWithdrawn() const -> bool { auto SoftwareVersion::VersionWithdrawn() const -> bool {
return !latest_version.isEmpty() && !current_version_publish_in_remote && return loading_done && !current_version_publish_in_remote &&
current_version_is_a_prerelease && !current_version_is_drafted; current_version_is_a_prerelease && !current_version_is_drafted;
} }
auto SoftwareVersion::CurrentVersionReleased() const -> bool { auto SoftwareVersion::CurrentVersionReleased() const -> bool {
return !latest_version.isEmpty() && current_version_publish_in_remote; return loading_done && current_version_publish_in_remote;
} }
auto SoftwareVersion::GitCommitHashMismatch() const -> bool {
if (remote_commit_hash_by_tag.isEmpty()) return false;
return remote_commit_hash_by_tag.trimmed() != local_commit_hash.trimmed();
}

15
src/m_ver_check/SoftwareVersion.h
View File

@ -41,11 +41,10 @@ struct SoftwareVersion {
bool latest_draft_from_remote = false; ///< bool latest_draft_from_remote = false; ///<
bool current_version_is_a_prerelease = false; ///< bool current_version_is_a_prerelease = false; ///<
bool current_version_is_drafted = false; ///< bool current_version_is_drafted = false; ///<
bool loading_done = false; ///<
bool current_version_publish_in_remote = false; ///< bool current_version_publish_in_remote = false; ///<
QString publish_date; ///< QString publish_date; ///<
QString release_note; ///< QString release_note; ///<
QString remote_commit_hash_by_tag;
QString local_commit_hash;
/** /**
* @brief * @brief
@ -53,9 +52,7 @@ struct SoftwareVersion {
* @return true * @return true
* @return false * @return false
*/ */
[[nodiscard]] auto IsInfoValid() const -> bool { [[nodiscard]] auto InfoValid() const -> bool { return loading_done; }
return !latest_version.isEmpty();
}
/** /**
* @brief * @brief
@ -73,14 +70,6 @@ struct SoftwareVersion {
*/ */
[[nodiscard]] auto VersionWithdrawn() const -> bool; [[nodiscard]] auto VersionWithdrawn() const -> bool;
/**
* @brief
*
* @return true
* @return false
*/
[[nodiscard]] auto GitCommitHashMismatch() const -> bool;
/** /**
* @brief * @brief
* *

26
src/m_ver_check/UpdateTab.cpp
View File

@ -72,9 +72,21 @@ UpdateTab::UpdateTab(QWidget* parent)
release_note_layout->addWidget(release_note_viewer_); release_note_layout->addWidget(release_note_viewer_);
release_note_box->setLayout(release_note_layout); release_note_box->setLayout(release_note_layout);
auto* tips_label = new QLabel();
tips_label->setText(
"<center>" +
tr("It is recommended that you always check the version "
"of GpgFrontend and upgrade to the latest version.") +
"</center><center>" +
tr("New versions not only represent new features, but "
"also often represent functional and security fixes.") +
"</center>");
tips_label->setWordWrap(true);
layout->addWidget(current_version_box); layout->addWidget(current_version_box);
layout->addWidget(upgrade_info_box); layout->addWidget(upgrade_info_box);
layout->addWidget(release_note_box); layout->addWidget(release_note_box);
layout->addWidget(tips_label);
setLayout(layout); setLayout(layout);
} }
@ -120,9 +132,6 @@ void UpdateTab::slot_show_version_status() {
auto is_current_version_released = GFModuleRetrieveRTValueOrDefaultBool( auto is_current_version_released = GFModuleRetrieveRTValueOrDefaultBool(
GFGetModuleID(), GFModuleStrDup("version.current_version_released"), 0); GFGetModuleID(), GFModuleStrDup("version.current_version_released"), 0);
auto is_git_commit_hash_mismatch = GFModuleRetrieveRTValueOrDefaultBool(
GFGetModuleID(), GFModuleStrDup("version.git_commit_hash_mismatch"), 0);
QString const latest_version = UDUP(GFModuleRetrieveRTValueOrDefault( QString const latest_version = UDUP(GFModuleRetrieveRTValueOrDefault(
GFGetModuleID(), GFModuleStrDup("version.latest_version"), GFGetModuleID(), GFModuleStrDup("version.latest_version"),
GFModuleStrDup(""))); GFModuleStrDup("")));
@ -163,17 +172,6 @@ void UpdateTab::slot_show_version_status() {
tr("here") + "</a> " + tr("to download the latest stable version.") + tr("here") + "</a> " + tr("to download the latest stable version.") +
"</center>"); "</center>");
upgrade_label_->show(); upgrade_label_->show();
} else if (is_git_commit_hash_mismatch != 0) {
upgrade_label_->setText(
"<center>" +
tr("The current version's commit hash does not match the official "
"release. This may indicate a modified or unofficial build.") +
"</center><center>" + tr("Click") +
" <a href=\"https://www.gpgfrontend.bktus.com/overview/downloads/\">" +
tr("here") + "</a> " +
tr("to verify your installation or download the official version.") +
"</center>");
upgrade_label_->show();
} else { } else {
upgrade_label_->setText( upgrade_label_->setText(
"<center>" + "<center>" +

217
src/m_ver_check/VersionCheckTask.cpp
View File

@ -44,146 +44,123 @@ VersionCheckTask::VersionCheckTask()
: network_manager_(new QNetworkAccessManager(this)), : network_manager_(new QNetworkAccessManager(this)),
current_version_(GFProjectVersion()) { current_version_(GFProjectVersion()) {
qRegisterMetaType<SoftwareVersion>("SoftwareVersion"); qRegisterMetaType<SoftwareVersion>("SoftwareVersion");
version_meta_data_.current_version = current_version_; version_.current_version = current_version_;
version_meta_data_.local_commit_hash = GFProjectGitCommitHash();
} }
auto VersionCheckTask::Run() -> int { auto VersionCheckTask::Run() -> int {
QString base_url = "https://api.github.com/repos/saturneric/gpgfrontend"; QString latest_version_url =
QList<QUrl> urls = { "https://api.github.com/repos/saturneric/gpgfrontend/releases/latest";
{base_url + "/releases/latest"},
{base_url + "/releases/tags/" + current_version_},
{base_url + "/git/ref/tags/" + current_version_},
};
connect(network_manager_, &QNetworkAccessManager::finished, this, QNetworkRequest latest_request(latest_version_url);
&VersionCheckTask::slot_parse_reply); latest_request.setHeader(QNetworkRequest::UserAgentHeader,
GFHttpRequestUserAgent());
for (const QUrl& url : urls) {
QNetworkRequest request(url);
request.setHeader(QNetworkRequest::UserAgentHeader,
GFHttpRequestUserAgent());
QNetworkReply* reply = network_manager_->get(request);
replies_.append(reply);
}
latest_reply_ = network_manager_->get(latest_request);
connect(latest_reply_, &QNetworkReply::finished, this,
&VersionCheckTask::slot_parse_latest_version_info);
return 0; return 0;
} }
void VersionCheckTask::slot_parse_reply(QNetworkReply* reply) { void VersionCheckTask::slot_parse_latest_version_info() {
if (reply->error() == QNetworkReply::NoError) { if (latest_reply_ == nullptr) {
FLOG_DEBUG("get reply from url: %1", reply->url().toString()); version_.latest_version = current_version_;
version_.loading_done = false;
} else if (latest_reply_->error() != QNetworkReply::NoError) {
MLogError(QString("latest version request error: %1")
.arg(latest_reply_->errorString()));
version_.latest_version = current_version_;
} else { } else {
FLOG_DEBUG("get reply from url: %1, error: %2", reply->url().toString(), latest_reply_bytes_ = latest_reply_->readAll();
reply->errorString()); auto latest_reply_json = QJsonDocument::fromJson(latest_reply_bytes_);
if (latest_reply_json.isObject()) {
QString latest_version = latest_reply_json["tag_name"].toString();
QRegularExpression re(R"(^[vV](\d+\.)?(\d+\.)?(\*|\d+))");
auto version_match = re.match(latest_version);
if (version_match.hasMatch()) {
latest_version = version_match.captured(0);
} else {
latest_version = current_version_;
MLogWarn(QString("latest version unknown, set to current version: %1")
.arg(current_version_));
}
bool prerelease = latest_reply_json["prerelease"].toBool();
bool draft = latest_reply_json["draft"].toBool();
auto publish_date = latest_reply_json["published_at"].toString();
auto release_note = latest_reply_json["body"].toString();
version_.latest_version = latest_version;
version_.latest_prerelease_version_from_remote = prerelease;
version_.latest_draft_from_remote = draft;
version_.publish_date = publish_date;
version_.release_note = release_note;
} else {
MLogWarn(QString("cannot parse data got from github: %1")
.arg(latest_reply_bytes_));
}
} }
switch (replies_.indexOf(reply)) { if (latest_reply_ != nullptr) {
case 0: latest_reply_->deleteLater();
slot_parse_latest_version_info(reply);
break;
case 1:
slot_parse_current_version_info(reply);
break;
case 2:
slot_parse_current_tag_info(reply);
break;
} }
replies_.removeAll(reply); try {
reply->deleteLater(); QString current_version_url =
"https://api.github.com/repos/saturneric/gpgfrontend/releases/tags/" +
current_version_;
if (replies_.isEmpty()) { QNetworkRequest current_request(current_version_url);
slot_fill_grt_with_version_info(version_meta_data_); current_request.setHeader(QNetworkRequest::UserAgentHeader,
emit SignalUpgradeVersion(version_meta_data_); GFHttpRequestUserAgent());
current_reply_ = network_manager_->get(current_request);
connect(current_reply_, &QNetworkReply::finished, this,
&VersionCheckTask::slot_parse_current_version_info);
} catch (...) {
GFModuleLogError("current version request create error");
} }
} }
void VersionCheckTask::slot_parse_latest_version_info(QNetworkReply* reply) { void VersionCheckTask::slot_parse_current_version_info() {
if (reply == nullptr || reply->error() != QNetworkReply::NoError) { if (current_reply_ == nullptr) {
return; // loading done
} version_.loading_done = false;
auto reply_bytes = reply->readAll(); } else if (current_reply_->error() != QNetworkReply::NoError) {
auto latest_reply_json = QJsonDocument::fromJson(reply_bytes); MLogError(QString("current version request network error: {}")
.arg(current_reply_->errorString()));
if (!latest_reply_json.isObject()) { // loading done
FLOG_WARN("cannot parse data from github: %1", reply_bytes); version_.loading_done = true;
return; version_.current_version_publish_in_remote = false;
}
QString latest_version = latest_reply_json["tag_name"].toString();
QRegularExpression re(R"(^[vV](\d+\.)?(\d+\.)?(\*|\d+))");
auto version_match = re.match(latest_version);
if (version_match.hasMatch()) {
latest_version = version_match.captured(0);
} else { } else {
latest_version = current_version_; version_.current_version_publish_in_remote = true;
MLogWarn(QString("latest version unknown, set to current version: %1") current_reply_bytes_ = current_reply_->readAll();
.arg(current_version_)); auto current_reply_json = QJsonDocument::fromJson(current_reply_bytes_);
if (current_reply_json.isObject()) {
bool current_prerelease = current_reply_json["prerelease"].toBool();
bool current_draft = current_reply_json["draft"].toBool();
version_.latest_prerelease_version_from_remote = current_prerelease;
version_.latest_draft_from_remote = current_draft;
// loading done
version_.loading_done = true;
} else {
MLogWarn(QString("cannot parse data got from github: %1")
.arg(current_reply_bytes_));
}
} }
bool prerelease = latest_reply_json["prerelease"].toBool(); if (current_reply_ != nullptr) current_reply_->deleteLater();
bool draft = latest_reply_json["draft"].toBool();
auto publish_date = latest_reply_json["published_at"].toString();
auto release_note = latest_reply_json["body"].toString();
version_meta_data_.latest_version = latest_version;
version_meta_data_.latest_prerelease_version_from_remote = prerelease;
version_meta_data_.latest_draft_from_remote = draft;
version_meta_data_.publish_date = publish_date;
version_meta_data_.release_note = release_note;
}
void VersionCheckTask::slot_parse_current_version_info(QNetworkReply* reply) { slot_fill_grt_with_version_info(version_);
if (reply == nullptr || reply->error() != QNetworkReply::NoError) { emit SignalUpgradeVersion(version_);
version_meta_data_.current_version_publish_in_remote = false;
return;
}
version_meta_data_.current_version_publish_in_remote = true;
auto reply_bytes = reply->readAll();
auto current_reply_json = QJsonDocument::fromJson(reply_bytes);
if (!current_reply_json.isObject()) {
FLOG_WARN("cannot parse data from github: %1", reply_bytes);
return;
}
bool current_prerelease = current_reply_json["prerelease"].toBool();
bool current_draft = current_reply_json["draft"].toBool();
version_meta_data_.latest_prerelease_version_from_remote = current_prerelease;
version_meta_data_.latest_draft_from_remote = current_draft;
}
void VersionCheckTask::slot_parse_current_tag_info(QNetworkReply* reply) {
if (reply == nullptr || reply->error() != QNetworkReply::NoError) {
version_meta_data_.current_version_publish_in_remote = false;
return;
}
version_meta_data_.current_version_publish_in_remote = true;
auto reply_bytes = reply->readAll();
auto current_reply_json = QJsonDocument::fromJson(reply_bytes);
if (!current_reply_json.isObject()) {
FLOG_WARN("cannot parse data from github: %1", reply_bytes);
return;
}
auto object = current_reply_json["object"].toObject();
if (object["type"].toString() != "commit") {
FLOG_WARN("remote tag: %1 is not a ref: %2",
version_meta_data_.current_version, object["type"].toString());
return;
}
auto sha = object["sha"].toString();
version_meta_data_.remote_commit_hash_by_tag = sha;
} }
void VersionCheckTask::slot_fill_grt_with_version_info( void VersionCheckTask::slot_fill_grt_with_version_info(
const SoftwareVersion& version) { const SoftwareVersion &version) {
GFModuleLogDebug("filling software information info in rt..."); GFModuleLogDebug("filling software information info in rt...");
GFModuleUpsertRTValue(GFGetModuleID(), GFModuleUpsertRTValue(GFGetModuleID(),
@ -192,13 +169,6 @@ void VersionCheckTask::slot_fill_grt_with_version_info(
GFModuleUpsertRTValue(GFGetModuleID(), GFModuleUpsertRTValue(GFGetModuleID(),
GFModuleStrDup("version.latest_version"), GFModuleStrDup("version.latest_version"),
GFModuleStrDup(version.latest_version.toUtf8())); GFModuleStrDup(version.latest_version.toUtf8()));
GFModuleUpsertRTValue(
GFGetModuleID(), GFModuleStrDup("version.remote_commit_hash_by_tag"),
GFModuleStrDup(version.remote_commit_hash_by_tag.toUtf8()));
GFModuleUpsertRTValue(GFGetModuleID(),
GFModuleStrDup("version.local_commit_hash"),
GFModuleStrDup(version.local_commit_hash.toUtf8()));
GFModuleUpsertRTValueBool( GFModuleUpsertRTValueBool(
GFGetModuleID(), GFModuleStrDup("version.current_version_is_drafted"), GFGetModuleID(), GFModuleStrDup("version.current_version_is_drafted"),
version.current_version_is_drafted ? 1 : 0); version.current_version_is_drafted ? 1 : 0);
@ -223,15 +193,12 @@ void VersionCheckTask::slot_fill_grt_with_version_info(
GFModuleUpsertRTValueBool( GFModuleUpsertRTValueBool(
GFGetModuleID(), GFModuleStrDup("version.current_a_withdrawn_version"), GFGetModuleID(), GFModuleStrDup("version.current_a_withdrawn_version"),
version.VersionWithdrawn() ? 1 : 0); version.VersionWithdrawn() ? 1 : 0);
GFModuleUpsertRTValueBool(GFGetModuleID(),
GFModuleStrDup("version.git_commit_hash_mismatch"),
version.GitCommitHashMismatch() ? 1 : 0);
GFModuleUpsertRTValue(GFGetModuleID(), GFModuleStrDup("version.release_note"), GFModuleUpsertRTValue(GFGetModuleID(), GFModuleStrDup("version.release_note"),
GFModuleStrDup(version.release_note.toUtf8())); GFModuleStrDup(version.release_note.toUtf8()));
GFModuleUpsertRTValueBool(GFGetModuleID(), GFModuleUpsertRTValueBool(GFGetModuleID(),
GFModuleStrDup("version.loading_done"), GFModuleStrDup("version.loading_done"),
version.IsInfoValid() ? 1 : 0); version.loading_done ? 1 : 0);
GFModuleLogDebug("software information filled in rt"); GFModuleLogDebug("software information filled in rt");
} }

27
src/m_ver_check/VersionCheckTask.h
View File

@ -70,28 +70,14 @@ class VersionCheckTask : public QObject {
* @brief * @brief
* *
*/ */
void slot_parse_reply(QNetworkReply* reply); void slot_parse_latest_version_info();
/** /**
* @brief * @brief
* *
* @param reply
*/ */
void slot_parse_latest_version_info(QNetworkReply* reply); void slot_parse_current_version_info();
/**
* @brief
*
* @param reply
*/
void slot_parse_current_version_info(QNetworkReply* reply);
/**
* @brief
*
* @param reply
*/
void slot_parse_current_tag_info(QNetworkReply* reply);
/** /**
* @brief * @brief
* *
@ -99,8 +85,11 @@ class VersionCheckTask : public QObject {
void slot_fill_grt_with_version_info(const SoftwareVersion&); void slot_fill_grt_with_version_info(const SoftwareVersion&);
private: private:
QList<QNetworkReply*> replies_; ///< QByteArray latest_reply_bytes_; ///<
QByteArray current_reply_bytes_; ///<
QNetworkReply* latest_reply_ = nullptr; ///< latest version info reply
QNetworkReply* current_reply_ = nullptr; ///< current version info reply
QNetworkAccessManager* network_manager_; ///< QNetworkAccessManager* network_manager_; ///<
QString current_version_; ///< QString current_version_;
SoftwareVersion version_meta_data_; SoftwareVersion version_;
}; };

2
src/m_ver_check/VersionCheckingModule.cpp
View File

@ -44,7 +44,7 @@
#include "VersionCheckTask.h" #include "VersionCheckTask.h"
GF_MODULE_API_DEFINE("com.bktus.gpgfrontend.module.version_checking", GF_MODULE_API_DEFINE("com.bktus.gpgfrontend.module.version_checking",
"VersionChecking", "1.2.0", "VersionChecking", "1.1.0",
"Try checking GpgFrontend version.", "Saturneric"); "Try checking GpgFrontend version.", "Saturneric");
DEFINE_TRANSLATIONS_STRUCTURE(ModuleVersionChecking); DEFINE_TRANSLATIONS_STRUCTURE(ModuleVersionChecking);