improved version check

Author: Nico-Duduf

src/duqf-app/app-utils.cpp

@@ -132,7 +132,7 @@ bool DuApplication::processArgs(QStringList examples, QStringList helpStrings)
     return help;
 }
 
-void DuApplication::checkUpdate()
+void DuApplication::checkUpdate(bool wait)
 {
     if (QString(URL_UPDATE) == "") return;
 
@@ -175,8 +175,31 @@ void DuApplication::checkUpdate()
     qInfo().noquote() << "App Version: " % QString(STR_VERSION);
     qInfo().noquote() << "Language code: en";
 
-    connect(am, SIGNAL(finished(QNetworkReply*)), this, SLOT(gotUpdateInfo(QNetworkReply*)));
-    am->get(request);
+    if (wait) {
+        // Create a loop to wait for the data
+        QTimer timer;
+        timer.setSingleShot(true);
+
+        QNetworkReply *reply = am->get( request );
+
+        timer.start( 5000 ); // no more than 5 seconds
+
+        while ( reply->isRunning() )
+        {
+            if (!timer.isActive()) {
+                reply->abort();
+                reply->deleteLater();
+                return;
+            }
+            qApp->processEvents();
+        }
+        gotUpdateInfo(reply);
+        reply->deleteLater();
+    }
+    else {
+        connect(am, SIGNAL(finished(QNetworkReply*)), this, SLOT(gotUpdateInfo(QNetworkReply*)));
+        am->get(request);
+    }
 }
 
 bool DuApplication::notify(QObject *receiver, QEvent *ev)

src/duqf-app/app-utils.h

@@ -118,7 +118,7 @@ class DuApplication : public QApplication
 
 public slots:
     // Check for updates
-    void checkUpdate();
+    void checkUpdate(bool wait = false);
 
 signals:
     void idle();

src/duqf-app/app-version.h

@@ -3,7 +3,7 @@
 
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 8
-#define VERSION_BUILD 6
+#define VERSION_BUILD 5
 #define VERSION_SUFFIX "Beta"
 
 #define STRINGIFY_VERSION(A, B, C) CONCAT(A, B, C )

src/duqf-widgets/duqfupdatedialog.cpp

@@ -1,5 +1,7 @@
 #include "duqfupdatedialog.h"
 
