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

page count fix and cleanups

Browse Source
This commit is contained in:
zzz
2013-04-27 16:08:35 +00:00
parent 6f8fe0ecac
commit d7040a23e4
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -500,20 +500,21 @@ public class I2PSnarkServlet extends BasicServlet {
boolean showDebug = "2".equals(peerParam); boolean showDebug = "2".equals(peerParam);
int start = 0; int start = 0;
int total = snarks.size();
if (stParam != null) { if (stParam != null) {
try { try {
start = Math.max(0, Math.min(snarks.size() - 1, Integer.parseInt(stParam))); start = Math.max(0, Math.min(total - 1, Integer.parseInt(stParam)));
} catch (NumberFormatException nfe) {} } catch (NumberFormatException nfe) {}
} }
int pageSize = _manager.getPageSize(); int pageSize = Math.max(_manager.getPageSize(), 5);
for (int i = 0; i < snarks.size(); i++) { for (int i = 0; i < total; i++) {
Snark snark = (Snark)snarks.get(i); Snark snark = (Snark)snarks.get(i);
boolean showPeers = showDebug || "1".equals(peerParam) || Base64.encode(snark.getInfoHash()).equals(peerParam); boolean showPeers = showDebug || "1".equals(peerParam) || Base64.encode(snark.getInfoHash()).equals(peerParam);
boolean hide = i < start || i >= start + pageSize; boolean hide = i < start || i >= start + pageSize;
displaySnark(out, snark, uri, i, stats, showPeers, isDegraded, noThinsp, showDebug, hide); displaySnark(out, snark, uri, i, stats, showPeers, isDegraded, noThinsp, showDebug, hide);
} }
if (snarks.isEmpty()) { if (total == 0) {
out.write("<tr class=\"snarkTorrentNoneLoaded\">" + out.write("<tr class=\"snarkTorrentNoneLoaded\">" +
"<td class=\"snarkTorrentNoneLoaded\"" + "<td class=\"snarkTorrentNoneLoaded\"" +
" colspan=\"11\"><i>"); " colspan=\"11\"><i>");
@ -545,8 +546,7 @@ public class I2PSnarkServlet extends BasicServlet {
} }
} }
// Page count // Page count
int total = snarks.size(); int pages = 1 + ((total - 1) / pageSize);
int pages = 1 + (total / pageSize);
if (pages == 1 && start > 0) if (pages == 1 && start > 0)
pages = 2; pages = 2;
if (pages > 1) { if (pages > 1) {
@ -582,7 +582,7 @@ public class I2PSnarkServlet extends BasicServlet {
out.write("&nbsp;"); out.write("&nbsp;");
out.write(_("Totals")); out.write(_("Totals"));
out.write(":&nbsp;"); out.write(":&nbsp;");
out.write(ngettext("1 torrent", "{0} torrents", snarks.size())); out.write(ngettext("1 torrent", "{0} torrents", total));
out.write(", "); out.write(", ");
out.write(DataHelper.formatSize2(stats[5]) + "B, "); out.write(DataHelper.formatSize2(stats[5]) + "B, ");
out.write(ngettext("1 connected peer", "{0} connected peers", (int) stats[4])); out.write(ngettext("1 connected peer", "{0} connected peers", (int) stats[4]));