From c3b96414e94392658fcebb45ad58507636a48a1b Mon Sep 17 00:00:00 2001 From: chuzhongzai Date: Sat, 22 Mar 2025 23:50:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B0=86=E9=98=9F=E5=88=97=E4=BB=8Elist?= =?UTF-8?q?=E6=8D=A2=E6=88=90map=EF=BC=8C=E8=83=BD=E5=A4=9F=E5=AF=B9?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8E=BB=E9=87=8D;=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=B6=E4=BC=9A=E5=88=A4=E6=96=AD=E8=AF=A5?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=98=AF=E5=90=A6=E4=B8=8B=E8=BD=BD=E5=AE=8C?= =?UTF-8?q?=E6=88=90;=E4=BF=AE=E6=94=B9=E4=B8=8B=E8=BD=BD=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E5=A4=B4;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/encodings.xml | 7 ++++ src/main/java/lion/CustomUtil.java | 13 ++++++ .../java/lion/MultiThreadedHTTPServer.java | 1 + .../lion/Service/DownloadCheckService.java | 42 ++++++++++++++++--- src/main/java/lion/storageNode.java | 34 +++++++++------ 5 files changed, 80 insertions(+), 17 deletions(-) create mode 100644 .idea/encodings.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..aa00ffa --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/java/lion/CustomUtil.java b/src/main/java/lion/CustomUtil.java index 6621e72..a10b556 100644 --- a/src/main/java/lion/CustomUtil.java +++ b/src/main/java/lion/CustomUtil.java @@ -1,5 +1,7 @@ package lion; +import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpResponse; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; @@ -12,4 +14,15 @@ public class CustomUtil { public static AtomicInteger counter = new AtomicInteger(); public static ObjectMapper objectMapper = new ObjectMapper(); + + public static void notifyMe(String message) { + String url = "https://personal.lionwebsite.xyz/message2me?AuthCode=alone&message=" + message; + HttpRequest request = HttpRequest.post(url); + request.header("User-Agent", "Mozilla/5.0"); + try(HttpResponse response = request.execute()) { + if(response.getStatus() != 200) { + System.out.println("通知失败, status code:" + response.getStatus() + ", message:" + message); + } + } + } } diff --git a/src/main/java/lion/MultiThreadedHTTPServer.java b/src/main/java/lion/MultiThreadedHTTPServer.java index c8ca647..a7d33eb 100644 --- a/src/main/java/lion/MultiThreadedHTTPServer.java +++ b/src/main/java/lion/MultiThreadedHTTPServer.java @@ -127,6 +127,7 @@ public class MultiThreadedHTTPServer { responseWriter.println("Accept-Ranges: bytes"); responseWriter.println("Content-Length: " + (endByte - startByte + 1)); responseWriter.println("Content-Range: bytes " + startByte + "-" + endByte + "/" + fileLength); + responseWriter.println("Content-Disposition: attachment; filename=\"" + fileName + "\""); responseWriter.println(); // Send the file content diff --git a/src/main/java/lion/Service/DownloadCheckService.java b/src/main/java/lion/Service/DownloadCheckService.java index 14a4920..03e9c75 100644 --- a/src/main/java/lion/Service/DownloadCheckService.java +++ b/src/main/java/lion/Service/DownloadCheckService.java @@ -4,6 +4,7 @@ import io.netty.channel.Channel; import io.netty.channel.DefaultEventLoop; import io.netty.channel.EventLoop; import io.netty.util.concurrent.Promise; +import lion.CustomUtil; import lion.Domain.GalleryTask; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.ZipUtil; @@ -21,7 +22,7 @@ import java.util.concurrent.locks.ReentrantLock; @Slf4j @Data public class DownloadCheckService { - ArrayList queue; + Map queue; String downloadPath = "/root/gallery/hentai/download/"; @@ -37,7 +38,7 @@ public class DownloadCheckService { EventLoop eventLoop; - public DownloadCheckService(ArrayList queue, HashMap> promises){ + public DownloadCheckService(Map queue, HashMap> promises){ this.queue = queue; this.promises = promises; eventLoop = new DefaultEventLoop(); @@ -49,7 +50,7 @@ public class DownloadCheckService { public boolean downloadCheck(){ if(queue.isEmpty()) return false; - log.info("下载检查:" + Arrays.toString(queue.toArray())); + log.info("下载检查:{}", Arrays.toString(queue.values().toArray())); File downloadDirectory = new File(downloadPath); File[] fileArray = downloadDirectory.listFiles(); @@ -62,7 +63,7 @@ public class DownloadCheckService { boolean result = false; //扫描进度 Iterator fileIterator = files.iterator(); - for(GalleryTask galleryTask: queue){ + for(GalleryTask galleryTask: queue.values()){ //跳过已经下载完成或者压缩完成的任务 if(galleryTask.is_compress_complete() || galleryTask.is_compressing()) { result = true; @@ -96,7 +97,7 @@ public class DownloadCheckService { } //压缩队列 - for(GalleryTask galleryTask: queue) + for(GalleryTask galleryTask: queue.values()) if (galleryTask.is_download_complete()) { galleryTask.setStatus(GalleryTask.COMPRESSING); compress_queue.add(galleryTask); @@ -139,4 +140,35 @@ public class DownloadCheckService { } } } + + /** + * 检查改任务是否为已完成任务，如已完成则返回true，若未完成则加入队列 + * @return true if compress complete, false otherwise + */ + public boolean addToQueue(GalleryTask galleryTask){ + //是否含有名字，进行中任务一般有名字，没有名字则肯定为初始任务，存在名字至少在下载路径出现过 + if(galleryTask.getName() == null || !galleryTask.getName().isEmpty()){ + queue.putIfAbsent(galleryTask.getGid(), galleryTask); + return false; + } + + //查询hah下载路径中，是否存在该任务下载路径，存在则为下载中或下载完成任务，加入队列 + if(new File(downloadPath + galleryTask.getGid()).isDirectory()){ + queue.putIfAbsent(galleryTask.getGid(), galleryTask); + return false; + } + + + //查询存放路径中是否含有该任务的压缩包，存在则为下载完成任务 + if(new File(storagePath + galleryTask.getName() + "/" + galleryTask.getName() + ".zip").exists()){ + galleryTask.setStatus(GalleryTask.COMPRESS_COMPLETE); + CustomUtil.notifyMe(String.format("任务:%s在添加时已下载完成，更新任务状态", galleryTask.getName())); + return true; + } + + + //异常情况，发送通知 + CustomUtil.notifyMe(String.format("任务:%s存在名字，但是下载路径为空且不存在压缩包", galleryTask.getName() )); + return false; + } } diff --git a/src/main/java/lion/storageNode.java b/src/main/java/lion/storageNode.java index 77f0efd..f79c99c 100644 --- a/src/main/java/lion/storageNode.java +++ b/src/main/java/lion/storageNode.java @@ -17,8 +17,8 @@ import lombok.extern.slf4j.Slf4j; import java.net.InetSocketAddress; import java.net.Socket; -import java.util.ArrayList; import java.util.HashMap; +import java.util.Map; import java.util.concurrent.*; import java.util.concurrent.locks.ReentrantLock; @@ -33,9 +33,9 @@ public class storageNode { DownloadCheckService downloadCheckService; - ArrayList queue; + Map queue; - ArrayList tempQueue; + Map tempQueue; ScheduledExecutorService checkThreadPool; @@ -48,8 +48,8 @@ public class storageNode { public static String storagePath = "/root/gallery/gallery/"; public storageNode(){ - queue = new ArrayList<>(0); - tempQueue = new ArrayList<>(0); + queue = new HashMap<>(); + tempQueue = new HashMap<>(); lock = new ReentrantLock(); counter = 0; promises = new HashMap<>(); @@ -79,7 +79,7 @@ public class storageNode { try { lock.lock(); if(!tempQueue.isEmpty()){ - queue.addAll(tempQueue); + queue.putAll(tempQueue); tempQueue.clear(); } lock.unlock(); @@ -88,7 +88,7 @@ public class storageNode { boolean isSkip = true; //返回false之后，还要额外检查是否有压缩完成的任务 if(!queue.isEmpty()) - for (GalleryTask galleryTask : queue) + for (GalleryTask galleryTask : queue.values()) if (galleryTask.is_compress_complete()) { isSkip = false; break; @@ -106,11 +106,16 @@ public class storageNode { //上锁后再发送，避免出现发送完之后再下载完成 lock.lock(); DownloadStatusMessage downloadStatusMessage = new DownloadStatusMessage(); - downloadStatusMessage.setGalleryTasks(queue.toArray(GalleryTask[]::new)); + downloadStatusMessage.setGalleryTasks(queue.values().toArray(GalleryTask[]::new)); server.writeAndFlush(downloadStatusMessage); + + queue.forEach((gid, galleryTask) -> { + if (galleryTask.is_compress_complete()) + queue.remove(gid); + }); log.info("任务状态发送完成"); - queue.removeIf(GalleryTask::is_compress_complete); + lock.unlock(); }catch (Exception e){ log.error("发送任务状态时发生异常:{}", e.getMessage()); @@ -118,9 +123,9 @@ public class storageNode { } class MyChannelInboundHandlerAdapter extends ChannelInboundHandlerAdapter{ - ArrayList queue; + Map queue; - public MyChannelInboundHandlerAdapter(ArrayList queue) { + public MyChannelInboundHandlerAdapter(Map queue) { this.queue = queue; } @@ -144,7 +149,12 @@ public class storageNode { case AbstractMessage.DOWNLOAD_POST_MESSAGE -> { DownloadPostMessage dpm = (DownloadPostMessage) abstractMessage; lock.lock(); - queue.add(dpm.getGalleryTask()); + //添加到队列方法返回真说明该任务已下载完成，直接发送下载进度 + if(downloadCheckService.addToQueue(dpm.getGalleryTask())){ + DownloadStatusMessage downloadStatusMessage = new DownloadStatusMessage(); + downloadStatusMessage.setGalleryTasks(new GalleryTask[]{dpm.getGalleryTask()}); + server.writeAndFlush(downloadStatusMessage); + } log.info(String.valueOf(queue)); lock.unlock(); ctx.writeAndFlush(new ResponseMessage(dpm.messageId, (byte) 0)); From a8e61cba8f5ea37919a249cc8aca6249e6459e09 Mon Sep 17 00:00:00 2001 From: chuzhongzai Date: Mon, 24 Mar 2025 22:08:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E7=8A=B6=E6=80=81=E4=B9=8B=E5=90=8E=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E9=94=99=E8=AF=AF=E7=9A=84=E7=A7=BB=E9=99=A4=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=AF=BC=E8=87=B4=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/lion/storageNode.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/lion/storageNode.java b/src/main/java/lion/storageNode.java index f79c99c..f9fe35c 100644 --- a/src/main/java/lion/storageNode.java +++ b/src/main/java/lion/storageNode.java @@ -109,10 +109,7 @@ public class storageNode { downloadStatusMessage.setGalleryTasks(queue.values().toArray(GalleryTask[]::new)); server.writeAndFlush(downloadStatusMessage); - queue.forEach((gid, galleryTask) -> { - if (galleryTask.is_compress_complete()) - queue.remove(gid); - }); + queue.entrySet().removeIf(entry -> entry.getValue().is_compress_complete()); log.info("任务状态发送完成");