* Add flag dimensions to speed up profiles.jsp rendering

* Fix typos in proxy error files
    * Catch i2psnark create torrent with no data entered error
      http://forum.i2p/viewtopic.php?t=3763
This commit is contained in:
zzz
2009-07-27 02:53:37 +00:00
parent cc533b0431
commit 256bb771e1
8 changed files with 20 additions and 9 deletions

View File

@ -190,6 +190,9 @@ public class Storage
} }
*/ */
/** FIXME we can run out of fd's doing this,
* maybe some sort of global close-RAF-right-away flag
* would do the trick */
private void fast_digestCreate() throws IOException { private void fast_digestCreate() throws IOException {
// Calculate piece_hashes // Calculate piece_hashes
SHA1 digest = new SHA1(); SHA1 digest = new SHA1();

View File

@ -318,7 +318,7 @@ public class I2PSnarkServlet extends HttpServlet {
_manager.updateConfig(dataDir, autoStart, seedPct, eepHost, eepPort, i2cpHost, i2cpPort, i2cpOpts, upLimit, upBW, useOpenTrackers, openTrackers); _manager.updateConfig(dataDir, autoStart, seedPct, eepHost, eepPort, i2cpHost, i2cpPort, i2cpOpts, upLimit, upBW, useOpenTrackers, openTrackers);
} else if ("Create torrent".equals(action)) { } else if ("Create torrent".equals(action)) {
String baseData = req.getParameter("baseFile"); String baseData = req.getParameter("baseFile");
if (baseData != null) { if (baseData != null && baseData.trim().length() > 0) {
File baseFile = new File(_manager.getDataDir(), baseData); File baseFile = new File(_manager.getDataDir(), baseData);
String announceURL = req.getParameter("announceURL"); String announceURL = req.getParameter("announceURL");
String announceURLOther = req.getParameter("announceURLOther"); String announceURLOther = req.getParameter("announceURLOther");
@ -351,6 +351,8 @@ public class I2PSnarkServlet extends HttpServlet {
} else { } else {
_manager.addMessage("Cannot create a torrent for the nonexistent data: " + baseFile.getAbsolutePath()); _manager.addMessage("Cannot create a torrent for the nonexistent data: " + baseFile.getAbsolutePath());
} }
} else {
_manager.addMessage("Error creating torrent - you must enter a file or directory");
} }
} else if ("StopAll".equals(action)) { } else if ("StopAll".equals(action)) {
_manager.addMessage("Stopping all torrents and closing the I2P tunnel."); _manager.addMessage("Stopping all torrents and closing the I2P tunnel.");

View File

@ -1,3 +1,9 @@
2009-07-27 zzz
* Add flag dimensions to speed up profiles.jsp rendering
* Catch i2psnark create torrent with no data entered error
http://forum.i2p/viewtopic.php?t=3763
* Fix typos in proxy error files
2009-07-26 zzz 2009-07-26 zzz
* Add wrapper.config and i2prouter comments for 'portable' * Add wrapper.config and i2prouter comments for 'portable'
* Recognize same base and config dir in WorkingDir * Recognize same base and config dir in WorkingDir

View File

@ -12,10 +12,10 @@ Proxy-Connection: close
<body> <body>
<div class=logo> <div class=logo>
<a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="I2P Router Console" border="0"/></a><hr> <a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="I2P Router Console" border="0"/></a><hr>
<a href="http://127.0.0.1:7657/config.jsp">Configuration</a> <a href="http://127.0.0.1:7657/help.jsp">Help</a> <a href="http://127.0.0.1:7657/susidns/">Addressbook</a> <a href="http://127.0.0.1:7657/config.jsp">Configuration</a> <a href="http://127.0.0.1:7657/help.jsp">Help</a> <a href="http://127.0.0.1:7657/susidns/index.jsp">Addressbook</a>
</div> </div>
<div class=warning id=warning> <div class=warning id=warning>
<h3>Warning: Eeepsite Unreachable</h3> <h3>Warning: Eepsite Unreachable</h3>
The eepsite was not reachable. The eepsite was not reachable.
The eepsite is offline, there is network congestion, The eepsite is offline, there is network congestion,
or your router is not yet well-integrated with peers. or your router is not yet well-integrated with peers.

View File

@ -12,10 +12,10 @@ Proxy-Connection: close
<body> <body>
<div class=logo> <div class=logo>
<a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="I2P Router Console" border="0"/></a><hr> <a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="I2P Router Console" border="0"/></a><hr>
<a href="http://127.0.0.1:7657/config.jsp">Configuration</a> <a href="http://127.0.0.1:7657/help.jsp">Help</a> <a href="http://127.0.0.1:7657/susidns/">Addressbook</a> <a href="http://127.0.0.1:7657/config.jsp">Configuration</a> <a href="http://127.0.0.1:7657/help.jsp">Help</a> <a href="http://127.0.0.1:7657/susidns/index.jsp">Addressbook</a>
</div> </div>
<div class=warning id=warning> <div class=warning id=warning>
<h3>Warning: Eeepsite Not Found in Addressbook</h3> <h3>Warning: Eepsite Not Found in Addressbook</h3>
The eepsite was not found in your router's addressbook. The eepsite was not found in your router's addressbook.
Check the link or find a BASE64 address. Check the link or find a BASE64 address.
If you have the BASE64 address, paste it into your userhosts.txt using If you have the BASE64 address, paste it into your userhosts.txt using

View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 27; public final static long BUILD = 28;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = "-rc"; public final static String EXTRA = "-rc";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;

View File

@ -1061,7 +1061,7 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade {
buf.append("<tr><th>Country</th><th>Count</th></tr>\n"); buf.append("<tr><th>Country</th><th>Count</th></tr>\n");
for (String country : countryList) { for (String country : countryList) {
int num = countries.count(country); int num = countries.count(country);
buf.append("<tr><td><img alt=\"").append(country.toUpperCase()).append("\""); buf.append("<tr><td><img height=\"11\" width=\"16\" alt=\"").append(country.toUpperCase()).append("\"");
buf.append(" src=\"/flags.jsp?c=").append(country).append("\"> "); buf.append(" src=\"/flags.jsp?c=").append(country).append("\"> ");
buf.append(_context.commSystem().getCountryName(country)); buf.append(_context.commSystem().getCountryName(country));
buf.append("</td><td align=\"right\">").append(num).append("</td></tr>\n"); buf.append("</td><td align=\"right\">").append(num).append("</td></tr>\n");
@ -1092,7 +1092,7 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade {
buf.append("Address(es): <i>"); buf.append("Address(es): <i>");
String country = _context.commSystem().getCountry(info.getIdentity().getHash()); String country = _context.commSystem().getCountry(info.getIdentity().getHash());
if(country != null) { if(country != null) {
buf.append("<img alt=\"").append(country.toUpperCase()).append("\""); buf.append("<img height=\"11\" width=\"16\" alt=\"").append(country.toUpperCase()).append("\"");
buf.append(" src=\"/flags.jsp?c=").append(country).append("\"> "); buf.append(" src=\"/flags.jsp?c=").append(country).append("\"> ");
} }
for (Iterator iter = info.getAddresses().iterator(); iter.hasNext(); ) { for (Iterator iter = info.getAddresses().iterator(); iter.hasNext(); ) {

View File

@ -467,7 +467,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
StringBuilder buf = new StringBuilder(128); StringBuilder buf = new StringBuilder(128);
String c = getCountry(peer); String c = getCountry(peer);
if (c != null) { if (c != null) {
buf.append("<img alt=\"").append(c.toUpperCase()).append("\" title=\""); buf.append("<img height=\"11\" width=\"16\" alt=\"").append(c.toUpperCase()).append("\" title=\"");
buf.append(getCountryName(c)); buf.append(getCountryName(c));
buf.append("\" src=\"/flags.jsp?c=").append(c).append("\"> "); buf.append("\" src=\"/flags.jsp?c=").append(c).append("\"> ");
} }