复用 setBanList*

PBH-BTN · Sep 16, 2024 · 177d6dc · 177d6dc
1 parent e81f231
commit 177d6dc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 53 deletions.
diff --git a/...a/com/ghostchu/peerbanhelper/downloader/impl/qbittorrent/impl/enhanced/QBittorrentEE.java b/...a/com/ghostchu/peerbanhelper/downloader/impl/qbittorrent/impl/enhanced/QBittorrentEE.java
@@ -3,7 +3,6 @@
 import com.ghostchu.peerbanhelper.downloader.DownloaderLoginResult;
 import com.ghostchu.peerbanhelper.downloader.impl.qbittorrent.AbstractQbittorrent;
 import com.ghostchu.peerbanhelper.downloader.impl.qbittorrent.impl.QBittorrentPreferences;
-import com.ghostchu.peerbanhelper.downloader.impl.qbittorrent.impl.QBittorrentConfigImpl;
 import com.ghostchu.peerbanhelper.peer.Peer;
 import com.ghostchu.peerbanhelper.text.Lang;
 import com.ghostchu.peerbanhelper.text.TranslationComponent;
@@ -15,13 +14,8 @@
 import com.github.mizosoft.methanol.MutableRequest;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import com.google.gson.annotations.SerializedName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.bspfsystems.yamlconfiguration.configuration.ConfigurationSection;
-import org.bspfsystems.yamlconfiguration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -42,7 +36,7 @@ public QBittorrentEE(String name, QBittorrentEEConfigImpl config) {
         if (config.isUseShadowBan()) {
             this.banHandler = new BanHandlerShadowBan(httpClient, name, apiEndpoint);
         } else {
-            this.banHandler = new BanHandlerNormal(httpClient, name, apiEndpoint);
+            this.banHandler = new BanHandlerNormal(this);
         }
     }
 
@@ -143,14 +137,10 @@ interface BanHandler {
 
     public static class BanHandlerNormal implements BanHandler {
 
-        private final HttpClient httpClient;
-        private final String name;
-        private final String apiEndpoint;
+        private final QBittorrentEE downloader;
 
-        public BanHandlerNormal(HttpClient httpClient, String name, String apiEndpoint) {
-            this.httpClient = httpClient;
-            this.name = name;
-            this.apiEndpoint = apiEndpoint;
+        public BanHandlerNormal(QBittorrentEE downloader) {
+            this.downloader = downloader;
         }
 
         @Override
@@ -160,49 +150,12 @@ public boolean test() {
 
         @Override
         public void setBanListIncrement(Collection<BanMetadata> added) {
-            Map<String, StringJoiner> banTasks = new HashMap<>();
-            added.forEach(p -> {
-                StringJoiner joiner = banTasks.getOrDefault(p.getTorrent().getHash(), new StringJoiner("|"));
-                joiner.add(p.getPeer().getRawIp());
-                banTasks.put(p.getTorrent().getHash(), joiner);
-            });
-            banTasks.forEach((hash, peers) -> {
-                try {
-                    HttpResponse<String> request = httpClient.send(MutableRequest
-                                    .POST(apiEndpoint + "/transfer/banPeers", FormBodyPublisher.newBuilder()
-                                            .query("hash", hash)
-                                            .query("peers", peers.toString()).build())
-                                    .header("Content-Type", "application/x-www-form-urlencoded")
-                            , HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
-                    if (request.statusCode() != 200) {
-                        log.error(tlUI(Lang.DOWNLOADER_QB_INCREAMENT_BAN_FAILED, name, apiEndpoint, request.statusCode(), "HTTP ERROR", request.body()));
-                        throw new IllegalStateException("Save qBittorrent banlist error: statusCode=" + request.statusCode());
-                    }
-                } catch (Exception e) {
-                    log.error(tlUI(Lang.DOWNLOADER_QB_INCREAMENT_BAN_FAILED, name, apiEndpoint, "N/A", e.getClass().getName(), e.getMessage()), e);
-                    throw new IllegalStateException(e);
-                }
-            });
+            downloader.setBanListIncrement(added);
         }
 
         @Override
         public void setBanListFull(Collection<PeerAddress> peerAddresses) {
-            StringJoiner joiner = new StringJoiner("\n");
-            peerAddresses.forEach(p -> joiner.add(p.getIp()));
-            try {
-                HttpResponse<String> request = httpClient.send(MutableRequest
-                                .POST(apiEndpoint + "/app/setPreferences", FormBodyPublisher.newBuilder()
-                                        .query("json", JsonUtil.getGson().toJson(Map.of("banned_IPs", joiner.toString()))).build())
-                                .header("Content-Type", "application/x-www-form-urlencoded")
-                        , HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
-                if (request.statusCode() != 200) {
-                    log.error(tlUI(Lang.DOWNLOADER_QB_FAILED_SAVE_BANLIST, name, apiEndpoint, request.statusCode(), "HTTP ERROR", request.body()));
-                    throw new IllegalStateException("Save qBittorrent banlist error: statusCode=" + request.statusCode());
-                }
-            } catch (Exception e) {
-                log.error(tlUI(Lang.DOWNLOADER_QB_FAILED_SAVE_BANLIST, name, apiEndpoint, "N/A", e.getClass().getName(), e.getMessage()), e);
-                throw new IllegalStateException(e);
-            }
+            downloader.setBanListFull(peerAddresses);
         }
     }
 

diff --git a/...tchu/peerbanhelper/downloader/impl/qbittorrent/impl/enhanced/QBittorrentEEConfigImpl.java b/...tchu/peerbanhelper/downloader/impl/qbittorrent/impl/enhanced/QBittorrentEEConfigImpl.java
@@ -44,6 +44,7 @@ public static QBittorrentEEConfigImpl readFromYaml(ConfigurationSection section)
         return config;
     }
 
+    @Override
     public YamlConfiguration saveToYaml() {
         YamlConfiguration section = new YamlConfiguration();
         section.set("type", "qbittorrentee");