")).replaceAll("", "").replaceAll("", "").replaceAll("\n", "").split("");
-
- for (int i=2; i")).replaceAll("", "")
+ .replaceAll("
", "").replaceAll("\n", "").split("");
+
+ for (int i = 2; i < parts.length; i++) {
+
String[] subParts = parts[i].replaceAll("| ", "")+1, name.indexOf("<"));
+
+ if (subParts.length == 10 && subParts[1].contains("BT")) {
+
+ String name = subParts[2].substring(subParts[2].indexOf("/panel/task_detail"));
+ name = name.substring(name.indexOf(">") + 1, name.indexOf("<"));
TorrentStatus status = convertStatus(subParts[3]);
String percenDoneStr = subParts[6];
String downloadRateStr = subParts[7];
String uploadRateStr = subParts[8];
-
+
long size = convertSize(subParts[5]);
float percentDone = Float.parseFloat(percenDoneStr.substring(0, percenDoneStr.indexOf("%")));
- long sizeDone = (long) (size * percentDone / 100 );
-
- int rateUp = 1000 * Integer.parseInt(uploadRateStr.substring(0, uploadRateStr.indexOf("kB/s")));
- int rateDown = 1000 * Integer.parseInt(downloadRateStr.substring(0, downloadRateStr.indexOf("kB/s")));
+ long sizeDone = (long) (size * percentDone / 100);
+
+ int rateUp = 1000 * Integer.parseInt(uploadRateStr.substring(0, uploadRateStr.indexOf("kB/s")));
+ int rateDown =
+ 1000 * Integer.parseInt(downloadRateStr.substring(0, downloadRateStr.indexOf("kB/s")));
- // Unfortunately, there is no info for above values providing by BitComet now,
+ // Unfortunately, there is no info for above values providing by BitComet now,
// so we may only send additional request for that
int leechers = 0;
int seeders = 0;
int knownLeechers = 0;
int knownSeeders = 0;
int distributed_copies = 0;
- long sizeUp = 0;
- String comment = "";
- Date dateAdded = new Date();
-
- // Comment code below to speedup torrent listing
+ long sizeUp;
+ String comment;
+ Date dateAdded;
+
+ // Comment code below to speedup torrent listing
// P.S. feature request to extend torrents info is already sent to the BitComet developers
//*
- try {
- // Lets make summary request and parse details
- String summary = makeRequest("/panel/task_detail", new BasicNameValuePair("id", ""+(i-2)), new BasicNameValuePair("show", "summary"));
-
- String[] sumParts = summary.substring(summary.indexOf(" Value ")).split("| ");
- comment = sumParts[7].substring(sumParts[7].indexOf(" | ")+4, sumParts[7].indexOf(" | "));
-
- // Indexes for date and uploaded size
- int idx = 9;
- int sizeIdx = 12;
-
- if (status == TorrentStatus.Downloading) {
- seeders = Integer.parseInt(sumParts[9].substring(sumParts[9].indexOf("Seeds:")+6, sumParts[9].indexOf("(Max possible")));
- leechers = Integer.parseInt(sumParts[9].substring(sumParts[9].indexOf("Peers:")+6, sumParts[9].lastIndexOf("(Max possible")));
- knownSeeders = Integer.parseInt(sumParts[9].substring(sumParts[9].indexOf("(Max possible:")+14, sumParts[9].indexOf(")")));
- knownLeechers = Integer.parseInt(sumParts[9].substring(sumParts[9].lastIndexOf("(Max possible:")+14, sumParts[9].lastIndexOf(")")));
- idx = 13;
- sizeIdx = 16;
- }
-
- DateFormat df = new SimpleDateFormat("yyyy-mm-dd kk:mm:ss");
- dateAdded = df.parse(sumParts[idx].substring(sumParts[idx].indexOf("")+4, sumParts[idx].indexOf(" | |
")));
- //sizeDone = convertSize(sumParts[sizeIdx].substring(sumParts[sizeIdx].indexOf("")+4, sumParts[sizeIdx].indexOf(" (")));
- sizeUp = convertSize(sumParts[sizeIdx+1].substring(sumParts[sizeIdx+1].indexOf(" | ")+4, sumParts[sizeIdx+1].indexOf(" (")));
+ // Lets make summary request and parse details
+ String summary = makeRequest(log, "/panel/task_detail", new BasicNameValuePair("id", "" + (i - 2)),
+ new BasicNameValuePair("show", "summary"));
+
+ String[] sumParts = summary.substring(summary.indexOf(" Value "))
+ .split(" | | ");
+ comment = sumParts[7].substring(sumParts[7].indexOf(" | ") + 4, sumParts[7].indexOf(" |
"));
+
+ // Indexes for date and uploaded size
+ int idx = 9;
+ int sizeIdx = 12;
+
+ if (status == TorrentStatus.Downloading) {
+ seeders = Integer.parseInt(sumParts[9]
+ .substring(sumParts[9].indexOf("Seeds:") + 6, sumParts[9].indexOf("(Max possible")));
+ leechers = Integer.parseInt(sumParts[9].substring(sumParts[9].indexOf("Peers:") + 6,
+ sumParts[9].lastIndexOf("(Max possible")));
+ knownSeeders = Integer.parseInt(sumParts[9]
+ .substring(sumParts[9].indexOf("(Max possible:") + 14, sumParts[9].indexOf(")")));
+ knownLeechers = Integer.parseInt(sumParts[9]
+ .substring(sumParts[9].lastIndexOf("(Max possible:") + 14,
+ sumParts[9].lastIndexOf(")")));
+ idx = 13;
+ sizeIdx = 16;
}
- catch (Exception e) {}
+
+ DateFormat df = new SimpleDateFormat("yyyy-mm-dd kk:mm:ss");
+ dateAdded = df.parse(sumParts[idx]
+ .substring(sumParts[idx].indexOf("") + 4, sumParts[idx].indexOf(" | ")));
+ //sizeDone = convertSize(sumParts[sizeIdx].substring(sumParts[sizeIdx].indexOf("")+4, sumParts[sizeIdx].indexOf(" (")));
+ sizeUp = convertSize(sumParts[sizeIdx + 1]
+ .substring(sumParts[sizeIdx + 1].indexOf(" | ") + 4, sumParts[sizeIdx + 1].indexOf(" (")));
//*
-
+
// Add the parsed torrent to the list
+ // @formatter:off
torrents.add(new Torrent(
(long)i-2,
null,
@@ -482,25 +531,24 @@ public class BitCometAdapter implements IDaemonAdapter {
null,
null,
settings.getType()));
+ // @formatter:on
}
}
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new DaemonException(ExceptionType.UnexpectedResponse, "Invalid BitComet HTTP response.");
}
-
+
return torrents;
}
/**
- * Parse BitComet AJAX response
- * that code was copy-pasted and slightly modified from \Ktorrent\StatsParser.java
- * @param response
- * @return
+ * Parse BitComet AJAX response that code was copy-pasted and slightly modified from \Ktorrent\StatsParser.java
+ * @param response The raw XML data as string that was returned by the server
+ * @return The parsed list of torrents from the XML
* @throws DaemonException
*/
- private ArrayList parseXmlTorrents(String response) throws DaemonException {
-
+ private ArrayList parseXmlTorrents(String response) throws DaemonException {
+
ArrayList torrents = new ArrayList();
try {
@@ -511,8 +559,7 @@ public class BitCometAdapter implements IDaemonAdapter {
// Temp variables to load into torrent objects
int id = 0;
String name = "";
- @SuppressWarnings("unused")
- String hash = "";
+ @SuppressWarnings("unused") String hash = "";
TorrentStatus status = TorrentStatus.Unknown;
long sizeDone = 0;
long sizeUp = 0;
@@ -526,45 +573,47 @@ public class BitCometAdapter implements IDaemonAdapter {
float progress = 0;
String label = "";
Date dateAdded = new Date();
-
+
// Start pulling
int next = xpp.nextTag();
String tagName = xpp.getName();
-
+
while (next != XmlPullParser.END_DOCUMENT) {
-
+
if (next == XmlPullParser.END_TAG && tagName.equals("task")) {
-
+
// End of a 'transfer' item, add gathered torrent data
sizeDone = (long) (totalSize * progress);
+ // @formatter:off
torrents.add(new Torrent(
- id,
+ id,
null, // hash, // we suppose to use simple integer IDs
- name,
- status,
- null,
- rateDown,
- rateUp,
- seeders,
- seedersTotal,
- leechers,
- leechersTotal,
+ name,
+ status,
+ null,
+ rateDown,
+ rateUp,
+ seeders,
+ seedersTotal,
+ leechers,
+ leechersTotal,
(int) ((status == TorrentStatus.Downloading && rateDown != 0)? (totalSize - sizeDone) / rateDown: -1), // eta (in seconds) = (total_size_in_btes - bytes_already_downloaded) / bytes_per_second
- sizeDone,
- sizeUp,
- totalSize,
- progress,
+ sizeDone,
+ sizeUp,
+ totalSize,
+ progress,
0f,
label,
dateAdded,
null,
null, // Not supported in the web interface
settings.getType()));
-
+ // @formatter:on
+
id++; // Stop/start/etc. requests are made by ID, which is the order number in the returned XML list :-S
-
- } else if (next == XmlPullParser.START_TAG && tagName.equals("task")){
-
+
+ } else if (next == XmlPullParser.START_TAG && tagName.equals("task")) {
+
// Start of a new 'transfer' item; reset gathered torrent data
name = "";
//hash = "";
@@ -581,9 +630,9 @@ public class BitCometAdapter implements IDaemonAdapter {
progress = 0;
label = "";
dateAdded = new Date();
-
- } else if (next == XmlPullParser.START_TAG){
-
+
+ } else if (next == XmlPullParser.START_TAG) {
+
// Probably encountered a torrent property, i.e. 'BT'
next = xpp.next();
if (next == XmlPullParser.TEXT) {
@@ -620,13 +669,13 @@ public class BitCometAdapter implements IDaemonAdapter {
}
}
}
-
+
next = xpp.next();
if (next == XmlPullParser.START_TAG || next == XmlPullParser.END_TAG) {
tagName = xpp.getName();
}
}
-
+
} catch (XmlPullParserException e) {
throw new DaemonException(ExceptionType.ParsingFailed, e.toString());
} catch (Exception e) {
@@ -635,33 +684,35 @@ public class BitCometAdapter implements IDaemonAdapter {
return torrents;
}
-
+
/**
- * Parse BitComet HTML page (HTTP response)
- * @param response
- * @return
+ * Parse BitComet HTML page (HTTP response)
+ * @param response The raw HTML response from the server
+ * @return The parsed list of files in the torrent from the raw HTML
* @throws DaemonException
*/
private ArrayList parseHttpTorrentFiles(String response, String hash) throws DaemonException {
-
+
// Parse response
ArrayList torrentfiles = new ArrayList();
-
- try {
-
- String[] files = response.substring(response.indexOf("Operation Method")+27, response.lastIndexOf("")).replaceAll(" | ", "").replaceAll("", "").split("");
-
+
+ try {
+
+ String[] files = response.substring(response.indexOf("Operation Method") + 27,
+ response.lastIndexOf("")).replaceAll("", "").replaceAll("
", "").split("");
+
for (int i = 1; i < files.length; i++) {
-
- String[] fileDetails = files[i].replace(">","").split("", "").split("
- *
*/
public class DLinkRouterBTAdapter implements IDaemonAdapter {
@@ -115,54 +114,54 @@ public class DLinkRouterBTAdapter implements IDaemonAdapter {
}
@Override
- public DaemonTaskResult executeTask(DaemonTask task) {
+ public DaemonTaskResult executeTask(Log log, DaemonTask task) {
try {
switch (task.getMethod()) {
- case Retrieve:
+ case Retrieve:
- // Request all torrents from server
- JSONObject result = makeRequest(API_GET);
- return new RetrieveTaskSuccessResult((RetrieveTask) task, parseJsonRetrieveTorrents(result),null);
+ // Request all torrents from server
+ JSONObject result = makeRequest(log, API_GET);
+ return new RetrieveTaskSuccessResult((RetrieveTask) task, parseJsonRetrieveTorrents(result), null);
- case GetFileList:
+ case GetFileList:
- // Request all details for a specific torrent
- JSONObject result2 = makeRequest(API_GET_FILES + task.getTargetTorrent().getUniqueID());
- return new GetFileListTaskSuccessResult((GetFileListTask) task, parseJsonFileList(result2, task
- .getTargetTorrent().getUniqueID()));
+ // Request all details for a specific torrent
+ JSONObject result2 = makeRequest(log, API_GET_FILES + task.getTargetTorrent().getUniqueID());
+ return new GetFileListTaskSuccessResult((GetFileListTask) task,
+ parseJsonFileList(result2, task.getTargetTorrent().getUniqueID()));
- case AddByFile:
+ case AddByFile:
- // Add a torrent to the server by sending the contents of a local .torrent file
- String file = ((AddByFileTask) task).getFile();
+ // Add a torrent to the server by sending the contents of a local .torrent file
+ String file = ((AddByFileTask) task).getFile();
- // put .torrent file's data into the request
- makeRequest(API_ADD_BY_FILE, new File(URI.create(file)));
- return new DaemonTaskSuccessResult(task);
+ // put .torrent file's data into the request
+ makeRequest(log, API_ADD_BY_FILE, new File(URI.create(file)));
+ return new DaemonTaskSuccessResult(task);
- case AddByUrl:
+ case AddByUrl:
- // Request to add a torrent by URL
- String url = ((AddByUrlTask) task).getUrl();
- makeRequest(API_ADD + url);
- return new DaemonTaskSuccessResult(task);
+ // Request to add a torrent by URL
+ String url = ((AddByUrlTask) task).getUrl();
+ makeRequest(log, API_ADD + url);
+ return new DaemonTaskSuccessResult(task);
- case Remove:
+ case Remove:
- // Remove a torrent
- RemoveTask removeTask = (RemoveTask) task;
- makeRequest(API_REMOVE + removeTask.getTargetTorrent().getUniqueID()
- + (removeTask.includingData() ? API_DEL_DATA + "yes" : ""), false);
- return new DaemonTaskSuccessResult(task);
+ // Remove a torrent
+ RemoveTask removeTask = (RemoveTask) task;
+ makeRequest(log, API_REMOVE + removeTask.getTargetTorrent().getUniqueID() +
+ (removeTask.includingData() ? API_DEL_DATA + "yes" : ""), false);
+ return new DaemonTaskSuccessResult(task);
// case Stop:
- case Pause:
+ case Pause:
- // Pause a torrent
- PauseTask pauseTask = (PauseTask) task;
- makeRequest(API_STOP + pauseTask.getTargetTorrent().getUniqueID(), false);
- return new DaemonTaskSuccessResult(task);
+ // Pause a torrent
+ PauseTask pauseTask = (PauseTask) task;
+ makeRequest(log, API_STOP + pauseTask.getTargetTorrent().getUniqueID(), false);
+ return new DaemonTaskSuccessResult(task);
// case PauseAll:
@@ -172,12 +171,12 @@ public class DLinkRouterBTAdapter implements IDaemonAdapter {
// return new DaemonTaskSuccessResult(task);
// case Start:
- case Resume:
+ case Resume:
- // Resume a torrent
- ResumeTask resumeTask = (ResumeTask) task;
- makeRequest(API_START + resumeTask.getTargetTorrent().getUniqueID(), false);
- return new DaemonTaskSuccessResult(task);
+ // Resume a torrent
+ ResumeTask resumeTask = (ResumeTask) task;
+ makeRequest(log, API_START + resumeTask.getTargetTorrent().getUniqueID(), false);
+ return new DaemonTaskSuccessResult(task);
// case ResumeAll:
@@ -206,10 +205,9 @@ public class DLinkRouterBTAdapter implements IDaemonAdapter {
// makeRequest( RPC_METHOD_SESSIONSET );
// return new DaemonTaskSuccessResult(task);
- default:
- return new DaemonTaskFailureResult(task, new DaemonException(ExceptionType.MethodUnsupported, task
- .getMethod()
- + " is not supported by " + getType()));
+ default:
+ return new DaemonTaskFailureResult(task, new DaemonException(ExceptionType.MethodUnsupported,
+ task.getMethod() + " is not supported by " + getType()));
}
} catch (JSONException e) {
return new DaemonTaskFailureResult(task, new DaemonException(ExceptionType.ParsingFailed, e.toString()));
@@ -218,31 +216,31 @@ public class DLinkRouterBTAdapter implements IDaemonAdapter {
}
}
- private JSONObject makeRequest(String requestUrl, File upload) throws DaemonException {
- return makeRequest(requestUrl, false, upload);
+ private JSONObject makeRequest(Log log, String requestUrl, File upload) throws DaemonException {
+ return makeRequest(log, requestUrl, false, upload);
}
- private JSONObject makeRequest(String requestUrl) throws DaemonException {
- return makeRequest(requestUrl, true, null);
+ private JSONObject makeRequest(Log log, String requestUrl) throws DaemonException {
+ return makeRequest(log, requestUrl, true, null);
}
- private JSONObject makeRequest(String requestUrl, boolean hasRespond) throws DaemonException {
- return makeRequest(requestUrl, hasRespond, null);
+ private JSONObject makeRequest(Log log, String requestUrl, boolean hasRespond) throws DaemonException {
+ return makeRequest(log, requestUrl, hasRespond, null);
}
- private JSONObject makeRequest(String requestUrl, boolean hasRespond, File upload) throws DaemonException {
+ private JSONObject makeRequest(Log log, String requestUrl, boolean hasRespond, File upload) throws DaemonException {
try {
// Initialise the HTTP client
if (httpclient == null) {
- initialise(HttpHelper.DEFAULT_CONNECTION_TIMEOUT);
+ initialise();
}
// Setup request using POST stream with URL and data
HttpPost httppost = new HttpPost(buildWebUIUrl() + requestUrl);
if (upload != null) {
- Part[] parts = { new FilePart(BT_ADD_BY_FILE, upload) };
+ Part[] parts = {new FilePart(BT_ADD_BY_FILE, upload)};
httppost.setEntity(new MultipartEntity(parts, httppost.getParams()));
}
@@ -264,8 +262,9 @@ public class DLinkRouterBTAdapter implements IDaemonAdapter {
response = httpclient.execute(httppost);
}
- if (!hasRespond)
+ if (!hasRespond) {
return null;
+ }
HttpEntity entity = response.getEntity();
if (entity != null) {
@@ -276,24 +275,24 @@ public class DLinkRouterBTAdapter implements IDaemonAdapter {
JSONObject json = new JSONObject(result);
instream.close();
- DLog.d(LOG_NAME, "Success: "
- + (result.length() > 300 ? result.substring(0, 300) + "... (" + result.length() + " chars)"
- : result));
+ log.d(LOG_NAME, "Success: " +
+ (result.length() > 300 ? result.substring(0, 300) + "... (" + result.length() + " chars)" :
+ result));
// Return the JSON object
return json;
}
- DLog.d(LOG_NAME, "Error: No entity in HTTP response");
+ log.d(LOG_NAME, "Error: No entity in HTTP response");
throw new DaemonException(ExceptionType.UnexpectedResponse, "No HTTP entity object in response.");
} catch (DaemonException e) {
throw e;
} catch (JSONException e) {
- DLog.d(LOG_NAME, "Error: " + e.toString());
+ log.d(LOG_NAME, "Error: " + e.toString());
throw new DaemonException(ExceptionType.UnexpectedResponse, e.toString());
} catch (Exception e) {
- DLog.d(LOG_NAME, "Error: " + e.toString());
+ log.d(LOG_NAME, "Error: " + e.toString());
throw new DaemonException(ExceptionType.ConnectionError, e.toString());
}
@@ -301,39 +300,40 @@ public class DLinkRouterBTAdapter implements IDaemonAdapter {
/**
* Instantiates an HTTP client with proper credentials that can be used for all Transmission requests.
- *
- * @param connectionTimeout
- * The connection timeout in milliseconds
- * @throws DaemonException
- * On conflicting or missing settings
+ * @throws DaemonException On conflicting or missing settings
*/
- private void initialise(int connectionTimeout) throws DaemonException {
+ private void initialise() throws DaemonException {
httpclient = HttpHelper.createStandardHttpClient(settings, true);
}
/**
* Build the URL of the Transmission web UI from the user settings.
- *
* @return The URL of the RPC API
*/
private String buildWebUIUrl() {
- return (settings.getSsl() ? "https://" : "http://") + settings.getAddress() + ":" + settings.getPort()
- + PATH_TO_API;
+ return (settings.getSsl() ? "https://" : "http://") + settings.getAddress() + ":" + settings.getPort() +
+ PATH_TO_API;
}
private TorrentStatus convertStatus(String state) {
- if ("allocating".equals(state))
+ if ("allocating".equals(state)) {
return TorrentStatus.Checking;
- if ("seeding".equals(state))
+ }
+ if ("seeding".equals(state)) {
return TorrentStatus.Seeding;
- if ("finished".equals(state))
+ }
+ if ("finished".equals(state)) {
return TorrentStatus.Downloading;
- if ("connecting_to_tracker".equals(state))
+ }
+ if ("connecting_to_tracker".equals(state)) {
return TorrentStatus.Checking;
- if ("queued_for_checking".equals(state))
+ }
+ if ("queued_for_checking".equals(state)) {
return TorrentStatus.Queued;
- if ("downloading".equals(state))
+ }
+ if ("downloading".equals(state)) {
return TorrentStatus.Downloading;
+ }
return TorrentStatus.Unknown;
}
@@ -345,15 +345,18 @@ public class DLinkRouterBTAdapter implements IDaemonAdapter {
for (int i = 0; i < rarray.length(); i++) {
JSONObject tor = rarray.getJSONObject(i);
// Add the parsed torrent to the list
- TorrentStatus status = TorrentStatus.Unknown;
- if (tor.getInt(BT_STOPPED) == 1)
+ TorrentStatus status;
+ if (tor.getInt(BT_STOPPED) == 1) {
status = TorrentStatus.Paused;
- else
+ } else {
status = convertStatus(tor.getString(BT_STATE));
- int eta = (int) (tor.getLong(BT_SIZE) / (tor.getInt(BT_DOWNLOAD_RATE) + 1));
- if (0 > eta)
+ }
+ int eta = (int) ((tor.getLong(BT_SIZE) - tor.getLong(BT_DONE)) / (tor.getInt(BT_DOWNLOAD_RATE) + 1));
+ if (0 > eta) {
eta = -1;
+ }
+ // @formatter:off
Torrent new_t = new Torrent(
i,
tor.getString(BT_HASH),
@@ -366,17 +369,18 @@ public class DLinkRouterBTAdapter implements IDaemonAdapter {
tor.getInt(BT_PEERS_TOTAL),
tor.getInt(BT_SEEDS_CONNECTED),
tor.getInt(BT_SEEDS_TOTAL),
- (int) ((tor.getLong(BT_SIZE) - tor.getLong(BT_DONE)) / (tor.getInt(BT_DOWNLOAD_RATE) + 1)),
+ eta,
tor.getLong(BT_DONE),
tor.getLong(BT_PAYLOAD_UPLOAD),
tor.getLong(BT_SIZE),
- (float) (tor.getLong(BT_DONE) / (float) tor.getLong(BT_SIZE)),
+ tor.getLong(BT_DONE) / (float) tor.getLong(BT_SIZE),
Float.parseFloat(tor.getString(BT_COPYS)),
null,
null,
null,
null,
settings.getType());
+ // @formatter:on
torrents.add(new_t);
}
@@ -395,15 +399,16 @@ public class DLinkRouterBTAdapter implements IDaemonAdapter {
JSONArray files = jobj.getJSONArray(hash); // "Hash id"
for (int i = 0; i < files.length(); i++) {
JSONObject file = files.getJSONObject(i);
+ // @formatter:off
torrentfiles.add(new TorrentFile(
- i + "",
- // TODO: How is an individual file identified? Index in the array?
+ String.valueOf(i),
file.getString(BT_FILE_NAME),
file.getString(BT_FILE_NAME),
null, // Not supported?
file.getLong(BT_FILE_SIZE),
file.getLong(BT_FILE_DONE),
convertTransmissionPriority(file.getInt(BT_FILE_PRIORITY))));
+ // @formatter:on
}
}
@@ -414,12 +419,12 @@ public class DLinkRouterBTAdapter implements IDaemonAdapter {
private Priority convertTransmissionPriority(int priority) {
switch (priority) {
- case 1:
- return Priority.High;
- case -1:
- return Priority.Low;
- default:
- return Priority.Normal;
+ case 1:
+ return Priority.High;
+ case -1:
+ return Priority.Low;
+ default:
+ return Priority.Normal;
}
}
diff --git a/app/src/main/java/org/transdroid/daemon/Daemon.java b/app/src/main/java/org/transdroid/daemon/Daemon.java
index e4d5cc92..c19fe717 100644
--- a/app/src/main/java/org/transdroid/daemon/Daemon.java
+++ b/app/src/main/java/org/transdroid/daemon/Daemon.java
@@ -306,7 +306,7 @@ public enum Daemon {
}
public static boolean supportsSetTransferRates(Daemon type) {
- return type == Deluge || type == Transmission || type == uTorrent || type == BitTorrent || type == Deluge || type == rTorrent || type == Vuze || type == BuffaloNas || type == BitComet || type == Aria2 || type == Dummy;
+ return type == Deluge || type == Transmission || type == uTorrent || type == BitTorrent || type == rTorrent || type == Vuze || type == BuffaloNas || type == BitComet || type == Aria2 || type == Dummy;
}
public static boolean supportsAddByFile(Daemon type) {
@@ -351,7 +351,7 @@ public enum Daemon {
}
public static boolean supportsForceRecheck(Daemon type) {
- return type == uTorrent || type == BitTorrent || type == Deluge || type == rTorrent || type == Dummy;
+ return type == uTorrent || type == BitTorrent || type == Deluge || type == rTorrent || type == Transmission || type == Dummy;
}
public static boolean supportsExtraPassword(Daemon type) {
diff --git a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeAdapter.java b/app/src/main/java/org/transdroid/daemon/Deluge/DelugeAdapter.java
index 2c7972dd..2d0be0a0 100644
--- a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/Deluge/DelugeAdapter.java
@@ -17,19 +17,12 @@
*/
package org.transdroid.daemon.Deluge;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import com.android.internalcopy.http.multipart.FilePart;
+import com.android.internalcopy.http.multipart.MultipartEntity;
+import com.android.internalcopy.http.multipart.Part;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
-import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.cookie.Cookie;
@@ -38,6 +31,7 @@ import org.apache.http.impl.client.DefaultHttpClient;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
+import org.transdroid.core.gui.log.Log;
import org.transdroid.daemon.Daemon;
import org.transdroid.daemon.DaemonException;
import org.transdroid.daemon.DaemonException.ExceptionType;
@@ -70,18 +64,21 @@ import org.transdroid.daemon.task.SetFilePriorityTask;
import org.transdroid.daemon.task.SetLabelTask;
import org.transdroid.daemon.task.SetTrackersTask;
import org.transdroid.daemon.task.SetTransferRatesTask;
-import org.transdroid.daemon.util.DLog;
import org.transdroid.daemon.util.HttpHelper;
-import com.android.internalcopy.http.multipart.FilePart;
-import com.android.internalcopy.http.multipart.MultipartEntity;
-import com.android.internalcopy.http.multipart.Part;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* The daemon adapter from the Deluge torrent client.
- *
* @author erickok
- *
*/
public class DelugeAdapter implements IDaemonAdapter {
@@ -89,7 +86,7 @@ public class DelugeAdapter implements IDaemonAdapter {
private static final String PATH_TO_RPC = "/json";
private static final String PATH_TO_UPLOAD = "/upload";
-
+
private static final String RPC_ID = "id";
private static final String RPC_METHOD = "method";
private static final String RPC_PARAMS = "params";
@@ -141,34 +138,30 @@ public class DelugeAdapter implements IDaemonAdapter {
private static final String RPC_LABEL = "label";
private static final String RPC_TRACKERS = "trackers";
private static final String RPC_TRACKER_STATUS = "tracker_status";
-
+ private static final String[] RPC_FIELDS_ARRAY =
+ new String[]{RPC_NAME, RPC_STATUS, RPC_SAVEPATH, RPC_RATEDOWNLOAD, RPC_RATEUPLOAD, RPC_NUMPEERS,
+ RPC_NUMSEEDS, RPC_TOTALPEERS, RPC_TOTALSEEDS, RPC_ETA, RPC_DOWNLOADEDEVER, RPC_UPLOADEDEVER,
+ RPC_TOTALSIZE, RPC_PARTDONE, RPC_LABEL, RPC_MESSAGE, RPC_TIMEADDED, RPC_TRACKER_STATUS};
private static final String RPC_DETAILS = "files";
private static final String RPC_INDEX = "index";
private static final String RPC_PATH = "path";
private static final String RPC_SIZE = "size";
private static final String RPC_FILEPROGRESS = "file_progress";
private static final String RPC_FILEPRIORITIES = "file_priorities";
-
- private static final String[] RPC_FIELDS_ARRAY = new String[] {
- RPC_NAME, RPC_STATUS, RPC_SAVEPATH, RPC_RATEDOWNLOAD, RPC_RATEUPLOAD,
- RPC_NUMPEERS, RPC_NUMSEEDS, RPC_TOTALPEERS,
- RPC_TOTALSEEDS, RPC_ETA, RPC_DOWNLOADEDEVER, RPC_UPLOADEDEVER,
- RPC_TOTALSIZE, RPC_PARTDONE, RPC_LABEL, RPC_MESSAGE, RPC_TIMEADDED, RPC_TRACKER_STATUS };
-
private DaemonSettings settings;
private DefaultHttpClient httpclient;
private Cookie sessionCookie;
- private int version = -1;
-
+ private int version = -1;
+
public DelugeAdapter(DaemonSettings settings) {
this.settings = settings;
}
- public JSONArray AddTorrentByFile(String file) throws JSONException, ClientProtocolException, IOException, DaemonException {
+ public JSONArray addTorrentByFile(String file, Log log) throws JSONException, IOException, DaemonException {
String url = buildWebUIUrl() + PATH_TO_UPLOAD;
-
- DLog.d(LOG_NAME, "Uploading a file to the Deluge daemon: " + url);
+
+ log.d(LOG_NAME, "Uploading a file to the Deluge daemon: " + url);
// Initialise the HTTP client
if (httpclient == null) {
@@ -178,7 +171,7 @@ public class DelugeAdapter implements IDaemonAdapter {
// Setup client using POST
HttpPost httppost = new HttpPost(url);
File upload = new File(URI.create(file));
- Part[] parts = { new FilePart(RPC_FILE, upload) };
+ Part[] parts = {new FilePart(RPC_FILE, upload)};
httppost.setEntity(new MultipartEntity(parts, httppost.getParams()));
// Make request
@@ -199,17 +192,17 @@ public class DelugeAdapter implements IDaemonAdapter {
fileu.put("options", new JSONArray());
files.put(fileu);
params.put(files);
-
+
return params;
-
+
}
@Override
- public DaemonTaskResult executeTask(DaemonTask task) {
-
+ public DaemonTaskResult executeTask(Log log, DaemonTask task) {
+
try {
- ensureVersion();
-
+ ensureVersion(log);
+
JSONArray params = new JSONArray();
// Array of the fields needed for files listing calls
@@ -217,202 +210,209 @@ public class DelugeAdapter implements IDaemonAdapter {
ffields.put(RPC_DETAILS);
ffields.put(RPC_FILEPROGRESS);
ffields.put(RPC_FILEPRIORITIES);
-
+
switch (task.getMethod()) {
- case Retrieve:
+ case Retrieve:
- // Request all torrents from server
- JSONArray fields = new JSONArray();
- for (String field : RPC_FIELDS_ARRAY) {
- fields.put(field);
- }
- params.put(fields); // keys
- params.put(new JSONArray()); // filter_dict
- // params.put(-1); // cache_id
-
- JSONObject result = makeRequest(buildRequest(RPC_METHOD_GET, params));
- return new RetrieveTaskSuccessResult((RetrieveTask) task, parseJsonRetrieveTorrents(result.getJSONObject(RPC_RESULT)), parseJsonRetrieveLabels(result.getJSONObject(RPC_RESULT)));
-
- case GetTorrentDetails:
-
- // Array of the fields needed for files listing calls
- JSONArray dfields = new JSONArray();
- dfields.put(RPC_TRACKERS);
- dfields.put(RPC_TRACKER_STATUS);
-
- // Request file listing of a torrent
- params.put(task.getTargetTorrent().getUniqueID()); // torrent_id
- params.put(dfields); // keys
-
- JSONObject dinfo = makeRequest(buildRequest(RPC_METHOD_STATUS, params));
- return new GetTorrentDetailsTaskSuccessResult((GetTorrentDetailsTask) task, parseJsonTorrentDetails(dinfo.getJSONObject(RPC_RESULT)));
-
- case GetFileList:
-
- // Request file listing of a torrent
- params.put(task.getTargetTorrent().getUniqueID()); // torrent_id
- params.put(ffields); // keys
-
- JSONObject finfo = makeRequest(buildRequest(RPC_METHOD_STATUS, params));
- return new GetFileListTaskSuccessResult((GetFileListTask) task, parseJsonFileListing(finfo.getJSONObject(RPC_RESULT), task.getTargetTorrent()));
-
- case AddByFile:
-
- // Request to add a torrent by local .torrent file
- String file = ((AddByFileTask)task).getFile();
- makeRequest(buildRequest(RPC_METHOD_ADD_FILE, AddTorrentByFile(file)));
- return new DaemonTaskSuccessResult(task);
-
- case AddByUrl:
-
- // Request to add a torrent by URL
- String url = ((AddByUrlTask)task).getUrl();
- params.put(url);
- params.put(new JSONArray());
-
- makeRequest(buildRequest(RPC_METHOD_ADD, params));
- return new DaemonTaskSuccessResult(task);
-
- case AddByMagnetUrl:
-
- // Request to add a magnet link by URL
- String magnet = ((AddByMagnetUrlTask)task).getUrl();
- // Deluge doesn't support (fully) application/x-www-form-urlencoded magnet links
- magnet = URLDecoder.decode(magnet, "UTF-8");
- params.put(magnet);
- params.put(new JSONArray());
-
- makeRequest(buildRequest(RPC_METHOD_ADD_MAGNET, params));
- return new DaemonTaskSuccessResult(task);
-
- case Remove:
-
- // Remove a torrent
- RemoveTask removeTask = (RemoveTask) task;
- params.put(removeTask.getTargetTorrent().getUniqueID());
- params.put(removeTask.includingData());
- makeRequest(buildRequest(RPC_METHOD_REMOVE, params));
- return new DaemonTaskSuccessResult(task);
-
- case Pause:
-
- // Pause a torrent
- PauseTask pauseTask = (PauseTask) task;
- makeRequest(buildRequest(RPC_METHOD_PAUSE,
- ((new JSONArray()).put((new JSONArray()).put(pauseTask.getTargetTorrent().getUniqueID())))));
- return new DaemonTaskSuccessResult(task);
-
- case PauseAll:
-
- // Resume all torrents
- makeRequest(buildRequest(RPC_METHOD_PAUSE_ALL, null));
- return new DaemonTaskSuccessResult(task);
-
- case Resume:
-
- // Resume a torrent
- ResumeTask resumeTask = (ResumeTask) task;
- makeRequest(buildRequest(RPC_METHOD_RESUME,
- ((new JSONArray()).put((new JSONArray()).put(resumeTask.getTargetTorrent().getUniqueID())))));
- return new DaemonTaskSuccessResult(task);
-
- case ResumeAll:
-
- // Resume all torrents
- makeRequest(buildRequest(RPC_METHOD_RESUME_ALL, null));
- return new DaemonTaskSuccessResult(task);
-
- case SetFilePriorities:
-
- // Set the priorities of files in a specific torrent
- SetFilePriorityTask prioTask = (SetFilePriorityTask) task;
-
- // We first need a listing of all the files (because we can only set the priorities all at once)
- params.put(task.getTargetTorrent().getUniqueID()); // torrent_id
- params.put(ffields); // keys
- JSONObject pinfo = makeRequest(buildRequest(RPC_METHOD_STATUS, params));
- ArrayList pfiles = parseJsonFileListing(pinfo.getJSONObject(RPC_RESULT), prioTask.getTargetTorrent());
-
- // Now prepare the new list of priorities
- params = new JSONArray();
- params.put(task.getTargetTorrent().getUniqueID()); // torrent_id
- JSONArray pfields = new JSONArray();
- // Override the priorities in the just retrieved list of all files
- for (TorrentFile pfile : pfiles) {
- Priority newPriority = pfile.getPriority();
- for (TorrentFile forFile : prioTask.getForFiles()) {
- if (forFile.getKey().equals(pfile.getKey())) {
- // This is a file that we want to assign a new priority to
- newPriority = prioTask.getNewPriority();
- break;
+ // Request all torrents from server
+ JSONArray fields = new JSONArray();
+ for (String field : RPC_FIELDS_ARRAY) {
+ fields.put(field);
+ }
+ params.put(fields); // keys
+ params.put(new JSONArray()); // filter_dict
+ // params.put(-1); // cache_id
+
+ JSONObject result = makeRequest(buildRequest(RPC_METHOD_GET, params), log);
+ return new RetrieveTaskSuccessResult((RetrieveTask) task,
+ parseJsonRetrieveTorrents(result.getJSONObject(RPC_RESULT)),
+ parseJsonRetrieveLabels(result.getJSONObject(RPC_RESULT)));
+
+ case GetTorrentDetails:
+
+ // Array of the fields needed for files listing calls
+ JSONArray dfields = new JSONArray();
+ dfields.put(RPC_TRACKERS);
+ dfields.put(RPC_TRACKER_STATUS);
+
+ // Request file listing of a torrent
+ params.put(task.getTargetTorrent().getUniqueID()); // torrent_id
+ params.put(dfields); // keys
+
+ JSONObject dinfo = makeRequest(buildRequest(RPC_METHOD_STATUS, params), log);
+ return new GetTorrentDetailsTaskSuccessResult((GetTorrentDetailsTask) task,
+ parseJsonTorrentDetails(dinfo.getJSONObject(RPC_RESULT)));
+
+ case GetFileList:
+
+ // Request file listing of a torrent
+ params.put(task.getTargetTorrent().getUniqueID()); // torrent_id
+ params.put(ffields); // keys
+
+ JSONObject finfo = makeRequest(buildRequest(RPC_METHOD_STATUS, params), log);
+ return new GetFileListTaskSuccessResult((GetFileListTask) task,
+ parseJsonFileListing(finfo.getJSONObject(RPC_RESULT), task.getTargetTorrent()));
+
+ case AddByFile:
+
+ // Request to add a torrent by local .torrent file
+ String file = ((AddByFileTask) task).getFile();
+ makeRequest(buildRequest(RPC_METHOD_ADD_FILE, addTorrentByFile(file, log)), log);
+ return new DaemonTaskSuccessResult(task);
+
+ case AddByUrl:
+
+ // Request to add a torrent by URL
+ String url = ((AddByUrlTask) task).getUrl();
+ params.put(url);
+ params.put(new JSONArray());
+
+ makeRequest(buildRequest(RPC_METHOD_ADD, params), log);
+ return new DaemonTaskSuccessResult(task);
+
+ case AddByMagnetUrl:
+
+ // Request to add a magnet link by URL
+ String magnet = ((AddByMagnetUrlTask) task).getUrl();
+ // Deluge doesn't support (fully) application/x-www-form-urlencoded magnet links
+ magnet = URLDecoder.decode(magnet, "UTF-8");
+ params.put(magnet);
+ params.put(new JSONArray());
+
+ makeRequest(buildRequest(RPC_METHOD_ADD_MAGNET, params), log);
+ return new DaemonTaskSuccessResult(task);
+
+ case Remove:
+
+ // Remove a torrent
+ RemoveTask removeTask = (RemoveTask) task;
+ params.put(removeTask.getTargetTorrent().getUniqueID());
+ params.put(removeTask.includingData());
+ makeRequest(buildRequest(RPC_METHOD_REMOVE, params), log);
+ return new DaemonTaskSuccessResult(task);
+
+ case Pause:
+
+ // Pause a torrent
+ PauseTask pauseTask = (PauseTask) task;
+ makeRequest(buildRequest(RPC_METHOD_PAUSE, ((new JSONArray())
+ .put((new JSONArray()).put(pauseTask.getTargetTorrent().getUniqueID())))), log);
+ return new DaemonTaskSuccessResult(task);
+
+ case PauseAll:
+
+ // Resume all torrents
+ makeRequest(buildRequest(RPC_METHOD_PAUSE_ALL, null), log);
+ return new DaemonTaskSuccessResult(task);
+
+ case Resume:
+
+ // Resume a torrent
+ ResumeTask resumeTask = (ResumeTask) task;
+ makeRequest(buildRequest(RPC_METHOD_RESUME, ((new JSONArray())
+ .put((new JSONArray()).put(resumeTask.getTargetTorrent().getUniqueID())))), log);
+ return new DaemonTaskSuccessResult(task);
+
+ case ResumeAll:
+
+ // Resume all torrents
+ makeRequest(buildRequest(RPC_METHOD_RESUME_ALL, null), log);
+ return new DaemonTaskSuccessResult(task);
+
+ case SetFilePriorities:
+
+ // Set the priorities of files in a specific torrent
+ SetFilePriorityTask prioTask = (SetFilePriorityTask) task;
+
+ // We first need a listing of all the files (because we can only set the priorities all at once)
+ params.put(task.getTargetTorrent().getUniqueID()); // torrent_id
+ params.put(ffields); // keys
+ JSONObject pinfo = makeRequest(buildRequest(RPC_METHOD_STATUS, params), log);
+ ArrayList pfiles =
+ parseJsonFileListing(pinfo.getJSONObject(RPC_RESULT), prioTask.getTargetTorrent());
+
+ // Now prepare the new list of priorities
+ params = new JSONArray();
+ params.put(task.getTargetTorrent().getUniqueID()); // torrent_id
+ JSONArray pfields = new JSONArray();
+ // Override the priorities in the just retrieved list of all files
+ for (TorrentFile pfile : pfiles) {
+ Priority newPriority = pfile.getPriority();
+ for (TorrentFile forFile : prioTask.getForFiles()) {
+ if (forFile.getKey().equals(pfile.getKey())) {
+ // This is a file that we want to assign a new priority to
+ newPriority = prioTask.getNewPriority();
+ break;
+ }
}
+ pfields.put(convertPriority(newPriority));
}
- pfields.put(convertPriority(newPriority));
- }
- params.put(pfields); // keys
-
- // Make a single call to set the priorities on all files at once
- makeRequest(buildRequest(RPC_METHOD_SETFILE, params));
- return new DaemonTaskSuccessResult(task);
-
- case SetDownloadLocation:
-
- // Set the download location of some torrent
- SetDownloadLocationTask sdlTask = (SetDownloadLocationTask) task;
- // This works, but does not move the torrent
- //makeRequest(buildRequest(RPC_METHOD_SETOPTIONS, buildSetTorrentOptions(
- // sdlTask.getTargetTorrent().getUniqueID(), RPC_DOWNLOADLOCATION, sdlTask.getNewLocation())));
- params.put(new JSONArray().put(task.getTargetTorrent().getUniqueID()));
- params.put(sdlTask.getNewLocation());
- makeRequest(buildRequest(RPC_METHOD_MOVESTORAGE, params));
- return new DaemonTaskSuccessResult(task);
-
- case SetTransferRates:
-
- // Request to set the maximum transfer rates
- SetTransferRatesTask ratesTask = (SetTransferRatesTask) task;
- JSONObject map = new JSONObject();
- map.put(RPC_MAXUPLOAD, (ratesTask.getUploadRate() == null? -1: ratesTask.getUploadRate().intValue()));
- map.put(RPC_MAXDOWNLOAD, (ratesTask.getDownloadRate() == null? -1: ratesTask.getDownloadRate().intValue()));
-
- makeRequest(buildRequest(RPC_METHOD_SETCONFIG, (new JSONArray()).put(map)));
- return new DaemonTaskSuccessResult(task);
-
- case SetLabel:
-
- // Request to set the label
- SetLabelTask labelTask = (SetLabelTask) task;
- params.put(task.getTargetTorrent().getUniqueID());
- params.put(labelTask.getNewLabel() == null ? "" : labelTask.getNewLabel());
- makeRequest(buildRequest(RPC_METHOD_SETLABEL, params));
- return new DaemonTaskSuccessResult(task);
-
- case SetTrackers:
-
- // Set the trackers of some torrent
- SetTrackersTask trackersTask = (SetTrackersTask) task;
- JSONArray trackers = new JSONArray();
- // Build an JSON arrays of objcts that each have a tier (order) number and an url
- for (int i = 0; i < trackersTask.getNewTrackers().size(); i++) {
- JSONObject trackerObj = new JSONObject();
- trackerObj.put("tier", i);
- trackerObj.put("url", trackersTask.getNewTrackers().get(i));
- trackers.put(trackerObj);
- }
- params.put(new JSONArray().put(task.getTargetTorrent().getUniqueID()));
- params.put(trackers);
- makeRequest(buildRequest(RPC_METHOD_SETTRACKERS, params));
- return new DaemonTaskSuccessResult(task);
-
- case ForceRecheck:
-
- // Pause a torrent
- makeRequest(buildRequest(RPC_METHOD_FORCERECHECK,
- ((new JSONArray()).put((new JSONArray()).put(task.getTargetTorrent().getUniqueID())))));
- return new DaemonTaskSuccessResult(task);
-
- default:
- return new DaemonTaskFailureResult(task, new DaemonException(ExceptionType.MethodUnsupported, task.getMethod() + " is not supported by " + getType()));
+ params.put(pfields); // keys
+
+ // Make a single call to set the priorities on all files at once
+ makeRequest(buildRequest(RPC_METHOD_SETFILE, params), log);
+ return new DaemonTaskSuccessResult(task);
+
+ case SetDownloadLocation:
+
+ // Set the download location of some torrent
+ SetDownloadLocationTask sdlTask = (SetDownloadLocationTask) task;
+ // This works, but does not move the torrent
+ //makeRequest(buildRequest(RPC_METHOD_SETOPTIONS, buildSetTorrentOptions(
+ // sdlTask.getTargetTorrent().getUniqueID(), RPC_DOWNLOADLOCATION, sdlTask.getNewLocation())));
+ params.put(new JSONArray().put(task.getTargetTorrent().getUniqueID()));
+ params.put(sdlTask.getNewLocation());
+ makeRequest(buildRequest(RPC_METHOD_MOVESTORAGE, params), log);
+ return new DaemonTaskSuccessResult(task);
+
+ case SetTransferRates:
+
+ // Request to set the maximum transfer rates
+ SetTransferRatesTask ratesTask = (SetTransferRatesTask) task;
+ JSONObject map = new JSONObject();
+ map.put(RPC_MAXUPLOAD, (ratesTask.getUploadRate() == null ? -1 : ratesTask.getUploadRate()));
+ map.put(RPC_MAXDOWNLOAD, (ratesTask.getDownloadRate() == null ? -1 : ratesTask.getDownloadRate()));
+
+ makeRequest(buildRequest(RPC_METHOD_SETCONFIG, (new JSONArray()).put(map)), log);
+ return new DaemonTaskSuccessResult(task);
+
+ case SetLabel:
+
+ // Request to set the label
+ SetLabelTask labelTask = (SetLabelTask) task;
+ params.put(task.getTargetTorrent().getUniqueID());
+ params.put(labelTask.getNewLabel() == null ? "" : labelTask.getNewLabel());
+ makeRequest(buildRequest(RPC_METHOD_SETLABEL, params), log);
+ return new DaemonTaskSuccessResult(task);
+
+ case SetTrackers:
+
+ // Set the trackers of some torrent
+ SetTrackersTask trackersTask = (SetTrackersTask) task;
+ JSONArray trackers = new JSONArray();
+ // Build an JSON arrays of objcts that each have a tier (order) number and an url
+ for (int i = 0; i < trackersTask.getNewTrackers().size(); i++) {
+ JSONObject trackerObj = new JSONObject();
+ trackerObj.put("tier", i);
+ trackerObj.put("url", trackersTask.getNewTrackers().get(i));
+ trackers.put(trackerObj);
+ }
+ params.put(new JSONArray().put(task.getTargetTorrent().getUniqueID()));
+ params.put(trackers);
+ makeRequest(buildRequest(RPC_METHOD_SETTRACKERS, params), log);
+ return new DaemonTaskSuccessResult(task);
+
+ case ForceRecheck:
+
+ // Pause a torrent
+ makeRequest(buildRequest(RPC_METHOD_FORCERECHECK,
+ ((new JSONArray()).put((new JSONArray()).put(task.getTargetTorrent().getUniqueID())))),
+ log);
+ return new DaemonTaskSuccessResult(task);
+
+ default:
+ return new DaemonTaskFailureResult(task, new DaemonException(ExceptionType.MethodUnsupported,
+ task.getMethod() + " is not supported by " + getType()));
}
} catch (JSONException e) {
return new DaemonTaskFailureResult(task, new DaemonException(ExceptionType.ParsingFailed, e.toString()));
@@ -435,9 +435,10 @@ public class DelugeAdapter implements IDaemonAdapter {
return params;
}*/
- private void ensureVersion() throws DaemonException {
- if (version > 0)
+ private void ensureVersion(Log log) throws DaemonException {
+ if (version > 0) {
return;
+ }
// We still need to retrieve the version number from the server
// Do this by getting the web interface main html page and trying to parse the version number
// Format is something like 'Deluge: Web UI 1.3.6'
@@ -464,9 +465,10 @@ public class DelugeAdapter implements IDaemonAdapter {
String numbers = "";
for (char c : parts[2].toCharArray()) {
if (Character.isDigit(c))
- // Still a number; add it to the numbers string
+ // Still a number; add it to the numbers string
+ {
numbers += Character.toString(c);
- else {
+ } else {
// No longer reading numbers; stop reading
break;
}
@@ -478,10 +480,10 @@ public class DelugeAdapter implements IDaemonAdapter {
}
}
} catch (NumberFormatException e) {
- DLog.d(LOG_NAME, "Error parsing the Deluge version code as number: " + e.toString());
+ log.d(LOG_NAME, "Error parsing the Deluge version code as number: " + e.toString());
// Continue though, ignoring the version number
} catch (Exception e) {
- DLog.d(LOG_NAME, "Error: " + e.toString());
+ log.d(LOG_NAME, "Error: " + e.toString());
throw new DaemonException(ExceptionType.ConnectionError, e.toString());
}
// Unable to establish version number; assume an old version by setting it to version 1
@@ -496,21 +498,21 @@ public class DelugeAdapter implements IDaemonAdapter {
request.put(RPC_PARAMS, (params == null) ? new JSONArray() : params);
request.put(RPC_ID, 2);
return request;
-
+
}
-
- private synchronized JSONObject makeRequest(JSONObject data) throws DaemonException {
+
+ private synchronized JSONObject makeRequest(JSONObject data, Log log) throws DaemonException {
try {
-
+
// Initialise the HTTP client
if (httpclient == null) {
initialise();
}
-
+
// Login first?
if (sessionCookie == null) {
-
+
// Build login object
String extraPass = settings.getExtraPassword();
if (extraPass == null) {
@@ -539,11 +541,13 @@ public class DelugeAdapter implements IDaemonAdapter {
}
}
}
-
+
// Still no session cookie?
if (sessionCookie == null) {
// Set error message and cancel the action that was requested
- throw new DaemonException(ExceptionType.AuthenticationFailure, "Password error? Server time difference? No (valid) cookie in response and JSON was: " + HttpHelper.convertStreamToString(instream));
+ throw new DaemonException(ExceptionType.AuthenticationFailure,
+ "Password error? Server time difference? No (valid) cookie in response and JSON was: " +
+ HttpHelper.convertStreamToString(instream));
}
}
@@ -566,7 +570,7 @@ public class DelugeAdapter implements IDaemonAdapter {
if (!cookiePresent) {
httpclient.getCookieStore().addCookie(sessionCookie);
}
-
+
// Execute
HttpResponse response = httpclient.execute(httppost);
@@ -579,8 +583,10 @@ public class DelugeAdapter implements IDaemonAdapter {
JSONObject json = new JSONObject(result);
instream.close();
- DLog.d(LOG_NAME, "Success: " + (result.length() > 300? result.substring(0, 300) + "... (" + result.length() + " chars)": result));
-
+ log.d(LOG_NAME, "Success: " +
+ (result.length() > 300 ? result.substring(0, 300) + "... (" + result.length() + " chars)" :
+ result));
+
// Return JSON object
return json;
@@ -590,34 +596,35 @@ public class DelugeAdapter implements IDaemonAdapter {
throw new DaemonException(ExceptionType.UnexpectedResponse, "No HTTP entity in response object.");
} catch (JSONException e) {
- DLog.d(LOG_NAME, "Error: " + e.toString());
+ log.d(LOG_NAME, "Error: " + e.toString());
throw new DaemonException(ExceptionType.UnexpectedResponse, e.toString());
} catch (Exception e) {
- DLog.d(LOG_NAME, "Error: " + e.toString());
+ log.d(LOG_NAME, "Error: " + e.toString());
throw new DaemonException(ExceptionType.ConnectionError, e.toString());
}
-
+
}
/**
* Instantiates an HTTP client with proper credentials that can be used for all Transmission requests.
- * @param connectionTimeout The connection timeout in milliseconds
* @throws DaemonException On missing settings
*/
private void initialise() throws DaemonException {
- httpclient = HttpHelper.createStandardHttpClient(settings, settings.getUsername() != null && settings.getUsername() != "");
- httpclient.addRequestInterceptor(HttpHelper.gzipRequestInterceptor);
- httpclient.addResponseInterceptor(HttpHelper.gzipResponseInterceptor);
-
+ httpclient = HttpHelper.createStandardHttpClient(settings,
+ settings.getUsername() != null && !settings.getUsername().equals(""));
+ httpclient.addRequestInterceptor(HttpHelper.gzipRequestInterceptor);
+ httpclient.addResponseInterceptor(HttpHelper.gzipResponseInterceptor);
+
}
- /**
+ /**
* Build the URL of the Transmission web UI from the user settings.
* @return The URL of the RPC API
*/
private String buildWebUIUrl() {
- return (settings.getSsl() ? "https://" : "http://") + settings.getAddress() + ":" + settings.getPort() + (settings.getFolder() == null? "": settings.getFolder());
+ return (settings.getSsl() ? "https://" : "http://") + settings.getAddress() + ":" + settings.getPort() +
+ (settings.getFolder() == null ? "" : settings.getFolder());
}
private ArrayList parseJsonRetrieveTorrents(JSONObject response) throws JSONException, DaemonException {
@@ -625,43 +632,47 @@ public class DelugeAdapter implements IDaemonAdapter {
// Parse response
ArrayList torrents = new ArrayList();
if (response.isNull(RPC_TORRENTS)) {
- throw new DaemonException(ExceptionType.NotConnected, "Web interface probably not connected to a daemon yet, because 'torrents' is null: " + response.toString());
+ throw new DaemonException(ExceptionType.NotConnected,
+ "Web interface probably not connected to a daemon yet, because 'torrents' is null: " +
+ response.toString());
}
JSONObject objects = response.getJSONObject(RPC_TORRENTS);
JSONArray names = objects.names();
if (names != null) {
for (int j = 0; j < names.length(); j++) {
-
+
JSONObject tor = objects.getJSONObject(names.getString(j));
// Add the parsed torrent to the list
TorrentStatus status = convertDelugeState(tor.getString(RPC_STATUS));
String error = tor.getString(RPC_MESSAGE);
if (tor.getString(RPC_TRACKER_STATUS).indexOf("Error") > 0) {
- error += (error.length() > 0? "\n": "") + tor.getString(RPC_TRACKER_STATUS);
+ error += (error.length() > 0 ? "\n" : "") + tor.getString(RPC_TRACKER_STATUS);
//status = TorrentStatus.Error; // Don't report this as blocking error
}
- torrents.add(new Torrent(j,
- names.getString(j),
- tor.getString(RPC_NAME),
+ // @formatter:off
+ torrents.add(new Torrent(j,
+ names.getString(j),
+ tor.getString(RPC_NAME),
status,
tor.getString(RPC_SAVEPATH) + settings.getOS().getPathSeperator(),
- tor.getInt(RPC_RATEDOWNLOAD),
- tor.getInt(RPC_RATEUPLOAD),
- tor.getInt(RPC_NUMSEEDS),
- tor.getInt(RPC_TOTALSEEDS),
- tor.getInt(RPC_NUMPEERS),
- tor.getInt(RPC_TOTALPEERS),
+ tor.getInt(RPC_RATEDOWNLOAD),
+ tor.getInt(RPC_RATEUPLOAD),
+ tor.getInt(RPC_NUMSEEDS),
+ tor.getInt(RPC_TOTALSEEDS),
+ tor.getInt(RPC_NUMPEERS),
+ tor.getInt(RPC_TOTALPEERS),
tor.getInt(RPC_ETA),
- tor.getLong(RPC_DOWNLOADEDEVER),
- tor.getLong(RPC_UPLOADEDEVER),
- tor.getLong(RPC_TOTALSIZE),
+ tor.getLong(RPC_DOWNLOADEDEVER),
+ tor.getLong(RPC_UPLOADEDEVER),
+ tor.getLong(RPC_TOTALSIZE),
((float) tor.getDouble(RPC_PARTDONE)) / 100f, // Percentage to [0..1]
0f, // Not available
tor.has(RPC_LABEL)? tor.getString(RPC_LABEL): null,
tor.has(RPC_TIMEADDED)? new Date((long) (tor.getDouble(RPC_TIMEADDED) * 1000L)): null,
null, // Not available
- tor.getString(RPC_MESSAGE),
+ error,
settings.getType()));
+ // @formatter:on
}
}
@@ -673,23 +684,26 @@ public class DelugeAdapter implements IDaemonAdapter {
private ArrayList