zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i2psnark: Don't display "Tracker Error" if torrent is stopped (ticket #1654)

Browse Source
This commit is contained in:
zzz
2015-09-18 20:15:06 +00:00
parent ff420278c5
commit 83791b2d10
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1475,7 +1475,8 @@ public class I2PSnarkServlet extends BasicServlet {
} else if (snark.isAllocating()) { } else if (snark.isAllocating()) {
statusString = toThemeImg("stalled", "", _("Allocating")) + "</td>" + statusString = toThemeImg("stalled", "", _("Allocating")) + "</td>" +
"<td class=\"snarkTorrentStatus\">" + _("Allocating"); "<td class=\"snarkTorrentStatus\">" + _("Allocating");
} else if (err != null && curPeers == 0) { } else if (err != null && isRunning && curPeers == 0) {
//} else if (err != null && curPeers == 0) {
// Also don't show if seeding... but then we won't see the not-registered error // Also don't show if seeding... but then we won't see the not-registered error
// && remaining != 0 && needed != 0) { // && remaining != 0 && needed != 0) {
// let's only show this if we have no peers, otherwise PEX and DHT should bail us out, user doesn't care // let's only show this if we have no peers, otherwise PEX and DHT should bail us out, user doesn't care
@@ -1486,19 +1487,19 @@ public class I2PSnarkServlet extends BasicServlet {
// curPeers + thinsp(noThinsp) + // curPeers + thinsp(noThinsp) +
// ngettext("1 peer", "{0} peers", knownPeers) + "</a>"; // ngettext("1 peer", "{0} peers", knownPeers) + "</a>";
//else if (isRunning) //else if (isRunning)
if (isRunning) //if (isRunning) {
statusString = toThemeImg("trackererror", "", err) + "</td>" + statusString = toThemeImg("trackererror", "", err) + "</td>" +
"<td class=\"snarkTorrentStatus\">" + _("Tracker Error") + "<td class=\"snarkTorrentStatus\">" + _("Tracker Error") +
": " + curPeers + thinsp(noThinsp) + ": " + curPeers + thinsp(noThinsp) +
ngettext("1 peer", "{0} peers", knownPeers); ngettext("1 peer", "{0} peers", knownPeers);
else { //} else {
if (err.length() > MAX_DISPLAYED_ERROR_LENGTH) // if (err.length() > MAX_DISPLAYED_ERROR_LENGTH)
err = DataHelper.escapeHTML(err.substring(0, MAX_DISPLAYED_ERROR_LENGTH)) + "&hellip;"; // err = DataHelper.escapeHTML(err.substring(0, MAX_DISPLAYED_ERROR_LENGTH)) + "&hellip;";
else // else
err = DataHelper.escapeHTML(err); // err = DataHelper.escapeHTML(err);
statusString = toThemeImg("trackererror", "", err) + "</td>" + // statusString = toThemeImg("trackererror", "", err) + "</td>" +
"<td class=\"snarkTorrentStatus\">" + _("Tracker Error"); // "<td class=\"snarkTorrentStatus\">" + _("Tracker Error");
} //}
} else if (snark.isStarting()) { } else if (snark.isStarting()) {
statusString = toThemeImg("stalled", "", _("Starting")) + "</td>" + statusString = toThemeImg("stalled", "", _("Starting")) + "</td>" +
"<td class=\"snarkTorrentStatus\">" + _("Starting"); "<td class=\"snarkTorrentStatus\">" + _("Starting");