fix: do not remove the local cached image if it wasn't removed on the s3 bucket

.github/workflows/Linux-pack.yml

@@ -80,16 +80,21 @@ jobs:
               symbol: jammy,
               arch: amd64
             }
-
+          - {
+              name: ubuntu-24.04,
+              os: ubuntu,
+              symbol: noble,
+              arch: amd64
+            }
+
     steps:
       - name: Enable Docker Experimental Features
         run: |
           echo $'{\n  "experimental": true\n}' | sudo tee /etc/docker/daemon.json
           mkdir -p ~/.docker
           echo $'{\n  "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
           sudo service docker restart
-          docker version -f '{{.Client.Experimental}}'
-          docker version -f '{{.Server.Experimental}}'
+          docker version -f "{{ (index .Server.Components 0).Details.Experimental }}"
           docker buildx version
       - name: Support for ARM via QEMU's user-mode emulation
         # Register binfmt_misc entry for qemu-user-static

.github/workflows/MacOS-pack.yml

@@ -19,16 +19,16 @@ env:
 
 jobs:
   catalina:
-    name: macOS Big Sur 11
-    runs-on: macos-11
+    name: macOS Monterey 12
+    runs-on: macos-12
 
     env:
       APP_NAME: flameshot
       DIR_BULD: build
       DIR_PKG: build/src
       HELPERS_SCRIPTS_PATH: ../../packaging/macos
       # Apple developer identity, example: "Developer ID Application: <user name> (code)"
-      # Note: no signing and notarization will proceed if this variable is not set
+      # Note: no signing and notarization will be proceed if this variable is not set
       APPLE_DEV_IDENTITY: ${{ secrets.APPLE_DEV_IDENTITY }}
       # Apple ID user
       APPLE_DEV_USER: ${{ secrets.APPLE_DEV_USER }}
@@ -45,22 +45,19 @@ jobs:
 
     steps:
       - name: Checkout Source code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
 
       - name: Install Qt
         run: brew install qt@5 cmake
 
       - name: Configure
         run: |
-          mkdir -p "${DIR_BULD}"
-          cd "${DIR_BULD}"
-          rm -rf ./src/flameshot.dmg ./src/flameshot.app/
-          cmake .. -DQt5_DIR=$(brew --prefix qt5)/lib/cmake/Qt5 -DUSE_MONOCHROME_ICON=True
+          rm -rf "${DIR_BULD}"/src/flameshot.dmg "${DIR_BULD}"/src/flameshot.app/
+          cmake -S . -B "${DIR_BULD}" -DQt5_DIR=$(brew --prefix qt5)/lib/cmake/Qt5 -DUSE_MONOCHROME_ICON=True
 
       - name: Compile
         run: |
-          cd "${DIR_BULD}"
-          make
+          cmake --build "${DIR_BULD}"
 
       - name: Create key-chain and import certificate
         run: |
@@ -81,7 +78,7 @@ jobs:
           echo "=====no operation for you can see link in the log console====="
 
       - name: Artifact Upload
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: MacOS-artifact
           path: ${{ github.workspace }}/build/src/flameshot.dmg
@@ -94,4 +91,4 @@ jobs:
           else
             echo "::warning Notarization check failed"
             # exit 1
-          fi
+          fi

src/tools/imgupload/storages/imguploaderbase.cpp

@@ -191,3 +191,11 @@ void ImgUploaderBase::saveScreenshotToFilesystem()
     }
     m_notification->showMessage(tr("Screenshot saved."));
 }
+
+void ImgUploaderBase::removeCacheFile(const QString& fullFileName)
+{
+    QFile file(fullFileName);
+    if (file.exists()) {
+        file.remove();
+    }
+}

src/tools/imgupload/storages/imguploaderbase.h

@@ -50,6 +50,9 @@ private slots:
     void deleteCurrentImage();
     void saveScreenshotToFilesystem();
 
+protected:
+    void removeCacheFile(const QString& fullFileName);
+
 private:
     QPixmap m_pixmap;
 

src/tools/imgupload/storages/imgur/imguruploader.cpp

@@ -93,5 +93,9 @@ void ImgurUploader::deleteImage(const QString& fileName,
         notification()->showMessage(tr("Unable to open the URL."));
     }
 
+    History history;
+    QString fullFileName = history.path() + fileName;
+    removeCacheFile(fullFileName);
+
     emit deleteOk();
 }

src/tools/imgupload/storages/s3/imgs3uploader.cpp

@@ -163,13 +163,6 @@ void ImgS3Uploader::onUploadError(QNetworkReply* reply)
 
 void ImgS3Uploader::handleReplyDeleteResource(QNetworkReply* reply)
 {
-    // Just remove image preview on fail because it can be outdated and removed
-    // on server.
-    removeImagePreview();
-    close();
-
-    /* The following code possibly will be required later so it is just
-     * commented here */
     auto replyError = reply->error();
     if (replyError == QNetworkReply::NoError) {
         removeImagePreview();
@@ -374,14 +367,12 @@ void ImgS3Uploader::removeImagePreview()
 {
     // remove local file
     History history;
-    QString packedFileName = history.packFileName(
-      SCREENSHOT_STORAGE_TYPE_S3, m_deleteToken, m_storageImageName);
-    QString fullFileName = history.path() + packedFileName;
+    QString fullFileName =
+      history.path() + history.packFileName(SCREENSHOT_STORAGE_TYPE_S3,
+                                            m_deleteToken,
+                                            m_storageImageName);
 
-    QFile file(fullFileName);
-    if (file.exists()) {
-        file.remove();
-    }
+    removeCacheFile(fullFileName);
     m_deleteToken.clear();
     m_storageImageName.clear();
     resultStatus = true;

src/widgets/uploadlineitem.cpp

@@ -12,14 +12,6 @@
 #include <QUrl>
 #include <QWidget>
 
-void removeCacheFile(QString const& fullFileName)
-{
-    QFile file(fullFileName);
-    if (file.exists()) {
-        file.remove();
-    }
-}
-
 UploadLineItem::UploadLineItem(QWidget* parent,
                                QPixmap const& preview,
                                QString const& timestamp,
@@ -58,7 +50,6 @@ UploadLineItem::UploadLineItem(QWidget* parent,
           ImgUploaderManager(this).uploader(unpackFileName.type);
         imgUploaderBase->deleteImage(unpackFileName.file, unpackFileName.token);
 
-        removeCacheFile(fullFileName);
         emit requestedDeletion();
     });
 }

src/widgets/uploadlineitem.h

@@ -11,8 +11,6 @@ class UploadLineItem;
 }
 QT_END_NAMESPACE
 
-void removeCacheFile(QString const& fullFileName);
-
 class UploadLineItem : public QWidget
 {
     Q_OBJECT