From fe1c37d28a81cde2b3c8992e7106ffa7c4493bb4 Mon Sep 17 00:00:00 2001
From: Yuriy Puchkov <yuriy.puchkov@namecheap.com>
Date: Thu, 6 Aug 2020 16:29:48 +0300
Subject: [PATCH] Remove screenshot from s3 bucket and old format cache only

---
 src/widgets/historywidget.cpp | 67 ++++++++++++++++++-----------------
 src/widgets/historywidget.h   |  1 +
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/src/widgets/historywidget.cpp b/src/widgets/historywidget.cpp
index a7131891..296a40c1 100644
--- a/src/widgets/historywidget.cpp
+++ b/src/widgets/historywidget.cpp
@@ -136,14 +136,9 @@ void HistoryWidget::addLine(const QString &path, const QString& fileName) {
     QPushButton *buttonDelete = new QPushButton;
     buttonDelete->setIcon(QIcon(":/img/material/black/delete.svg"));
     buttonDelete->setMinimumHeight(HISTORYPIXMAP_MAX_PREVIEW_HEIGHT);
-    if(deleteToken.size() > 0) {
-        connect(buttonDelete, &QPushButton::clicked, this, [=](){
-            removeItem(phbl, fullFileName, s3FileName, deleteToken);
-        });
-    }
-    else {
-        buttonDelete->setDisabled(true);
-    }
+    connect(buttonDelete, &QPushButton::clicked, this, [=](){
+        removeItem(phbl, fullFileName, s3FileName, deleteToken);
+    });
 
     // layout
     phbl->addWidget(pScreenshot);
@@ -158,34 +153,40 @@ void HistoryWidget::addLine(const QString &path, const QString& fileName) {
     phbl->setStretchFactor(buttonOpen, 4);
     phbl->setStretchFactor(buttonDelete, 1);
 
-
     // add to scroll
     m_pVBox->addLayout(phbl);
 }
 
 void HistoryWidget::removeItem(QLayout *pl, const QString &fullFileName, const QString& s3FileName, const QString& deleteToken) {
-    ImgS3Uploader *uploader = new ImgS3Uploader();
-    uploader->show();
-    uploader->deleteResource(s3FileName, deleteToken);
-
-    connect(uploader, &QWidget::destroyed, this, [=](){
-        // delete cached image on local dist
-        QFile file(fullFileName);
-        file.remove();
-
-        // remove current row or refresh list
-        while(pl->count() > 0)
-        {
-          QLayoutItem *item = pl->takeAt(0);
-          delete item->widget();
-          delete item;
-        }
-        m_pVBox->removeItem(pl);
-        delete pl;
-
-        // set "empty" message if no items left
-        if(m_pVBox->count() == 0) {
-            setEmptyMessage();
-        }
-    });
+    if (deleteToken.length() > 0) {
+        ImgS3Uploader *uploader = new ImgS3Uploader();
+        uploader->show();
+        uploader->deleteResource(s3FileName, deleteToken);
+        connect(uploader, &QWidget::destroyed, this, [=](){
+            removeLocalItem(pl, fullFileName);
+        });
+    }
+    else {
+        removeLocalItem(pl, fullFileName);
+    }
+}
+
+void HistoryWidget::removeLocalItem(QLayout *pl, const QString &fullFileName) {
+    QFile file(fullFileName);
+    file.remove();
+
+    // remove current row or refresh list
+    while(pl->count() > 0)
+    {
+      QLayoutItem *item = pl->takeAt(0);
+      delete item->widget();
+      delete item;
+    }
+    m_pVBox->removeItem(pl);
+    delete pl;
+
+    // set "empty" message if no items left
+    if(m_pVBox->count() == 0) {
+        setEmptyMessage();
+    }
 }
diff --git a/src/widgets/historywidget.h b/src/widgets/historywidget.h
index c80e9092..064a2db4 100644
--- a/src/widgets/historywidget.h
+++ b/src/widgets/historywidget.h
@@ -26,6 +26,7 @@ private:
     void loadHistory();
     void addLine(const QString &, const QString &);
     void removeItem(QLayout *, const QString &, const QString &, const QString &);
+    void removeLocalItem(QLayout *, const QString &);
     void setEmptyMessage();
 
 private: