diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index c791ad2fb..d42d3b520 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -63,7 +63,7 @@ public class I2PSnarkServlet extends HttpServlet { req.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8"); resp.setContentType("text/html; charset=UTF-8"); - long stats[] = {0,0,0,0}; + long stats[] = {0,0,0,0,0}; String nonce = req.getParameter("nonce"); if ( (nonce != null) && (nonce.equals(String.valueOf(_nonce))) ) @@ -143,8 +143,10 @@ public class I2PSnarkServlet extends HttpServlet { if (snarks.size() <= 0) { out.write(TABLE_EMPTY); } else if (snarks.size() > 1) { - out.write(TABLE_TOTAL); - out.write(" " + formatSize(stats[0]) + "\n" + + out.write("\n" + + " Totals (" + snarks.size() + " torrents, " + stats[4] + " connected peers)\n" + + "  \n" + + " " + formatSize(stats[0]) + "\n" + " " + formatSize(stats[1]) + "\n" + " " + formatSize(stats[2]) + "ps\n" + " " + formatSize(stats[3]) + "ps\n" + @@ -439,6 +441,7 @@ public class I2PSnarkServlet extends HttpServlet { if (snark.coordinator != null) { err = snark.coordinator.trackerProblems; curPeers = snark.coordinator.getPeerCount(); + stats[4] += curPeers; knownPeers = snark.coordinator.trackerSeenPeers; } @@ -577,7 +580,7 @@ public class I2PSnarkServlet extends HttpServlet { client = "Azureus"; else if ("CwsL".equals(ch)) client = "I2PSnarkXL"; - else if ("AUZV".equals(ch) || "AkZV".equals(ch) || "A0ZV".equals(ch)) + else if ("ZV".equals(ch.substring(2,4))) client = "Robert"; else client = "Unknown (" + ch + ')'; @@ -858,11 +861,6 @@ public class I2PSnarkServlet extends HttpServlet { " Down Rate\n" + " Up Rate\n"; - private static final String TABLE_TOTAL = "\n" + - "Totals\n" + - "  \n" + - "  \n"; - private static final String TABLE_EMPTY = "" + "No torrents\n";