upgrade AppImageUpdaterBridge to the latest version

antony-jr · Aug 7, 2019 · 302b24f · 302b24f
1 parent b5704c3
commit 302b24f
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 43 deletions.
diff --git a/AppImageUpdater.cc b/AppImageUpdater.cc
@@ -66,24 +66,24 @@ AppImageUpdater::AppImageUpdater(bool minimized, QWidget *parent)
 
     /* Check for updates. */
     _bUpdateStarted = true;
+
+    m_Updater = new AppImageDeltaRevisioner(/*single threaded=*/false, this);
+    m_Updater->setShowLog(true);
+
     int flags =  0; 
     if(_pSettings.isShowUpdateDialogs()){
-	    flags = AppImageUpdaterDialog::AlertWhenAuthorizationIsRequired |
-		    AppImageUpdaterDialog::ShowProgressDialog |
-		    AppImageUpdaterDialog::ShowUpdateConfirmationDialog |
-		    AppImageUpdaterDialog::ShowFinishedDialog;
+	    flags = (AppImageUpdaterDialog::Default ^ 
+	             AppImageUpdaterDialog::ShowErrorDialog ^ 
+		     AppImageUpdaterDialog::ShowBeforeProgress) | AppImageUpdaterDialog::AlertWhenAuthorizationIsRequired;
     }
-    _pUpdateDialog = new AppImageUpdaterDialog(
-		    		QPixmap(QString::fromUtf8(":/logo.png")),
-				this,
-				flags);
-    _pUpdateDialog->setShowLog(true);
+
+    _pUpdateDialog = new AppImageUpdaterDialog(QPixmap(QString::fromUtf8(":/default_icon.png")),this,flags);
     _pUpdateDialog->move(centerPos - _pUpdateDialog->rect().center());
 
     /* Special connect */
     connect(_pUpdateDialog, &AppImageUpdaterDialog::quit, this, &AppImageUpdater::quit, Qt::DirectConnection);
 
-    _pUpdateDialog->init();
+    _pUpdateDialog->init(m_Updater);
 
     /* Connect buttons. */
     connect(_pUi.settingsBtn, &QPushButton::pressed, &_pSettings, &QDialog::exec);
@@ -220,23 +220,19 @@ void AppImageUpdater::updateAppImagesInQueue(void)
     }
     AUI(statusLbl).setText(msg.arg(AppImageSName).arg(_pAppImagePaths.size()));
 
+
+    m_Updater->setAppImage(_pCurrentAppImagePath);
+
     int flags =  0; 
     if(_pSettings.isShowUpdateDialogs()){
-	    flags = AppImageUpdaterDialog::AlertWhenAuthorizationIsRequired |
-		    AppImageUpdaterDialog::ShowProgressDialog |
-		    AppImageUpdaterDialog::ShowUpdateConfirmationDialog |
-		    AppImageUpdaterDialog::ShowFinishedDialog |
-		    AppImageUpdaterDialog::ShowErrorDialog | 
-		    AppImageUpdaterDialog::NotifyWhenNoUpdateIsAvailable;
+	    flags = (AppImageUpdaterDialog::Default ^ AppImageUpdaterDialog::ShowBeforeProgress) | 
+		    AppImageUpdaterDialog::AlertWhenAuthorizationIsRequired;
     }
-    _pUpdateDialog = new AppImageUpdaterDialog(
-		    		_pCurrentAppImagePath,
-		    		QPixmap(QString::fromUtf8(":/default_icon.png")),
-				this,
-				flags);
-    _pUpdateDialog->setShowLog(true);
+
+    _pUpdateDialog = new AppImageUpdaterDialog(QPixmap(QString::fromUtf8(":/default_icon.png")),this,flags);
     _pUpdateDialog->move(centerPos - _pUpdateDialog->rect().center());
-    _pUpdateDialog->init();
+
+    _pUpdateDialog->init(m_Updater, QFileInfo(_pCurrentAppImagePath).baseName());
 
     /* Program logic. */
     connect(&_pAuthorizationDialog, &AuthorizationDialog::started, _pUpdateDialog, &QDialog::hide, Qt::DirectConnection);

diff --git a/AppImageUpdater.hpp b/AppImageUpdater.hpp
@@ -51,6 +51,7 @@ private Q_SLOTS:
             _pDropNorm;
     QIcon _pWindowIcon;
     QQueue<QString> _pAppImagePaths;
