[update] 基本支持软件更新功能

Author: liYony

project/main/main.cpp

@@ -20,6 +20,7 @@ int main(int argc, char *argv[])
     QApplication a(argc, argv);
 
     MainWindow w;
+    QString version = "RTduino Pinout Generator V" + get_version_string();
 
     if(argc == 1) {		//设置条件不用每次都设置
         QString appPath = qApp->applicationFilePath();
@@ -40,8 +41,8 @@ int main(int argc, char *argv[])
     }
 
     w.show();
-    QString version = "RTduino Pinout Generator V" + get_version_string();
     w.setWindowTitle(version);
+    a.setApplicationVersion(get_version_string());
 
     return a.exec();
 }

project/main/version.h

@@ -7,6 +7,8 @@
 #define PG_VERSION_MINOR                0               /**< Minor version number (x.X.x) */
 #define PG_VERSION_PATCH                3               /**< Patch version number (x.x.X) */
 
+#define DEFS_URL "https://raw.githubusercontent.com/RTduino/pinout-generator/master/tools/updates.json"
+
 QString get_version_string(void);
 
 #endif // VERSION_H

project/third-party/QSimpleUpdater/src/Updater.cpp

@@ -37,6 +37,7 @@ Updater::Updater()
    m_changelog = "";
    m_downloadUrl = "";
    m_latestVersion = "";
+   m_typeVersion = "Release";
    m_customAppcast = false;
    m_notifyOnUpdate = true;
    m_notifyOnFinish = false;
@@ -141,6 +142,15 @@ QString Updater::latestVersion() const
    return m_latestVersion;
 }
 
+/**
+ * Returns the type version defined by the update definitions file.
+ * \warning Must is <Alpha> <Beta> <Release>
+ */
+QString Updater::typeVersion() const
+{
+   return m_typeVersion;
+}
+
 /**
  * Returns the user-agent header used by the client when communicating
  * with the server through HTTP
@@ -410,6 +420,10 @@ void Updater::onReply(QNetworkReply *reply)
    m_changelog = platform.value("changelog").toString();
    m_downloadUrl = platform.value("download-url").toString();
    m_latestVersion = platform.value("latest-version").toString();
+   /* https://hexingxing.cn/alpha-beta-rc-release/ */
+   /* <Alpha> <Beta> <Release> */
+   m_typeVersion = platform.value("type-version").toString().isEmpty()
+           ? m_typeVersion : platform.value("type-version").toString();
    if (platform.contains("mandatory-update"))
       m_mandatoryUpdate = platform.value("mandatory-update").toBool();
 
@@ -440,7 +454,7 @@ void Updater::setUpdateAvailable(const bool available)
       }
 
       QString title
-          = "<h3>" + tr("Version %1 of %2 has been released!").arg(latestVersion()).arg(moduleName()) + "</h3>";
+          = "<h3>" + tr("Version %1(%2) of %3 has been released!").arg(latestVersion()).arg(typeVersion()).arg(moduleName()) + "</h3>";
 
       box.setText(title);
       box.setInformativeText(text);

project/third-party/QSimpleUpdater/src/Updater.h

@@ -56,6 +56,7 @@ class QSU_DECL Updater : public QObject
    QString platformKey() const;
    QString moduleVersion() const;
    QString latestVersion() const;
+   QString typeVersion() const;
    QString userAgentString() const;
    bool mandatoryUpdate() const;
 
@@ -106,7 +107,7 @@ private slots:
    QString m_downloadUrl;
    QString m_moduleVersion;
    QString m_latestVersion;
-
+   QString m_typeVersion;
    Downloader *m_downloader;
    QNetworkAccessManager *m_manager;
 };

project/widgets/mainwindow.cpp

@@ -2,14 +2,34 @@
 #include "ui_mainwindow.h"
 #include <QDir>
 #include <QDebug>
+#include <QSslSocket>
 #include <QDesktopServices>
+#include <version.h>
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
     , ui(new Ui::MainWindow)
 {
     ui->setupUi(this);
     rtduino = RTduinoConfig::getInstance();
+    /* QSimpleUpdater is single-instance */
+    qDebug()<<"QSslSocket:"<<QSslSocket::sslLibraryBuildVersionString();
+    qDebug() << "OpenSSL support:" << QSslSocket::supportsSsl();
+    if (QSslSocket::supportsSsl() == true)
+    {
+        updater = QSimpleUpdater::getInstance();
+
+        /* Config for updates */
+        updater->setModuleVersion(DEFS_URL, get_version_string());
+        updater->setNotifyOnFinish(DEFS_URL, false);
+        updater->setNotifyOnUpdate(DEFS_URL, true);
+        updater->setUseCustomAppcast(DEFS_URL, false);
+        updater->setDownloaderEnabled(DEFS_URL, true);
+        updater->setMandatoryUpdate(DEFS_URL, false);
+
+        /* Check for updates */
+        updater->checkForUpdates(DEFS_URL);
+    }
     cfile = new CreateFile;
 }
 

project/widgets/mainwindow.h

@@ -8,6 +8,7 @@
 #include <projwidget.h>
 #include <rtduinoconfig.h>
 #include <createfile.h>
+#include <QSimpleUpdater.h>
 
 QT_BEGIN_NAMESPACE
 namespace Ui { class MainWindow; }
@@ -34,5 +35,6 @@ private slots:
     ProjWidget  *ui_proj;
     RTduinoConfig *rtduino;
     CreateFile *cfile;
+    QSimpleUpdater *updater;
 };
 #endif // MAINWINDOW_H

tools/updates.json

@@ -2,17 +2,11 @@
   "updates": {
     "windows": {
       "open-url": "",
+      "type-version": "Alpha",
       "latest-version": "2.0.3",
       "download-url": "https://raw.githubusercontent.com/RTduino/pinout-generator/master/software/PinoutGenerator-v2.0.3-Setup.exe",
       "changelog": "This is an example changelog for Windows. Go on...",
-      "mandatory": true
-    },
-    "linux": {
-      "open-url": "",
-      "latest-version": "2.0.3",
-      "download-url": "https://raw.githubusercontent.com/RTduino/pinout-generator/master/software/PinoutGenerator-v2.0.3-Setup.exe",
-      "changelog": "This is an example changelog for Linux. Go on...",
-      "mandatory": true
+      "mandatory-update": false
     }
   }
 }