+#include "duqf-app/app-version.h"
+
 DuQFUpdateDialog::DuQFUpdateDialog(QJsonObject updateInfo, QWidget *parent) : QDialog(parent)
 {
     setupUi(updateInfo);
@@ -8,19 +10,19 @@ DuQFUpdateDialog::DuQFUpdateDialog(QJsonObject updateInfo, QWidget *parent) : QD
 void DuQFUpdateDialog::download()
 {
     QDesktopServices::openUrl ( QUrl( m_downloadURL ) );
-    this->close();
+    this->accept();
 }
 
 void DuQFUpdateDialog::changelog()
 {
     QDesktopServices::openUrl ( QUrl( m_changelogURL ) );
-    this->close();
+    this->reject();
 }
 
 void DuQFUpdateDialog::donate()
 {
     QDesktopServices::openUrl ( QUrl( m_donateURL ) );
-    this->close();
+    this->reject();
 }
 
 void DuQFUpdateDialog::setupUi(QJsonObject updateInfo)
@@ -38,8 +40,13 @@ void DuQFUpdateDialog::setupUi(QJsonObject updateInfo)
         QLabel *latestVersionLabel = new QLabel("New version: " % updateInfo.value("version").toString(), this );
         mainLayout->addWidget(latestVersionLabel);
 
-        QTextEdit *descriptionEdit = new QTextEdit(updateInfo.value("description").toString(), this);
+        QTextEdit *descriptionEdit = new QTextEdit(this);
         descriptionEdit->setReadOnly(true);
+#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
+        descriptionEdit->setPlainText( updateInfo.value("description").toString() );
+#else
+        descriptionEdit->setMarkdown( updateInfo.value("description").toString() );
+#endif
         mainLayout->addWidget(descriptionEdit);
 
         QLabel *currentVersionLabel = new QLabel("Current version: " % QString(STR_VERSION), this );

src/duqf-widgets/duqfupdatedialog.h

@@ -10,8 +10,6 @@
 #include <QStringBuilder>
 #include <QDesktopServices>
 
-#include "duqf-app/app-version.h"
-
 class DuQFUpdateDialog : public QDialog
 {
     Q_OBJECT

src/duqf-widgets/duqfupdatesettingswidget.cpp

@@ -1,6 +1,7 @@
 #include "duqfupdatesettingswidget.h"
 
 #include "duqf-app/app-utils.h"
+#include "duqf-widgets/duqfupdatedialog.h"
 
 DuQFUpdateSettingsWidget::DuQFUpdateSettingsWidget(QWidget *parent) :
     QWidget(parent)
@@ -19,6 +20,14 @@ void DuQFUpdateSettingsWidget::checkAtStartup(bool c)
     m_settings.setValue("checkUpdateAtStartup", c);
 }
 
+void DuQFUpdateSettingsWidget::checkUpdate()
+{
+    DuApplication *app = qobject_cast<DuApplication*>(qApp);
+    app->checkUpdate(true);
+    DuQFUpdateDialog dialog( app->updateInfo() );
+    dialog.exec();
+}
+
 void DuQFUpdateSettingsWidget::setupUi()
 {
     QHBoxLayout *mainLayout = new QHBoxLayout(this);
@@ -51,8 +60,6 @@ void DuQFUpdateSettingsWidget::setupUi()
 
 void DuQFUpdateSettingsWidget::connectEvents()
 {
-    DuApplication *app = qobject_cast<DuApplication*>(qApp);
-
     connect( ui_checkAtStartupBox, SIGNAL(clicked(bool)), this, SLOT(checkAtStartup(bool)));
-    connect( ui_checkNowButton, SIGNAL(clicked()), app, SLOT(checkUpdate()));
+    connect( ui_checkNowButton, SIGNAL(clicked()), this, SLOT(checkUpdate()));
 }

src/duqf-widgets/duqfupdatesettingswidget.h

@@ -16,6 +16,7 @@ class DuQFUpdateSettingsWidget : public QWidget
 
 private slots:
     void checkAtStartup(bool c);
+    void checkUpdate();
 
 private:
     void setupUi();

src/main.cpp

@@ -11,6 +11,7 @@
 #endif
 
 #include "duqf-app/app-utils.h"
+#include "duqf-widgets/duqfupdatedialog.h"
 
 int main(int argc, char *argv[])
 {
@@ -54,6 +55,29 @@ int main(int argc, char *argv[])
         qDebug() << tcpSocket->error();
     }
 
+    // Check for updates, right during startup
+    s->newMessage("Looking for udpates...");
+    QSettings settings;
+    qDebug() << "Update check...";
+    QDateTime lastCheck = settings.value("updates/latestUpdateCheck").toDateTime();
+    qDebug().noquote() << "Last check was on: " + lastCheck.toString("yyyy-MM-dd hh:mm:ss");
+    int days = lastCheck.daysTo(QDateTime::currentDateTime());
+    qDebug().noquote() << days << " days since last check.";
+    if (days > 0 || !lastCheck.isValid() || lastCheck.isNull()) {
+        a.checkUpdate(true);
+        QJsonObject updateInfo = a.updateInfo();
+        if (updateInfo.value("update").toBool()) {
+            s->newMessage("A new version is available!");
+            DuQFUpdateDialog dialog(updateInfo);
+            if (dialog.exec()) return 0;
+        }
+        settings.setValue("updates/latestUpdateCheck", QDateTime::currentDateTime());
+    }
+    else
+    {
+        qDebug() << "We'll check again tomorrow.";
+    }
+
     // build and show UI
     s->newMessage("Building UI");
     MainWindow *w = new MainWindow( a.arguments() );

src/mainwindow.cpp

@@ -30,7 +30,6 @@
 #include "dbmanagerwidget.h"
 #include "duqf-widgets/duqftoolbarspacer.h"
 #include "duqf-widgets/duqflogtoolbutton.h"
-#include "duqf-widgets/duqfupdatedialog.h"
 #include "duqf-widgets/duqfupdatesettingswidget.h"
 #include "duqf-widgets/appearancesettingswidget.h"
 #include "duqf-app/app-version.h"
@@ -601,35 +600,6 @@ void MainWindow::hidePropertiesDock()
     ui_propertiesDockWidget->hide();
 }
 
-void MainWindow::duqf_checkUpdate()
-{
-    DuApplication *app = qobject_cast<DuApplication*>(qApp);
-    connect(app, SIGNAL(newUpdateInfo(QJsonObject)), this, SLOT(duqf_updateAvailable(QJsonObject)));
-    // Check for update
-    QSettings settings;
-    bool doCheckUpdate = settings.value("updates/checkUpdateAtStartup", true).toBool();
-    // Just once a day
-    if (doCheckUpdate)
-    {
-        qDebug() << "Update check...";
-        QDateTime lastCheck = settings.value("updates/latestUpdateCheck").toDateTime();
-        qDebug().noquote() << "Last check was on: " + lastCheck.toString("yyyy-MM-dd hh:mm:ss");
-        int days = lastCheck.daysTo(QDateTime::currentDateTime());
-        qDebug().noquote() << days << " days since last check.";
-        if (days > 0 || !lastCheck.isValid())
-        {
-            app->checkUpdate();
-            return;
-        }
-        else
-        {
-            qDebug() << "We'll check again tomorrow.";
-            duqf_updateAvailable(app->updateInfo());
-        }
-    }
-    m_showUpdateAlerts = true;
-}
-
 void MainWindow::duqf_initUi()
 {
     // ===== SYSTRAY ======
@@ -759,7 +729,8 @@ void MainWindow::duqf_initUi()
     helpMenu->addAction(aboutQtAction);
 
     // Check for update
-    duqf_checkUpdate();
+    // moved in main()
+    //duqf_checkUpdate();
 
     // ========= SETTINGS ========
 
@@ -783,6 +754,9 @@ void MainWindow::duqf_initUi()
     connect(duqf_settingsButton, SIGNAL(clicked(bool)), this, SLOT(duqf_settings(bool)));
     connect(settingsWidget, SIGNAL(closeRequested()), this, SLOT(duqf_closeSettings()));
     connect(settingsWidget, SIGNAL(reinitRequested()), this, SLOT(duqf_reinitSettings()));
+
+    DuApplication *app = qobject_cast<DuApplication*>(qApp);
+    duqf_updateAvailable(app->updateInfo());
 }
 
 void MainWindow::duqf_setStyle()
@@ -932,19 +906,6 @@ void MainWindow::duqf_updateAvailable(QJsonObject updateInfo)
                                              ));
         }
     }
-
-    if (!updateInfo.value("update").toBool() && !m_showUpdateAlerts)
-    {
-        m_showUpdateAlerts = true;
-        return;
-    }
-
-    QSettings settings;
-    QDate latestUpdateCheck = settings.value("updates/latestUpdateCheck", QDate(1970,1,1)).toDate();
-    if (latestUpdateCheck == QDate::currentDate()) return;
-
-    DuQFUpdateDialog *dialog = new DuQFUpdateDialog(updateInfo, this);
-    dialog->show();
 }
 
 void MainWindow::log(DuQFLog m)

src/mainwindow.h

@@ -54,10 +54,6 @@ public slots:
     void connectShortCuts();
 
     // ========= RxOT UI ==============
-    /**
-     * @brief duqf_checkUpdate Called once to check if an update is available
-     */
-    void duqf_checkUpdate();
     /**
      * @brief initUi Called once to build the default RxOT UI
      */