同步 PBH 更改，等待发版

PBH-BTN · Aug 19, 2024 · 2adb93c · 2adb93c
1 parent 771e146
commit 2adb93c
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 7 deletions.
diff --git a/src/main/java/com/ghostchu/peerbanhelper/downloaderplug/biglybt/Plugin.java b/src/main/java/com/ghostchu/peerbanhelper/downloaderplug/biglybt/Plugin.java
@@ -46,7 +46,7 @@ private static TorrentRecord getTorrentRecord(Torrent torrent) {
         if (torrent == null) return null;
         return new TorrentRecord(
                 torrent.getName(),
-                torrent.getHash() == null ? null : java.util.Base64.getEncoder().encodeToString(torrent.getHash()),
+                torrent.getHash() == null ? null : bytesToHex(torrent.getHash()),
                 torrent.getSize(),
                 torrent.getCreationDate(),
                 torrent.getCreatedBy(),
@@ -180,7 +180,7 @@ private void handleBatchUnban(Context ctx) {
 
     public void handleDownload(Context ctx) {
         String arg = ctx.pathParam("infoHash");
-        byte[] infoHash = java.util.Base64.getDecoder().decode(arg);
+        byte[] infoHash = hexToByteArray(arg);
         try {
             Download download = pluginInterface.getDownloadManager().getDownload(infoHash);
             if (download == null) {
@@ -196,7 +196,7 @@ public void handleDownload(Context ctx) {
 
     public void handlePeers(Context ctx) {
         String arg = ctx.pathParam("infoHash");
-        byte[] infoHash = java.util.Base64.getDecoder().decode(arg);
+        byte[] infoHash = hexToByteArray(arg);
         try {
             Download download = pluginInterface.getDownloadManager().getDownload(infoHash);
             if (download == null) {
@@ -297,7 +297,7 @@ private DownloadRecord getDownloadRecord(Download download) {
                 download.isComplete(),
                 download.isChecking(),
                 download.isMoving(),
-                download.getDownloadPeerId() == null ? null : java.util.Base64.getEncoder().encodeToString(download.getDownloadPeerId()).toLowerCase(Locale.ROOT),
+                download.getDownloadPeerId() == null ? null :bytesToHex(download.getDownloadPeerId()).toLowerCase(Locale.ROOT),
                 download.isRemoved());
     }
 
@@ -348,7 +348,7 @@ private PeerRecord getPeerRecord(Peer peer) {
         return new PeerRecord(
                 peer.isMyPeer(),
                 peer.getState(),
-                peer.getId() == null ? null : Base64.getEncoder().encodeToString(peer.getId()),
+                peer.getId() == null ? null : bytesToHex(peer.getId()),
                 peer.getIp(),
                 peer.getTCPListenPort(),
                 peer.getUDPListenPort(),
@@ -391,4 +391,51 @@ private PeerStatsRecord getPeerStatsRecord(PeerStats stats) {
         );
     }
 
+
+    public static String bytesToHex(byte[] bytes) {
+        StringBuilder sb = new StringBuilder();
+        for (byte aByte : bytes) {
+            String hex = Integer.toHexString(aByte & 0xFF);
+            if (hex.length() < 2) {
+                sb.append(0);
+            }
+            sb.append(hex);
+        }
+        return sb.toString();
+    }
+
+    /**
+     * hex字符串转byte数组
+     * @param inHex 待转换的Hex字符串
+     * @return 转换后的byte数组结果
+     */
+    public static byte[] hexToByteArray(String inHex) {
+        int hexlen = inHex.length();
+        byte[] result;
+        if (hexlen % 2 == 1) {
+            //奇数
+            hexlen++;
+            result = new byte[(hexlen / 2)];
+            inHex = "0" + inHex;
+        } else {
+            //偶数
+            result = new byte[(hexlen / 2)];
+        }
+        int j = 0;
+        for (int i = 0; i < hexlen; i += 2) {
+            result[j] = hexToByte(inHex.substring(i, i + 2));
+            j++;
+        }
+        return result;
+    }
+
+    /**
+     * Hex字符串转byte
+     * @param inHex 待转换的Hex字符串
+     * @return 转换后的byte
+     */
+    public static byte hexToByte(String inHex) {
+        return (byte) Integer.parseInt(inHex, 16);
+    }
+
 }
diff --git a/...in/java/com/ghostchu/peerbanhelper/downloaderplug/biglybt/network/wrapper/PeerRecord.java b/...in/java/com/ghostchu/peerbanhelper/downloaderplug/biglybt/network/wrapper/PeerRecord.java
@@ -14,7 +14,7 @@
 public class PeerRecord {
     private boolean myPeer;
     private int state;
-    private String peerIdBase64;
+    private String peerId;
     private String ip;
     private int tcpListenPort;
     private int udpListenPort;

diff --git a/...java/com/ghostchu/peerbanhelper/downloaderplug/biglybt/network/wrapper/TorrentRecord.java b/...java/com/ghostchu/peerbanhelper/downloaderplug/biglybt/network/wrapper/TorrentRecord.java
@@ -13,7 +13,7 @@
 @NoArgsConstructor
 public class TorrentRecord {
     private String name;
-    private String hashBase64;
+    private String infoHash;
     private long size;
     private long creationDate;
     private String createdBy;