nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-29 07:41:17 +00:00
Code Releases Activity

Fixed node status and transmission speed display (fixes #74).

Browse source
This commit is contained in:
Felix Ableitner 2014-08-07 17:33:29 +02:00
parent 804912062c
commit d05081a10c
1 changed files with 54 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java
View file

@ -152,6 +152,12 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener {
*/ */
private long mPreviousConnectionTime = 0; private long mPreviousConnectionTime = 0;
/**
* Stores the latest result of {@link #getModel(String, OnReceiveModelListener)} for each repo,
* for calculating node percentage in {@link #getConnections(OnReceiveConnectionsListener)}.
*/
private HashMap<String, Model> mCachedModelInfo = new HashMap<String, Model>();
public RestApi(SyncthingService syncthingService, String url, String apiKey) { public RestApi(SyncthingService syncthingService, String url, String apiKey) {
mSyncthingService = syncthingService; mSyncthingService = syncthingService;
mUrl = url; mUrl = url;
@ -495,18 +501,22 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener {
/** /**
* Listener for {@link #getConnections}. * Listener for {@link #getConnections}.
*/
public interface OnReceiveConnectionsListener {
/**
* @param connections Map from Node ID to {@link Connection}.
* *
* NOTE: The parameter connections is cached internally. Do not modify it or * NOTE: The parameter connections is cached internally. Do not modify it or
* any of its contents. * any of its contents.
*/ */
public interface OnReceiveConnectionsListener {
public void onReceiveConnections(Map<String, Connection> connections); public void onReceiveConnections(Map<String, Connection> connections);
} }
/** /**
* Returns connection info for the local node and all connected nodes. * Returns connection info for the local node and all connected nodes.
* *
* Use the key {@link }LOCAL_NODE_CONNECTIONS} to get connection info for the local node. * Use the key {@link #LOCAL_NODE_CONNECTIONS} to get connection info for the local node.
*/ */
public void getConnections(final OnReceiveConnectionsListener listener) { public void getConnections(final OnReceiveConnectionsListener listener) {
new GetTask() { new GetTask() {
@ -526,19 +536,19 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener {
JSONObject json = new JSONObject(s); JSONObject json = new JSONObject(s);
String[] names = json.names().join(" ").replace("\"", "").split(" "); String[] names = json.names().join(" ").replace("\"", "").split(" ");
HashMap<String, Connection> connections = new HashMap<String, Connection>(); HashMap<String, Connection> connections = new HashMap<String, Connection>();
for (String address : names) { for (String nodeId : names) {
Connection c = new Connection(); Connection c = new Connection();
JSONObject conn = json.getJSONObject(address); JSONObject conn = json.getJSONObject(nodeId);
c.Address = address; c.Address = nodeId;
c.At = conn.getString("At"); c.At = conn.getString("At");
c.InBytesTotal = conn.getLong("InBytesTotal"); c.InBytesTotal = conn.getLong("InBytesTotal");
c.OutBytesTotal = conn.getLong("OutBytesTotal"); c.OutBytesTotal = conn.getLong("OutBytesTotal");
c.Address = conn.getString("Address"); c.Address = conn.getString("Address");
c.ClientVersion = conn.getString("ClientVersion"); c.ClientVersion = conn.getString("ClientVersion");
c.Completion = conn.getInt("Completion"); c.Completion = getNodeCompletion(nodeId);
Connection prev = (mPreviousConnections.containsKey(address)) Connection prev = (mPreviousConnections.containsKey(nodeId))
? mPreviousConnections.get(address) ? mPreviousConnections.get(nodeId)
: new Connection(); : new Connection();
mPreviousConnectionTime = now; mPreviousConnectionTime = now;
if (difference != 0) { if (difference != 0) {
@ -548,7 +558,7 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener {
(conn.getLong("OutBytesTotal") - prev.OutBytesTotal) / difference); (conn.getLong("OutBytesTotal") - prev.OutBytesTotal) / difference);
} }
connections.put(address, c); connections.put(nodeId, c);
} }
mPreviousConnections = connections; mPreviousConnections = connections;
@ -561,6 +571,38 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener {
}.execute(mUrl, GetTask.URI_CONNECTIONS, mApiKey); }.execute(mUrl, GetTask.URI_CONNECTIONS, mApiKey);
} }
/**
* Calculates completion percentage for the given node using {@link #mCachedModelInfo}.
*/
private int getNodeCompletion(String nodeId) {
int repoCount = 0;
float percentageSum = 0;
for (String id : mCachedModelInfo.keySet()) {
boolean isShared = false;
outerloop:
for (Repo r : getRepos()) {
for (Node n : r.Nodes) {
if (n.NodeID.equals(nodeId)) {
isShared = true;
break outerloop;
}
}
}
if (isShared) {
long global = mCachedModelInfo.get(id).globalBytes;
long local = mCachedModelInfo.get(id).localBytes;
percentageSum += (global != 0)
? (local * 100f) / global
: 100f;
repoCount++;
}
}
return (repoCount != 0)
? (int) percentageSum / repoCount
: 100;
}
/** /**
* Listener for {@link #getModel}. * Listener for {@link #getModel}.
@ -594,6 +636,7 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener {
m.needFiles = json.getLong("needFiles"); m.needFiles = json.getLong("needFiles");
m.state = json.getString("state"); m.state = json.getString("state");
m.invalid = json.optString("invalid"); m.invalid = json.optString("invalid");
mCachedModelInfo.put(repoId, m);
listener.onReceiveModel(repoId, m); listener.onReceiveModel(repoId, m);
} }
catch (JSONException e) { catch (JSONException e) {