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

i2psnark: Change default sort order for some columns (ticket #2152)

Browse Source
This commit is contained in:
zzz
2018-03-24 12:45:15 +00:00
parent 2a30bfedca
commit a1ccd5a209
3 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -542,7 +542,7 @@ public class I2PSnarkServlet extends BasicServlet {
out.write("</th>\n<th class=\"snarkTorrentETA\" align=\"right\">"); out.write("</th>\n<th class=\"snarkTorrentETA\" align=\"right\">");
if (_manager.util().connected() && !snarks.isEmpty()) { if (_manager.util().connected() && !snarks.isEmpty()) {
if (showSort) { if (showSort) {
sort = ("4".equals(currentSort)) ? "-4" : "4"; sort = ("-4".equals(currentSort)) ? "4" : "-4";
out.write("<a href=\"" + _contextPath + '/' + getQueryString(req, null, null, sort)); out.write("<a href=\"" + _contextPath + '/' + getQueryString(req, null, null, sort));
out.write("\">"); out.write("\">");
} }
@ -558,16 +558,16 @@ public class I2PSnarkServlet extends BasicServlet {
// cycle through sort by size or downloaded // cycle through sort by size or downloaded
boolean isDlSort = false; boolean isDlSort = false;
if (showSort) { if (showSort) {
if ("5".equals(currentSort)) { if ("-5".equals(currentSort)) {
sort = "-5"; sort = "5";
} else if ("-5".equals(currentSort)) { } else if ("5".equals(currentSort)) {
sort = "6";
isDlSort = true;
} else if ("6".equals(currentSort)) {
sort = "-6"; sort = "-6";
isDlSort = true; isDlSort = true;
} else if ("-6".equals(currentSort)) {
sort = "6";
isDlSort = true;
} else { } else {
sort = "5"; sort = "-5";
} }
out.write("<a href=\"" + _contextPath + '/' + getQueryString(req, null, null, sort)); out.write("<a href=\"" + _contextPath + '/' + getQueryString(req, null, null, sort));
out.write("\">"); out.write("\">");
@ -585,20 +585,20 @@ public class I2PSnarkServlet extends BasicServlet {
// cycle through sort by uploaded or ratio // cycle through sort by uploaded or ratio
boolean nextRatSort = false; boolean nextRatSort = false;
if (showSort) { if (showSort) {
if ("7".equals(currentSort)) { if ("-7".equals(currentSort)) {
sort = "-7"; sort = "7";
} else if ("-7".equals(currentSort)) { } else if ("7".equals(currentSort)) {
sort = "11";
nextRatSort = true;
} else if ("11".equals(currentSort)) {
sort = "-11"; sort = "-11";
nextRatSort = true; nextRatSort = true;
isRatSort = true;
} else if ("-11".equals(currentSort)) { } else if ("-11".equals(currentSort)) {
sort = "7"; sort = "11";
nextRatSort = true;
isRatSort = true;
} else if ("11".equals(currentSort)) {
sort = "-7";
isRatSort = true; isRatSort = true;
} else { } else {
sort = "7"; sort = "-7";
} }
out.write("<a href=\"" + _contextPath + '/' + getQueryString(req, null, null, sort)); out.write("<a href=\"" + _contextPath + '/' + getQueryString(req, null, null, sort));
out.write("\">"); out.write("\">");
@ -614,7 +614,7 @@ public class I2PSnarkServlet extends BasicServlet {
out.write("</th>\n<th class=\"snarkTorrentRateDown\" align=\"right\">"); out.write("</th>\n<th class=\"snarkTorrentRateDown\" align=\"right\">");
if (_manager.util().connected() && !snarks.isEmpty()) { if (_manager.util().connected() && !snarks.isEmpty()) {
if (showSort) { if (showSort) {
sort = ("8".equals(currentSort)) ? "-8" : "8"; sort = ("-8".equals(currentSort)) ? "8" : "-8";
out.write("<a href=\"" + _contextPath + '/' + getQueryString(req, null, null, sort)); out.write("<a href=\"" + _contextPath + '/' + getQueryString(req, null, null, sort));
out.write("\">"); out.write("\">");
} }
@ -629,7 +629,7 @@ public class I2PSnarkServlet extends BasicServlet {
out.write("</th>\n<th class=\"snarkTorrentRateUp\" align=\"right\">"); out.write("</th>\n<th class=\"snarkTorrentRateUp\" align=\"right\">");
if (_manager.util().connected() && !snarks.isEmpty()) { if (_manager.util().connected() && !snarks.isEmpty()) {
if (showSort) { if (showSort) {
sort = ("9".equals(currentSort)) ? "-9" : "9"; sort = ("-9".equals(currentSort)) ? "9" : "-9";
out.write("<a href=\"" + _contextPath + '/' + getQueryString(req, null, null, sort)); out.write("<a href=\"" + _contextPath + '/' + getQueryString(req, null, null, sort));
out.write("\">"); out.write("\">");
} }

6
history.txt
View File

@ -1,3 +1,9 @@
2018-03-24 zzz
* i2psnark: Change default sort order for some columns (ticket #2152)
2018-03-19 zzz
* i2ptunnel: Rewrite or pass through Accept: header
2018-03-15 zzz 2018-03-15 zzz
* i2psnark: Start even if data directory not found (ticket #2166) * i2psnark: Start even if data directory not found (ticket #2166)

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

@ -18,10 +18,10 @@ 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 = 19; public final static long BUILD = 20;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "-rc";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
public static void main(String args[]) { public static void main(String args[]) {
System.out.println("I2P Router version: " + FULL_VERSION); System.out.println("I2P Router version: " + FULL_VERSION);