From 9b9f96daf8f650d7013f0d3c3a4100af929f9ca5 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 28 Jul 2018 19:34:16 +0000
Subject: [PATCH] i2psnark: Tweak 1st column sort order
---
.../java/src/org/klomp/snark/web/I2PSnarkServlet.java | 2 +-
apps/i2psnark/java/src/org/klomp/snark/web/Sorters.java | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
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 0a9fb8e731..d8cbd840f5 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -479,7 +479,7 @@ public class I2PSnarkServlet extends BasicServlet {
String currentSort = req.getParameter("sort");
boolean showSort = total > 1;
out.write("<tr><th class=\"snarkGraphicStatus\">");
- String sort = ("2".equals(currentSort)) ? "-2" : "2";
+ String sort = ("-2".equals(currentSort)) ? "2" : "-2";
if (showSort) {
out.write("<a href=\"" + _contextPath + '/' + getQueryString(req, null, null, sort));
out.write("\">");
diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/Sorters.java b/apps/i2psnark/java/src/org/klomp/snark/web/Sorters.java
index 288075a125..6f1f386b48 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/Sorters.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/Sorters.java
@@ -128,6 +128,7 @@ class Sorters {
private static class TorrentNameComparator implements Comparator<Snark>, Serializable {
private final Pattern _p;
+ private static final Collator _c = Collator.getInstance();
/** @param lang may be null */
private TorrentNameComparator(String lang) {
@@ -155,7 +156,7 @@ class Sorters {
if (m.matches())
rs = rs.substring(m.group(1).length());
}
- return Collator.getInstance().compare(ls, rs);
+ return _c.compare(ls, rs);
}
}
@@ -207,10 +208,10 @@ class Sorters {
long remaining = snark.getRemainingLength();
if (snark.isStopped()) {
if (remaining < 0)
- return 0;
+ return 10;
if (remaining > 0)
return 5;
- return 10;
+ return 0;
}
if (snark.isStarting())
return 15;
--
GitLab