优化坏种处理逻辑

webhook支持代理
wushuo894 · Nov 9, 2024 · a2cf4c6 · a2cf4c6
1 parent ca4602d
commit a2cf4c6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/UPDATE.md b/UPDATE.md
@@ -1 +1,3 @@
-为下载任务增加分类
+优化坏种处理逻辑
+
+webhook支持代理
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>ani.rss</groupId>
     <artifactId>ani-rss</artifactId>
-    <version>1.1.180</version>
+    <version>1.1.181</version>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>

diff --git a/src/main/java/ani/rss/action/AniAction.java b/src/main/java/ani/rss/action/AniAction.java
@@ -207,7 +207,7 @@ public void delete() {
                 .filter(it -> ids.contains(it.getId()))
                 .collect(Collectors.toList());
         if (anis.isEmpty()) {
-            resultErrorMsg("修改失败");
+            resultErrorMsg("删除失败");
             return;
         }
         for (Ani ani : anis) {

diff --git a/src/main/java/ani/rss/download/Transmission.java b/src/main/java/ani/rss/download/Transmission.java
@@ -157,8 +157,13 @@ public Boolean download(Item item, String savePath, File torrentFile, Boolean ov
             torrent = FileUtil.readUtf8String(torrentFile);
             body = StrFormatter.format(body, GsonStatic.toJson(tags), savePath, "", torrent);
         } else {
-            torrent = Base64.encode(torrentFile);
-            body = StrFormatter.format(body, GsonStatic.toJson(tags), savePath, torrent, "");
+            if (torrentFile.length() > 0) {
+                torrent = Base64.encode(torrentFile);
+                body = StrFormatter.format(body, GsonStatic.toJson(tags), savePath, torrent, "");
+            } else {
+                torrent = "magnet:?xt=urn:btih:" + FileUtil.mainName(torrentFile);
+                body = StrFormatter.format(body, GsonStatic.toJson(tags), savePath, "", torrent);
+            }
         }
 
         String id = HttpReq.post(host + "/transmission/rpc", false)

diff --git a/src/main/java/ani/rss/download/qBittorrent.java b/src/main/java/ani/rss/download/qBittorrent.java
@@ -160,7 +160,11 @@ public Boolean download(Item item, String savePath, File torrentFile, Boolean ov
         if ("txt".equals(extName)) {
             httpRequest.form("urls", FileUtil.readUtf8String(torrentFile));
         } else {
-            httpRequest.form("torrents", torrentFile);
+            if (torrentFile.length() > 0) {
+                httpRequest.form("torrents", torrentFile);
+            } else {
+                httpRequest.form("urls", "magnet:?xt=urn:btih:" + FileUtil.mainName(torrentFile));
+            }
         }
         httpRequest.thenFunction(HttpResponse::isOk);