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 d3a04df1f..e79b841c9 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -133,6 +133,7 @@ public class I2PSnarkServlet extends Default { // bypass the horrid Resource.getListHTML() String pathInfo = req.getPathInfo(); String pathInContext = URI.addPaths(path, pathInfo); + req.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8"); resp.setContentType("text/html; charset=UTF-8"); Resource resource = getResource(pathInContext); @@ -140,7 +141,7 @@ public class I2PSnarkServlet extends Default { resp.sendError(HttpResponse.__404_Not_Found); } else { String base = URI.addPaths(req.getRequestURI(), "/"); - String listing = getListHTML(resource, base, true); + String listing = getListHTML(resource, base, true, method.equals("POST") ? req.getParameterMap() : null); if (listing != null) resp.getWriter().write(listing); else // shouldn't happen @@ -170,7 +171,7 @@ public class I2PSnarkServlet extends Default { PrintWriter out = resp.getWriter(); out.write("\n" + - "\n" + + "\n" + ""); out.write(_("I2PSnark - Anonymous BitTorrent Client")); out.write("\n"); @@ -191,6 +192,7 @@ public class I2PSnarkServlet extends Default { out.write("
"); + out.write(" "); out.write(_("I2PSnark")); out.write(" "); out.write(_("Forum")); @@ -218,7 +220,7 @@ public class I2PSnarkServlet extends Default { out.write("
"); if (isConfigure) { - out.write("\n"); + out.write("
\n"); writeConfigForm(out, req); } else { writeTorrents(out, req); @@ -238,47 +240,81 @@ public class I2PSnarkServlet extends Default { List snarks = getSortedSnarks(req); String uri = req.getRequestURI(); out.write(TABLE_HEADER); + out.write(" "); out.write(_("Status")); if (_manager.util().connected() && !snarks.isEmpty()) { - out.write(" ("); + out.write("\"");"); } else { out.write("?p=1\">"); + out.write("\"");"); } - out.write(")
\n"); + out.write("
\n"); } out.write("\n"); + out.write(""); out.write(_("Torrent")); out.write("\n"); + out.write(""); out.write(_("ETA")); - out.write("\n"); + out.write("\n"); + out.write("\n"); + out.write("\">"); + out.write(_("RX")); + out.write("\n"); + out.write("\n"); + out.write("\">"); + out.write(_("TX")); + out.write("\n"); + out.write("\n"); + out.write("\">Rate"); + out.write("\n"); + out.write(""); + out.write(_("Rate")); out.write("\n"); - out.write(""); if (_manager.util().connected()) { out.write(""); + out.write("\"");"); out.write(""); } else if (!snarks.isEmpty()) { out.write(""); - out.write(_("Start All")); + out.write("\"Start"); out.write(""); } else { out.write(" "); @@ -292,8 +328,8 @@ public class I2PSnarkServlet extends Default { } if (snarks.isEmpty()) { - out.write("" + - "" + + ""); out.write(_("No torrents loaded.")); out.write("\n"); @@ -301,12 +337,12 @@ public class I2PSnarkServlet extends Default { out.write("\n" + " "); out.write(_("Totals")); - out.write(" ("); + out.write(" » "); out.write(ngettext("1 torrent", "{0} torrents", snarks.size())); out.write(", "); out.write(DataHelper.formatSize2(stats[5]) + "B, "); out.write(ngettext("1 connected peer", "{0} connected peers", (int) stats[4])); - out.write(")\n" + + out.write("\n" + "  \n" + " " + formatSize(stats[0]) + "\n" + " " + formatSize(stats[1]) + "\n" + @@ -478,7 +514,7 @@ public class I2PSnarkServlet extends Default { String i2cpOpts = buildI2CPOpts(req); String upLimit = req.getParameter("upLimit"); String upBW = req.getParameter("upBW"); - String startupDel = req.getParameter("startupDelay"); + String startupDel = req.getParameter("startupDelay"); boolean useOpenTrackers = req.getParameter("useOpenTrackers") != null; String openTrackers = req.getParameter("openTrackers"); _manager.updateConfig(dataDir, autoStart, startupDel, seedPct, eepHost, eepPort, i2cpHost, i2cpPort, i2cpOpts, upLimit, upBW, useOpenTrackers, openTrackers); @@ -502,7 +538,7 @@ public class I2PSnarkServlet extends Default { File torrentFile = new File(baseFile.getParent(), baseFile.getName() + ".torrent"); if (torrentFile.exists()) throw new IOException("Cannot overwrite an existing .torrent file: " + torrentFile.getPath()); - _manager.saveTorrentStatus(info, s.getBitField()); // so addTorrent won't recheck + _manager.saveTorrentStatus(info, s.getBitField(), null); // so addTorrent won't recheck // DirMonitor could grab this first, maybe hold _snarks lock? FileOutputStream out = new FileOutputStream(torrentFile); out.write(info.getTorrentData()); @@ -529,6 +565,8 @@ public class I2PSnarkServlet extends Default { _manager.stopTorrent(snark.torrent, false); } if (_manager.util().connected()) { + // Give the stopped announces time to get out + try { Thread.sleep(2000); } catch (InterruptedException ie) {} _manager.util().disconnect(); _manager.addMessage(_("I2P tunnel closed.")); } @@ -600,7 +638,7 @@ public class I2PSnarkServlet extends Default { } private static final int MAX_DISPLAYED_FILENAME_LENGTH = 44; - private static final int MAX_DISPLAYED_ERROR_LENGTH = 40; + private static final int MAX_DISPLAYED_ERROR_LENGTH = 6; private void displaySnark(PrintWriter out, Snark snark, String uri, int row, long stats[], boolean showPeers, boolean showDebug) throws IOException { String filename = snark.torrent; File f = new File(filename); @@ -658,50 +696,57 @@ public class I2PSnarkServlet extends Default { String statusString = _("Unknown"); if (err != null) { if (isRunning && curPeers > 0 && !showPeers) - statusString = "" + _("TrackerErr") + " (" + - "" + - curPeers + '/' + - ngettext("1 peer", "{0} peers", knownPeers) + ")"; + statusString = "" + + ' ' + curPeers + " / " + + ngettext("1 peer", "{0} peers", knownPeers) + ""; else if (isRunning) - statusString = "" + _("TrackerErr") + " (" + curPeers + '/' + - ngettext("1 peer", "{0} peers", knownPeers) + ')'; + statusString = "" + ' ' + curPeers + " / " + + ngettext("1 peer", "{0} peers", knownPeers) + ""; else { if (err.length() > MAX_DISPLAYED_ERROR_LENGTH) err = err.substring(0, MAX_DISPLAYED_ERROR_LENGTH) + "…"; - statusString = _("TrackerErr") + "
(" + err + ")"; + statusString = " " + err + ""; } } else if (remaining <= 0) { if (isRunning && curPeers > 0 && !showPeers) - statusString = _("Seeding") + " (" + + statusString = "" + "" + - curPeers + '/' + - ngettext("1 peer", "{0} peers", knownPeers) + ")"; + ' ' + curPeers + " / " + + ngettext("1 peer", "{0} peers", knownPeers) + ""; else if (isRunning) - statusString = _("Seeding") + " (" + curPeers + "/" + - ngettext("1 peer", "{0} peers", knownPeers) + ')'; + statusString = "" + + ' ' + curPeers + " / " + + ngettext("1 peer", "{0} peers", knownPeers) + ""; else - statusString = _("Complete"); + statusString = " " + _("Complete"); } else { if (isRunning && curPeers > 0 && downBps > 0 && !showPeers) - statusString = _("OK") + " (" + + statusString = "" + "" + - curPeers + "/" + - ngettext("1 peer", "{0} peers", knownPeers) + ")"; + ' ' + curPeers + " / " + + ngettext("1 peer", "{0} peers", knownPeers) + ""; else if (isRunning && curPeers > 0 && downBps > 0) - statusString = _("OK") + " (" + curPeers + "/" + - ngettext("1 peer", "{0} peers", knownPeers) + ')'; + statusString = "" + + ' ' + curPeers + " / " + + ngettext("1 peer", "{0} peers", knownPeers); else if (isRunning && curPeers > 0 && !showPeers) - statusString = _("Stalled") + " (" + + statusString = "" + "" + - curPeers + '/' + - ngettext("1 peer", "{0} peers", knownPeers) + ")"; + ' ' + curPeers + " / " + + ngettext("1 peer", "{0} peers", knownPeers) + ""; else if (isRunning && curPeers > 0) - statusString = _("Stalled") + " (" + curPeers + '/' + - ngettext("1 peer", "{0} peers", knownPeers) + ')'; + statusString = "" + + ' ' + curPeers + " / " + + ngettext("1 peer", "{0} peers", knownPeers); else if (isRunning) - statusString = _("No Peers") + " (0/" + knownPeers + ')'; + statusString = "" + + ' ' + curPeers + " / " + + ngettext("1 peer", "{0} peers", knownPeers); else - statusString = _("Stopped"); + statusString = " " + _("Stopped"); } String rowClass = (row % 2 == 0 ? "snarkTorrentEven" : "snarkTorrentOdd"); @@ -746,11 +791,11 @@ public class I2PSnarkServlet extends Default { if (e < 0) continue; baseURL = baseURL.substring(e + 1); - out.write("   ["); - out.write(_("Details")); - out.write("]"); + out.write("\" title=\"" + name + ' ' + _("Tracker") + "\" target=\"_blank\">"); + out.write(""); + out.write(""); break; } } @@ -762,7 +807,7 @@ public class I2PSnarkServlet extends Default { out.write("\n\t"); out.write(""); if (remaining > 0) - out.write(formatSize(total-remaining) + " / " + formatSize(total)); // 18MB/3GB + out.write(formatSize(total-remaining) + " / " + formatSize(total)); // 18MB/3GB; thin space so it will line break well else out.write(formatSize(total)); // 3GB out.write("\n\t"); @@ -785,7 +830,11 @@ public class I2PSnarkServlet extends Default { + "\" title=\""); out.write(_("Stop the torrent")); out.write("\">"); + out.write("\"");"); out.write(""); } else { if (isValid) { @@ -793,8 +842,12 @@ public class I2PSnarkServlet extends Default { + "\" title=\""); out.write(_("Start the torrent")); out.write("\">"); + out.write("\"");\n"); + out.write("\">"); + out.write(""); } out.write(""); + out.write("\"");
"); + out.write("\">"); + out.write(""); out.write(""); + out.write("\"");"); out.write(""); } out.write("\n\n"); @@ -872,10 +933,10 @@ public class I2PSnarkServlet extends Default { out.write(""); if (remaining > 0) { if (peer.isInteresting() && !peer.isChoked()) { - out.write(""); + out.write(""); out.write(formatSize(peer.getDownloadRate()) + "ps"); } else { - out.write(""); if (pct != 100.0) { if (peer.isInterested() && !peer.isChoking()) { - out.write(""); + out.write(""); out.write(formatSize(peer.getUploadRate()) + "ps"); } else { - out.write("\n"); out.write("\n"); out.write("
"); + out.write(""); out.write(_("Add Torrent")); - out.write("
\n
"); + out.write("
\n
"); out.write(_("From URL")); - out.write(": \n"); + out.write(": \n"); // not supporting from file at the moment, since the file name passed isn't always absolute (so it may not resolve) - //out.write("From file:
\n"); - out.write("
 
"); + out.write("
\n"); out.write("
 "); - out.write(_("Alternately, you can copy .torrent files to the directory {0}.", _manager.getDataDir().getAbsolutePath())); + out.write(_("You can also copy .torrent files to: {0}.", "" + _manager.getDataDir().getAbsolutePath () + "")); out.write("\n"); - out.write(_("Removing a .torrent file will cause the torrent to stop.")); + out.write(_("Removing a .torrent will cause it to stop.")); out.write("
\n"); out.write("\n"); } @@ -969,12 +1031,13 @@ public class I2PSnarkServlet extends Default { out.write("\n"); out.write("\n"); out.write(""); + out.write(""); out.write(_("Create Torrent")); - out.write("
\n
"); + out.write("
\n
"); //out.write("From file:
\n"); out.write(_("Data to seed")); - out.write(":		" + _manager.getDataDir().getAbsolutePath() + File.separatorChar - + "" + _manager.getDataDir().getAbsolutePath() + File.separatorChar + + "
\n"); @@ -994,11 +1057,11 @@ public class I2PSnarkServlet extends Default { } out.write("\n"); out.write(_("or")); - out.write("
  "); - out.write("
 
\n"); out.write("\n"); @@ -1013,12 +1076,13 @@ public class I2PSnarkServlet extends Default { //int seedPct = 0; out.write("
\n"); - out.write("
\n"); + out.write("
\n"); out.write("\n"); out.write("\n"); out.write(""); + out.write(""); out.write(_("Configuration")); - out.write("
\n"); + out.write("
\n"); out.write("
"); out.write(_("Data directory")); out.write(": "); - out.write("
"); + out.write("
"); out.write(_("Startup delay")); out.write(": "); out.write(_("minutes")); @@ -1132,7 +1196,6 @@ public class I2PSnarkServlet extends Default { out.write(_("I2CP options")); out.write(":
\n"); - out.write("
 \n"); out.write(""); + out.write(""); out.write(_("Configuration")); out.write("\n"); } @@ -1201,23 +1265,25 @@ public class I2PSnarkServlet extends Default { // rounding makes us look faster :) private static String formatSize(long bytes) { if (bytes < 5*1024) - return bytes + " B"; + return bytes + " B"; else if (bytes < 5*1024*1024) - return ((bytes + 512)/1024) + " KB"; + return ((bytes + 512)/1024) + " KB"; else if (bytes < 10*1024*1024*1024l) - return ((bytes + 512*1024)/(1024*1024)) + " MB"; + return ((bytes + 512*1024)/(1024*1024)) + " MB"; else - return ((bytes + 512*1024*1024)/(1024*1024*1024)) + " GB"; + return ((bytes + 512*1024*1024)/(1024*1024*1024)) + " GB"; } /** @since 0.7.14 */ private static String urlify(String s) { StringBuilder buf = new StringBuilder(256); - buf.append("").append(s).append(""); + // browsers seem to work without doing this but let's be strict + String link = s.replace("&", "&"); + buf.append("").append(link).append(""); return buf.toString(); } - private static final String HEADER = ""; + private static final String HEADER = ""; private static final String TABLE_HEADER = "\n" + @@ -1252,10 +1318,11 @@ public class I2PSnarkServlet extends Default { * @param r The Resource * @param base The base URL * @param parent True if the parent directory should be included + * @param postParams map of POST parameters or null if not a POST * @return String of HTML * @since 0.7.14 */ - private String getListHTML(Resource r, String base, boolean parent) + private String getListHTML(Resource r, String base, boolean parent, Map postParams) throws IOException { if (!r.isDirectory()) @@ -1280,12 +1347,16 @@ public class I2PSnarkServlet extends Default { else torrentName = title; Snark snark = _manager.getTorrentByBaseName(torrentName); + + if (snark != null && postParams != null) + savePriorities(snark, postParams); + if (title.endsWith("/")) title = title.substring(0, title.length() - 1); title = _("Torrent") + ": " + title; buf.append(title); - buf.append("").append(HEADER).append("\n
"); - buf.append(title); + buf.append("").append(HEADER).append("\n
I2PSnark").append("
"); if (parent) { @@ -1297,12 +1368,19 @@ public class I2PSnarkServlet extends Default { .append(_("Up to higher level directory")).append("\n"); } - buf.append("
" + - "
" + - ""); + buf.append("
"); + boolean showPriority = snark != null && !snark.storage.complete(); + if (showPriority) + buf.append("\n"); + buf.append("
").append(_("File")).append("").append(_("Size")) - .append("").append(_("Status")).append("
" + + ""); + if (showPriority) + buf.append(""); + buf.append("\n"); //DateFormat dfmt=DateFormat.getDateTimeInstance(DateFormat.MEDIUM, // DateFormat.MEDIUM); + boolean showSaveButton = false; for (int i=0 ; i< ls.length ; i++) { String encoded=URI.encodePath(ls[i]); @@ -1340,7 +1418,8 @@ public class I2PSnarkServlet extends Default { complete = true; status = toImg("tick") + _("Complete"); } else { - status = toImg("clock") + + status = + (snark.storage.getPriority(f.getCanonicalPath()) < 0 ? toImg("cancel") : toImg("clock")) + (100 * (length - remaining) / length) + "% " + _("complete") + " (" + DataHelper.formatSize2(remaining) + _("bytes remaining") + ")"; } @@ -1384,9 +1463,40 @@ public class I2PSnarkServlet extends Default { buf.append("\n"); + buf.append(""); + if (showPriority) { + buf.append(""); + } + buf.append("\n"); + } + if (showSaveButton) { + buf.append("\n"); } buf.append("
").append("\"").append(_("File")).append("\" ").append(title).append("").append("\"").append(_("FileSize")).append("\"").append(_("Size")); + buf.append("").append("").append(_("Status")).append("").append(_("Priority")).append("
"); //buf.append(dfmt.format(new Date(item.lastModified()))); buf.append(status); - buf.append("
"); + File f = item.getFile(); + if ((!complete) && (!item.isDirectory()) && f != null) { + int pri = snark.storage.getPriority(f.getCanonicalPath()); + buf.append(" 0) + buf.append("checked=\"true\""); + buf.append('>').append(_("High")); + + buf.append("').append(_("Normal")); + + buf.append("').append(_("Do not download")); + showSaveButton = true; + } + buf.append("
 
\n"); + if (showPriority) + buf.append(""); buf.append("\n"); return buf.toString(); @@ -1431,7 +1541,8 @@ public class I2PSnarkServlet extends Default { plc.endsWith(".ape")) icon = "music"; else if (mime.startsWith("video/") || plc.endsWith(".mkv") || plc.endsWith(".m4v") || - plc.endsWith(".mp4") || plc.endsWith(".wmv") || plc.endsWith(".flv")) + plc.endsWith(".mp4") || plc.endsWith(".wmv") || plc.endsWith(".flv") || + plc.endsWith(".ogm")) icon = "film"; else if (mime.equals("application/zip") || mime.equals("application/x-gtar") || mime.equals("application/compress") || mime.equals("application/gzip") || @@ -1452,6 +1563,26 @@ public class I2PSnarkServlet extends Default { return "\"\" "; } + /** @since 0.8.1 */ + private void savePriorities(Snark snark, Map postParams) { + Set entries = postParams.entrySet(); + for (Map.Entry entry : entries) { + String key = (String)entry.getKey(); + if (key.startsWith("pri.")) { + try { + String file = key.substring(4); + String val = ((String[])entry.getValue())[0]; // jetty arrays + int pri = Integer.parseInt(val); + snark.storage.setPriority(file, pri); + //System.err.println("Priority now " + pri + " for " + file); + } catch (Throwable t) { t.printStackTrace(); } + } + } + if (snark.coordinator != null) + snark.coordinator.updatePiecePriorities(); + _manager.saveTorrentStatus(snark.storage.getMetaInfo(), snark.storage.getBitField(), snark.storage.getFilePriorities()); + } + /** inner class, don't bother reindenting */ private static class FetchAndAdd implements Runnable { diff --git a/history.txt b/history.txt index 2c2d013a3..c867ccc16 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2010-11-03 zzz + * Merge and snark fixups + 2010-11-01 zzz * ClientConnectionRunner: Add synch to fix race causing AIOOBE (http://forum.i2p/viewtopic.php?t=5061) diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index a6204817e..7ca1a3ec2 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 8; + public final static long BUILD = 10; /** for example "-test" */ public final static String EXTRA = "";