From 68e72d535abd9c0955336fc64d54d16ef36a590e Mon Sep 17 00:00:00 2001 From: Eric Kok Date: Fri, 5 Oct 2018 22:00:04 +0200 Subject: [PATCH] Added real upload amount for qBittorrent (especially useful if files where available before starting the torrent). Fixes #259. Add support to set download location with qBittorrent. Fixes #399. --- .../java/org/transdroid/daemon/Daemon.java | 2 +- .../Qbittorrent/QbittorrentAdapter.java | 28 ++++++------------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/org/transdroid/daemon/Daemon.java b/app/src/main/java/org/transdroid/daemon/Daemon.java index 8c98d2a0..0d1b655f 100644 --- a/app/src/main/java/org/transdroid/daemon/Daemon.java +++ b/app/src/main/java/org/transdroid/daemon/Daemon.java @@ -377,7 +377,7 @@ public enum Daemon { } public static boolean supportsSetDownloadLocation(Daemon type) { - return type == Transmission || type == Deluge || type == DelugeRpc || type == Dummy; + return type == Transmission || type == Deluge || type == DelugeRpc || type == qBittorrent || type == Dummy; } public static boolean supportsSetAlternativeMode(Daemon type) { 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 d61187e6..0982053d 100644 --- a/app/src/main/java/org/transdroid/daemon/Qbittorrent/QbittorrentAdapter.java +++ b/app/src/main/java/org/transdroid/daemon/Qbittorrent/QbittorrentAdapter.java @@ -45,25 +45,7 @@ import org.transdroid.daemon.Torrent; import org.transdroid.daemon.TorrentDetails; import org.transdroid.daemon.TorrentFile; import org.transdroid.daemon.TorrentStatus; -import org.transdroid.daemon.task.AddByFileTask; -import org.transdroid.daemon.task.AddByMagnetUrlTask; -import org.transdroid.daemon.task.AddByUrlTask; -import org.transdroid.daemon.task.DaemonTask; -import org.transdroid.daemon.task.DaemonTaskFailureResult; -import org.transdroid.daemon.task.DaemonTaskResult; -import org.transdroid.daemon.task.DaemonTaskSuccessResult; -import org.transdroid.daemon.task.GetFileListTask; -import org.transdroid.daemon.task.GetFileListTaskSuccessResult; -import org.transdroid.daemon.task.GetStatsTask; -import org.transdroid.daemon.task.GetStatsTaskSuccessResult; -import org.transdroid.daemon.task.GetTorrentDetailsTask; -import org.transdroid.daemon.task.GetTorrentDetailsTaskSuccessResult; -import org.transdroid.daemon.task.RemoveTask; -import org.transdroid.daemon.task.RetrieveTask; -import org.transdroid.daemon.task.RetrieveTaskSuccessResult; -import org.transdroid.daemon.task.SetFilePriorityTask; -import org.transdroid.daemon.task.SetLabelTask; -import org.transdroid.daemon.task.SetTransferRatesTask; +import org.transdroid.daemon.task.*; import org.transdroid.daemon.util.HttpHelper; import java.io.File; @@ -318,6 +300,14 @@ public class QbittorrentAdapter implements IDaemonAdapter { new BasicNameValuePair("category", labelTask.getNewLabel())); return new DaemonTaskSuccessResult(task); + case SetDownloadLocation: + + SetDownloadLocationTask setLocationTask = (SetDownloadLocationTask) task; + makeRequest(log, "/command/setLocation", + new BasicNameValuePair("hashes", task.getTargetTorrent().getUniqueID()), + new BasicNameValuePair("location", setLocationTask.getNewLocation())); + return new DaemonTaskSuccessResult(task); + case SetTransferRates: // Request to set the maximum transfer rates