I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

(zzz)

Browse Source 
* i2psnark: Add "Stalled" indication and stat totals on web page
This commit is contained in:
zzz
2006-09-10 01:55:37 +00:00
committed by zzz
parent c9d8e796c6
commit 7e21f2c92b
3 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
View File

@ -43,6 +43,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};
String nonce = req.getParameter("nonce");
if ( (nonce != null) && (nonce.equals(String.valueOf(_nonce))) )
@ -72,10 +73,18 @@ public class I2PSnarkServlet extends HttpServlet {
String uri = req.getRequestURI();
for (int i = 0; i < snarks.size(); i++) {
Snark snark = (Snark)snarks.get(i);
displaySnark(out, snark, uri, i);
displaySnark(out, snark, uri, i, stats);
}
if (snarks.size() <= 0) {
out.write(TABLE_EMPTY);
} else if (snarks.size() > 1) {
out.write(TABLE_TOTAL);
out.write(" <th align=\"right\" valign=\"top\">" + formatSize(stats[0]) + "</th>\n" +
" <th align=\"right\" valign=\"top\">" + formatSize(stats[1]) + "</th>\n" +
" <th align=\"right\" valign=\"top\">" + formatSize(stats[2]) + "ps</th>\n" +
" <th align=\"right\" valign=\"top\">" + formatSize(stats[3]) + "ps</th>\n" +
" <th>&nbsp;</th></tr>\n" +
"</tfoot>\n");
}
out.write(TABLE_FOOTER);
@ -279,9 +288,9 @@ public class I2PSnarkServlet extends HttpServlet {
}
return rv;
}
private static final int MAX_DISPLAYED_FILENAME_LENGTH = 60;
private void displaySnark(PrintWriter out, Snark snark, String uri, int row) throws IOException {
private void displaySnark(PrintWriter out, Snark snark, String uri, int row, long stats[]) throws IOException {
String filename = snark.torrent;
File f = new File(filename);
filename = f.getName(); // the torrent may be the canonical name, so lets just grab the local name
@ -300,6 +309,10 @@ public class I2PSnarkServlet extends HttpServlet {
else
remainingSeconds = -1;
long uploaded = snark.coordinator.getUploaded();
stats[0] += snark.coordinator.getDownloaded();
stats[1] += uploaded;
stats[2] += downBps;
stats[3] += upBps;
boolean isRunning = !snark.stopped;
boolean isValid = snark.meta != null;
@ -321,8 +334,10 @@ public class I2PSnarkServlet extends HttpServlet {
else
statusString = "Complete";
} else {
if (isRunning && curPeers > 0)
if (isRunning && curPeers > 0 && downBps > 0)
statusString = "OK (" + curPeers + "/" + knownPeers + " peers)";
else if (isRunning && curPeers > 0)
statusString = "Stalled (" + curPeers + "/" + knownPeers + " peers)";
else if (isRunning)
statusString = "No Peers (0/" + knownPeers + ")";
else
@ -596,6 +611,11 @@ public class I2PSnarkServlet extends HttpServlet {
" <th>&nbsp;</th></tr>\n" +
"</thead>\n";
private static final String TABLE_TOTAL = "<tfoot>\n" +
"<tr><th align=\"left\" valign=\"top\">Totals</th>\n" +
" <th>&nbsp;</th>\n" +
" <th>&nbsp;</th>\n";
private static final String TABLE_EMPTY = "<tr class=\"snarkTorrentEven\">" +
"<td class=\"snarkTorrentEven\" align=\"left\"" +
" valign=\"top\" colspan=\"8\">No torrents</td></tr>\n";

5
history.txt
View File

@ -1,4 +1,7 @@
$Id: history.txt,v 1.516 2006-09-09 12:46:21 jrandom Exp $
$Id: history.txt,v 1.517 2006-09-09 17:15:06 zzz Exp $
2006-09-09 zzz
* i2psnark: Add "Stalled" indication and stat totals on web page
2006-09-09 zzz
* i2psnark: Fix bug where new peers would always be sent an "interested"

4
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
*
*/
public class RouterVersion {
public final static String ID = "$Revision: 1.454 $ $Date: 2006-09-09 12:46:29 $";
public final static String ID = "$Revision: 1.455 $ $Date: 2006-09-09 17:15:05 $";
public final static String VERSION = "0.6.1.25";
public final static long BUILD = 1;
public final static long BUILD = 2;
public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
System.out.println("Router ID: " + RouterVersion.ID);