+    AppImageUpdaterBridge::AppImageDeltaRevisioner *m_Updater = nullptr;
     AppImageUpdaterBridge::AppImageUpdaterDialog *_pUpdateDialog = nullptr;
     QSystemTrayIcon *_pTIcon = nullptr;
 protected:

diff --git a/AppImageUpdaterStandalone.cc b/AppImageUpdaterStandalone.cc
@@ -1,39 +1,37 @@
 #include <AppImageUpdaterStandalone.hpp>
+#include <QFileInfo>
 #include <QScreen>
 
 using AppImageUpdaterBridge::AppImageUpdaterDialog;
+using AppImageUpdaterBridge::AppImageDeltaRevisioner;
 
-AppImageUpdaterStandalone::AppImageUpdaterStandalone(const QString &AppImagePath, QObject *parent)
+AppImageUpdaterStandalone::AppImageUpdaterStandalone(QString AppImagePath, QObject *parent)
     : QObject(parent)
 {
-        int flags = AppImageUpdaterDialog::AlertWhenAuthorizationIsRequired |
-		    AppImageUpdaterDialog::ShowProgressDialog |
-		    AppImageUpdaterDialog::ShowFinishedDialog |
-		    AppImageUpdaterDialog::ShowErrorDialog | 
-		    AppImageUpdaterDialog::NotifyWhenNoUpdateIsAvailable |
-		    AppImageUpdaterDialog::ShowBeforeProgress; 
- 	_pUpdateDialog = new AppImageUpdaterDialog(
-		    		AppImagePath,
-		    		QPixmap(QString::fromUtf8(":/default_icon.png")),
-				nullptr,
-				flags);
-
-	_pUpdateDialog->setShowLog(true);	
+
+	m_Updater = new AppImageDeltaRevisioner(AppImagePath , this);
+	m_Updater->setShowLog(true);
+
+        int flags = (AppImageUpdaterDialog::Default ^ AppImageUpdaterDialog::ShowBeforeProgress) |
+		    AppImageUpdaterDialog::AlertWhenAuthorizationIsRequired;
+ 	_pUpdateDialog = new AppImageUpdaterDialog(QPixmap(QString::fromUtf8(":/default_icon.png")),nullptr,flags);	
+
        	_pUpdateDialog->setWindowFlags(Qt::WindowStaysOnTopHint);
         _pUpdateDialog->move(QGuiApplication::primaryScreen()->geometry().center() - _pUpdateDialog->rect().center());
-        _pUpdateDialog->setWindowIcon(QIcon(QPixmap(QString::fromUtf8(":/logo.png"))));
-        _pUpdateDialog->init();
+        _pUpdateDialog->init(m_Updater , QFileInfo(AppImagePath).baseName());
 
-        /* Program logic. */
+	/* Program logic. */
         connect(_pUpdateDialog, &AppImageUpdaterDialog::canceled, this, &AppImageUpdaterStandalone::handleCanceled);
         connect(_pUpdateDialog, &AppImageUpdaterDialog::error, this, &AppImageUpdaterStandalone::handleError);
         connect(_pUpdateDialog, &AppImageUpdaterDialog::finished, this, &AppImageUpdaterStandalone::handleFinished);
 }
 
 AppImageUpdaterStandalone::~AppImageUpdaterStandalone()
 {
-   _pUpdateDialog->hide();
-   _pUpdateDialog->deleteLater();
+   if(_pUpdateDialog){
+	_pUpdateDialog->hide();
+	_pUpdateDialog->deleteLater();
+   }
    return;
 }
 

diff --git a/AppImageUpdaterStandalone.hpp b/AppImageUpdaterStandalone.hpp
@@ -8,9 +8,10 @@
 class AppImageUpdaterStandalone : public QObject
 {
     Q_OBJECT
+    AppImageUpdaterBridge::AppImageDeltaRevisioner *m_Updater = nullptr;
     AppImageUpdaterBridge::AppImageUpdaterDialog *_pUpdateDialog = nullptr;
 public:
-    AppImageUpdaterStandalone(const QString&, QObject *parent = nullptr);
+    AppImageUpdaterStandalone(QString, QObject *parent = nullptr);
     ~AppImageUpdaterStandalone();
 private Q_SLOTS:
     void handleError(QString, short);