From cd646bcac3e81056970834e2c77b3a328322a621 Mon Sep 17 00:00:00 2001 From: Eric Kok Date: Tue, 9 Jun 2015 14:17:59 +0200 Subject: [PATCH] Fixed qBittorrent 3.2+ (API 2.0+) ratio (and with that the uploaded amount) value. Fixes #212. Also improves leechers/seeder counts. --- .../daemon/Qbittorrent/QbittorrentAdapter.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/transdroid/daemon/Qbittorrent/QbittorrentAdapter.java b/app/src/main/java/org/transdroid/daemon/Qbittorrent/QbittorrentAdapter.java index 7bfb100d..20541955 100644 --- a/app/src/main/java/org/transdroid/daemon/Qbittorrent/QbittorrentAdapter.java +++ b/app/src/main/java/org/transdroid/daemon/Qbittorrent/QbittorrentAdapter.java @@ -440,20 +440,30 @@ public class QbittorrentAdapter implements IDaemonAdapter { ArrayList torrents = new ArrayList<>(); for (int i = 0; i < response.length(); i++) { JSONObject tor = response.getJSONObject(i); - int leechers[] = parsePeers(tor.getString("num_leechs")); - int seeders[] = parsePeers(tor.getString("num_seeds")); - double ratio = parseRatio(tor.getString("ratio")); double progress = tor.getDouble("progress"); + int leechers[]; + int seeders[]; + double ratio; long size; int dlspeed; int upspeed; if (apiVersion >= 2) { + leechers = new int[2]; + leechers[0] = tor.getInt("num_leechs"); + leechers[1] = tor.getInt("num_complete") + tor.getInt("num_incomplete"); + seeders = new int[2]; + seeders[0] = tor.getInt("num_seeds"); + seeders[1] = tor.getInt("num_complete"); size = tor.getLong("size"); + ratio = tor.getDouble("ratio"); dlspeed = tor.getInt("dlspeed"); upspeed = tor.getInt("upspeed"); } else { + leechers = parsePeers(tor.getString("num_leechs")); + seeders = parsePeers(tor.getString("num_seeds")); size = parseSize(tor.getString("size")); + ratio = parseRatio(tor.getString("ratio")); dlspeed = parseSpeed(tor.getString("dlspeed")); upspeed = parseSpeed(tor.getString("upspeed")); }