Fix #87 - updating improved

Author: vorlov-playrix

data/misc/update.cmd

@@ -26,6 +26,7 @@ mkdir "%InstallPath%"
 (robocopy "%UpdatePath%" "%InstallPath%" *.* /r:5 /w:2 /e /move >nul) & if %errorlevel% lss 8 set errorlevel=0
 if %errorlevel% neq 0 (
     :: Restore backup
+    rmdir /S /Q "%InstallPath%"
     move /y "%PrevVersionBackupPath%" "%InstallPath%"
 	set "ResultCode=20"
 	set "ResultMsg=Failed to move an update to the installation directory"

src/Application.cpp

@@ -108,7 +108,7 @@ Application::Application(int& argc, char** argv)
     checkUpdateResults();
 
     // TODO: if not disabled in settings / if time has come
-    checkForUpdates();
+    checkForUpdates(false);
 }
 
 Application::~Application()
@@ -205,15 +205,15 @@ QString Application::getUpdatePath() const
     return QDir::temp().absoluteFilePath("CEEDUpdate");
 }
 
-void Application::checkForUpdates()
+void Application::checkForUpdates(bool manual)
 {
     if (!Utils::isInternetConnected())
     {
         qCritical() << "No Internet connection, update check skipped";
         return;
     }
 
-    QUrl infoUrl = _settings->getQSettings()->value("updateInfoUrl", "https://api.github.com/repos/cegui/ceed-cpp/releases/latest").toUrl();
+    const QUrl infoUrl = _settings->getQSettings()->value("updateInfoUrl", "https://api.github.com/repos/cegui/ceed-cpp/releases/latest").toUrl();
 
     _mainWindow->setStatusMessage("Checking for updates...");
 
@@ -223,7 +223,7 @@ void Application::checkForUpdates()
         onUpdateError(infoReply->url(), infoReply->errorString());
     });
 
-    QObject::connect(infoReply, &QNetworkReply::finished, [this, infoReply]()
+    QObject::connect(infoReply, &QNetworkReply::finished, [this, infoReply, manual]()
     {
         // Already processed by QNetworkReply::errorOccurred handler
         if (infoReply->error() != QNetworkReply::NoError) return;
@@ -246,8 +246,11 @@ void Application::checkForUpdates()
                     auto savedVersion = QVersionNumber::fromString(_settings->getQSettings()->value("update/version").toString());
                     if (latestVersion.normalized() == savedVersion.normalized())
                     {
-                        _mainWindow->setStatusMessage(tr("Auto-update to %1 is blocked because it failed before. "
-                                                         "Use Help->Check For Updates to try again.").arg(latestVersionStr));
+                        const QString msg = tr("Auto-update to %1 is blocked because it failed before. "
+                                               "Use Help->Check For Updates to try again.").arg(latestVersionStr);
+                        _mainWindow->setStatusMessage(msg);
+                        if (manual)
+                            QMessageBox::warning(_mainWindow, tr("Auto-update blocked"), msg);
                         return;
                     }
                     else
@@ -262,6 +265,13 @@ void Application::checkForUpdates()
                 UpdateDialog dlg(currentVersion, latestVersion, releaseInfo);
                 dlg.exec();
             }
+            else
+            {
+                const QString msg = tr("CEED is already at the latest version: %1").arg(applicationVersion());
+                _mainWindow->setStatusMessage("No update found");
+                if (manual)
+                    QMessageBox::information(_mainWindow, tr("Already updated"), msg);
+            }
         }
         catch (const std::exception& e)
         {

src/Application.h

@@ -34,7 +34,7 @@ class Application : public QApplication
     QString getDocumentationPath() const;
     QString getUpdatePath() const;
 
-    void checkForUpdates();
+    void checkForUpdates(bool manual);
 
 private:
 

src/ui/MainWindow.cpp

@@ -1377,7 +1377,7 @@ void MainWindow::on_actionCheckForUpdates_triggered()
     // Forced check for update removes a failed flag which prevents an auto-update
     auto app = qobject_cast<Application*>(qApp);
     app->getSettings()->getQSettings()->remove("update/failed");
-    app->checkForUpdates();
+    app->checkForUpdates(true);
 }
 
 void MainWindow::openNewEditor(EditorFactoryBase* factory)