From 51f71c0255f451165b5a4a1b6578c2a07894df1f Mon Sep 17 00:00:00 2001
From: johnniang <johnniang@riseup.net>
Date: Wed, 27 Mar 2019 19:44:20 +0800
Subject: [PATCH] Complete QnYun deletion handler

---
 .../ryanc/halo/filehandler/FileHandler.java   |  1 +
 .../halo/filehandler/QnYunFileHandler.java    | 22 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/main/java/cc/ryanc/halo/filehandler/FileHandler.java b/src/main/java/cc/ryanc/halo/filehandler/FileHandler.java
index a64b3bc40..32962fcd9 100644
--- a/src/main/java/cc/ryanc/halo/filehandler/FileHandler.java
+++ b/src/main/java/cc/ryanc/halo/filehandler/FileHandler.java
@@ -36,6 +36,7 @@ public interface FileHandler {
      * Deletes file.
      *
      * @param key file key must not be null
+     * @throws FileOperationException throws when fail to delete the file
      */
     void delete(@NonNull String key);
 
diff --git a/src/main/java/cc/ryanc/halo/filehandler/QnYunFileHandler.java b/src/main/java/cc/ryanc/halo/filehandler/QnYunFileHandler.java
index 192da8b7a..134e02290 100644
--- a/src/main/java/cc/ryanc/halo/filehandler/QnYunFileHandler.java
+++ b/src/main/java/cc/ryanc/halo/filehandler/QnYunFileHandler.java
@@ -11,6 +11,7 @@ import cc.ryanc.halo.utils.JsonUtils;
 import com.qiniu.common.QiniuException;
 import com.qiniu.common.Zone;
 import com.qiniu.http.Response;
+import com.qiniu.storage.BucketManager;
 import com.qiniu.storage.Configuration;
 import com.qiniu.storage.UploadManager;
 import com.qiniu.storage.persistent.FileRecorder;
@@ -56,6 +57,7 @@ public class QnYunFileHandler implements FileHandler {
         String domain = optionService.getByPropertyOfNonNull(QnYunProperties.DOMAIN);
         String smallUrl = optionService.getByPropertyOfNullable(QnYunProperties.SMALL_URL);
 
+        // TODO Consider to cache the configuration
         // Create configuration
         Configuration configuration = new Configuration(zone);
 
@@ -125,9 +127,27 @@ public class QnYunFileHandler implements FileHandler {
     @Override
     public void delete(String key) {
         Assert.notNull(key, "File key must not be blank");
+        // Get all config
+        Zone zone = optionService.getQnYunZone();
+        String accessKey = optionService.getByPropertyOfNonNull(QnYunProperties.ACCESS_KEY);
+        String secretKey = optionService.getByPropertyOfNonNull(QnYunProperties.SECRET_KEY);
+        String bucket = optionService.getByPropertyOfNonNull(QnYunProperties.BUCKET);
 
+        // TODO Consider to cache the configuration
+        // Create configuration
+        Configuration configuration = new Configuration(zone);
 
-        // TODO Handle file deletion
+        // Create auth
+        Auth auth = Auth.create(accessKey, secretKey);
+
+        BucketManager bucketManager = new BucketManager(auth, configuration);
+
+        try {
+            bucketManager.delete(bucket, key);
+        } catch (QiniuException e) {
+            log.error("QnYun error response: [{}]", e.response);
+            throw new FileOperationException("Failed to delete file with " + key + " key", e);
+        }
     }
 
     @Override