Merge pull request #140 from jamebal/develop

perf: 优化删除操作和移动操作
jamebal · Jul 25, 2024 · 9dec965 · 9dec965
2 parents 1d9cc1d + c5222b6
commit 9dec965
Show file tree

Hide file tree

Showing 10 changed files with 241 additions and 132 deletions.
diff --git a/src/main/java/com/jmal/clouddisk/config/FileProperties.java b/src/main/java/com/jmal/clouddisk/config/FileProperties.java
@@ -36,6 +36,10 @@ public class FileProperties {
      * 视频转码后的缓存目录, 位于 ${chunkFileDir}/${username}/${videoTranscodeCache}
      */
     private String videoTranscodeCache = "videoTranscodeCache";
+    /**
+     * 回收站目录, 位于 ${chunkFileDir}/${username}/${jmalcloudTrashDir}
+     */
+    private String jmalcloudTrashDir = ".jmalcloudTrash";
     /**
      * lucene索引存储目录
      */

diff --git a/src/main/java/com/jmal/clouddisk/controller/rest/FileController.java b/src/main/java/com/jmal/clouddisk/controller/rest/FileController.java
@@ -324,7 +324,7 @@ public ResponseResult<Object> unFavorite(@RequestParam String[] fileIds) {
     public ResponseResult<Object> delete(@RequestParam String username, @RequestParam String[] fileIds, @RequestParam String currentDirectory, Boolean sweep) {
         if (fileIds != null && fileIds.length > 0) {
             List<String> list = Arrays.asList(fileIds);
-            return fileService.delete(username, currentDirectory, list, userLoginHolder.getUsername(), BooleanUtil.isTrue(sweep), true);
+            return fileService.delete(username, currentDirectory, list, userLoginHolder.getUsername(), BooleanUtil.isTrue(sweep));
         } else {
             throw new CommonException(ExceptionType.MISSING_PARAMETERS.getCode(), ExceptionType.MISSING_PARAMETERS.getMsg());
         }

diff --git a/src/main/java/com/jmal/clouddisk/controller/sse/SseController.java b/src/main/java/com/jmal/clouddisk/controller/sse/SseController.java
@@ -5,6 +5,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.async.AsyncRequestTimeoutException;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
@@ -94,5 +95,19 @@ private void removeUuid(String username, String uuid) {
             }
         }
     }
+
+    /**
+     * 每3秒发送一次心跳消息
+     */
+    @Scheduled(fixedRate = 3000)
+    public void heartbeat() {
+        emitters.forEach((uuid, emitter) -> {
+            try {
+                emitter.send("h");
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        });
+    }
 }
 
diff --git a/src/main/java/com/jmal/clouddisk/listener/FileMonitor.java b/src/main/java/com/jmal/clouddisk/listener/FileMonitor.java
@@ -207,9 +207,11 @@ private void fastInterval() throws Exception {
     }
 
     /**
-     * 定时清理临时目录
-     * 每天凌晨2点执行
-     * 清理临时目录中7天前的文件
+     * <p>定时清理临时目录</p>
+     * 每天凌晨2点执行<br>
+     * 1.清理临时目录中3天前的文件<br>
+     * 2.清理视频转码缓存目录中的无效文件<br>
+     * 3.清理回收站中30天前的文件<br>
      */
     @Scheduled(cron = "0 0 2 * * ?")
     private void cleanTempDir() {
@@ -218,13 +220,10 @@ private void cleanTempDir() {
         for (File username : FileUtil.ls(tempPath.toString())) {
             if (username.isDirectory()) {
                 for (File file : FileUtil.ls(username.getAbsolutePath())) {
-                    // 是否为七天前的文件
-                    boolean sevenDayAgo = file.lastModified() < (System.currentTimeMillis() - DateUnit.DAY.getMillis() * 7);
+                    // 是否为三天前的文件
+                    boolean sevenDayAgo = file.lastModified() < (System.currentTimeMillis() - DateUnit.DAY.getMillis() * 3);
                     // 是否为视频转码缓存目录
                     boolean videoCache = fileProperties.getVideoTranscodeCache().equals(file.getName()) || fileProperties.getLuceneIndexDir().equals(file.getParentFile().getName());
-                    if (sevenDayAgo && !videoCache) {
-                        FileUtil.del(file);
-                    }
                     if (videoCache) {
                         if (file.listFiles() != null) {
                             for (File f : Objects.requireNonNull(file.listFiles())) {
@@ -235,6 +234,15 @@ private void cleanTempDir() {
                                 }
                             }
                         }
+                        return;
+                    }
+                    // 回收站
+                    boolean trash = fileProperties.getJmalcloudTrashDir().equals(file.getName());
+                    if (trash) {
+                        return;
+                    }
+                    if (sevenDayAgo) {
+                        FileUtil.del(file);
                     }
                 }
             }

diff --git a/src/main/java/com/jmal/clouddisk/model/FileDocument.java b/src/main/java/com/jmal/clouddisk/model/FileDocument.java
@@ -194,6 +194,8 @@ public class FileDocument extends FileBase {
      */
     private Integer delete;
 
+    private Boolean move;
+
     /**
      * 操作权限
      */
@@ -218,7 +220,7 @@ public int hashCode() {
         return hash;
     }
 
-    public Trash toTrash(boolean hidden) {
+    public Trash toTrash(boolean hidden, boolean move) {
         Trash trash = new Trash();
         trash.setId(this.getId());
         trash.setName(this.getName());
@@ -240,6 +242,7 @@ public Trash toTrash(boolean hidden) {
         trash.setM3u8(this.getM3u8());
         trash.setVtt(this.getVtt());
         trash.setHidden(hidden);
+        trash.setMove(move);
         return trash;
     }
 }
diff --git a/src/main/java/com/jmal/clouddisk/model/Trash.java b/src/main/java/com/jmal/clouddisk/model/Trash.java
@@ -64,7 +64,11 @@ public class Trash extends FileBase {
     /**
      * 是否隐藏显示
      */
-    private boolean hidden;
+    private Boolean hidden;
+    /**
+     * 是否移动到回收站, 从原位置移动到jmalcloudTrashDir
+     */
+    private Boolean move;
 
     @Override
     public boolean equals(Object obj) {

diff --git a/src/main/java/com/jmal/clouddisk/service/IFileService.java b/src/main/java/com/jmal/clouddisk/service/IFileService.java
@@ -174,7 +174,7 @@ public interface IFileService {
      * @param sweep 是否彻底删除
      * @return ResponseResult<Object>
      */
-    ResponseResult<Object> delete(String username, String currentDirectory, List<String> fileIds, String operator, boolean sweep, boolean notify);
+    ResponseResult<Object> delete(String username, String currentDirectory, List<String> fileIds, String operator, boolean sweep);
 
     /**
      * 显示缩略图
@@ -396,9 +396,9 @@ public interface IFileService {
      * 删除文件所有依赖
      * @param username 用户名
      * @param fileIds 文件id列表
-     * @param toTrash  是否移动到回收站, 否则就是硬删除
+     * @param sweep  是否硬删除, 否则就是移动到回收站
      */
-    void deleteDependencies(String username, List<String> fileIds, boolean toTrash);
+    void deleteDependencies(String username, List<String> fileIds, boolean sweep);
 
     /**
      * 返回原处

diff --git a/src/main/java/com/jmal/clouddisk/service/impl/CommonFileService.java b/src/main/java/com/jmal/clouddisk/service/impl/CommonFileService.java
@@ -33,6 +33,7 @@
 import com.mongodb.client.result.DeleteResult;
 import com.mongodb.client.result.UpdateResult;
 import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.core.Single;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import jakarta.validation.constraints.NotNull;
 import lombok.extern.slf4j.Slf4j;
@@ -364,8 +365,6 @@ public String createFile(String username, File file, String userId, Boolean isPu
             pushMessage(username, update.getUpdateObject(), Constants.CREATE_FILE);
             // 添加文件索引
             luceneService.pushCreateIndexQueue(fileId);
-            // 判断回收站是否存在该文件, 如果存在则删除
-            checkTrash(file, username);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         } finally {
@@ -380,16 +379,6 @@ public String createFile(String username, File file, String userId, Boolean isPu
         return fileId;
     }
 
-    private void checkTrash(File file, String username) {
-        String userId = userService.getUserIdByUserName(username);
-        String relativePath = getRelativePath(username, String.valueOf(file.getAbsoluteFile()), file.getName());
-        Query query = new Query();
-        query.addCriteria(Criteria.where(IUserService.USER_ID).is(userId));
-        query.addCriteria(Criteria.where("path").is(relativePath));
-        query.addCriteria(Criteria.where("name").is(file.getName()));
-        mongoTemplate.remove(query, TRASH_COLLECTION_NAME);
-    }
-
     private void updateOtherInfo(FileDocument fileExists, String contentType, Update update) {
         if (!contentType.equals(fileExists.getContentType())) {
             update.set(Constants.CONTENT_TYPE, contentType);
@@ -707,15 +696,7 @@ public void pushMessageOperationFileSuccess(String fromPath, String toPath, Stri
     }
 
     public long occupiedSpace(String userId) {
-        long space = 0;
-        List<Bson> list = Arrays.asList(
-                match(eq(IUserService.USER_ID, userId)),
-                group(new BsonNull(), sum(Constants.TOTAL_SIZE, "$size")));
-        AggregateIterable<Document> aggregateIterable = mongoTemplate.getCollection(COLLECTION_NAME).aggregate(list);
-        Document doc = aggregateIterable.first();
-        if (doc != null) {
-            space = Convert.toLong(doc.get(Constants.TOTAL_SIZE), 0L);
-        }
+        long space = calculateTotalOccupiedSpace(userId).blockingGet();
         ConsumerDO consumerDO = userService.userInfoById(userId);
         if (consumerDO != null && consumerDO.getQuota() != null) {
             if (space >= consumerDO.getQuota() * 1024L * 1024L * 1024L) {
@@ -730,6 +711,30 @@ public long occupiedSpace(String userId) {
         return space;
     }
 
+    public Single<Long> calculateTotalOccupiedSpace(String userId) {
+        Single<Long> space1Single = getOccupiedSpaceAsync(userId, COLLECTION_NAME);
+        Single<Long> space2Single = getOccupiedSpaceAsync(userId, TRASH_COLLECTION_NAME);
+        return Single.zip(space1Single, space2Single, Long::sum);
+    }
+
+    public Single<Long> getOccupiedSpaceAsync(String userId, String collectionName) {
+        return Single.fromCallable(() -> getOccupiedSpace(userId, collectionName))
+                .subscribeOn(Schedulers.io());
+    }
+
+    private long getOccupiedSpace(String userId, String collectionName) {
+        long space = 0;
+        List<Bson> list = Arrays.asList(
+                match(eq(IUserService.USER_ID, userId)),
+                group(new BsonNull(), sum(Constants.TOTAL_SIZE, "$size")));
+        AggregateIterable<Document> aggregateIterable = mongoTemplate.getCollection(collectionName).aggregate(list);
+        Document doc = aggregateIterable.first();
+        if (doc != null) {
+            space = Convert.toLong(doc.get(Constants.TOTAL_SIZE), 0L);
+        }
+        return space;
+    }
+
     /**
      * 检查目录是否为OSS目录
      *