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

* i2psnark: Skip 'the' when sorting snarks

Browse Source
This commit is contained in:
zzz
2010-05-05 17:45:52 +00:00
parent 7344c2af47
commit c2c379c994
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
View File

@ -30,7 +30,7 @@ public class SnarkManager implements Snark.CompleteListener {
public static SnarkManager instance() { return _instance; } public static SnarkManager instance() { return _instance; }
/** map of (canonical) filename to Snark instance (unsynchronized) */ /** map of (canonical) filename to Snark instance (unsynchronized) */
private final Map _snarks; private final Map<String, Snark> _snarks;
private final Object _addSnarkLock; private final Object _addSnarkLock;
private /* FIXME final FIXME */ File _configFile; private /* FIXME final FIXME */ File _configFile;
private Properties _config; private Properties _config;
@ -394,7 +394,7 @@ public class SnarkManager implements Snark.CompleteListener {
private static final int MAX_FILES_PER_TORRENT = 512; private static final int MAX_FILES_PER_TORRENT = 512;
/** set of filenames that we are dealing with */ /** set of filenames that we are dealing with */
public Set listTorrentFiles() { synchronized (_snarks) { return new HashSet(_snarks.keySet()); } } public Set<String> listTorrentFiles() { synchronized (_snarks) { return new HashSet(_snarks.keySet()); } }
/** /**
* Grab the torrent given the (canonical) filename * Grab the torrent given the (canonical) filename
*/ */

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

@ -7,6 +7,7 @@ import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.text.Collator; import java.text.Collator;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -176,7 +177,7 @@ public class I2PSnarkServlet extends Default {
String uri = req.getRequestURI(); String uri = req.getRequestURI();
out.write(TABLE_HEADER); out.write(TABLE_HEADER);
out.write(_("Status")); out.write(_("Status"));
if (_manager.util().connected() && snarks.size() > 0) { if (_manager.util().connected() && !snarks.isEmpty()) {
out.write(" (<a href=\""); out.write(" (<a href=\"");
out.write(req.getRequestURI()); out.write(req.getRequestURI());
if (peerParam != null) { if (peerParam != null) {
@ -210,7 +211,7 @@ public class I2PSnarkServlet extends Default {
out.write("\">"); out.write("\">");
out.write(_("Stop All")); out.write(_("Stop All"));
out.write("</a>"); out.write("</a>");
} else if (snarks.size() > 0) { } else if (!snarks.isEmpty()) {
out.write("<a href=\"" + uri + "?action=StartAll&nonce=" + _nonce + out.write("<a href=\"" + uri + "?action=StartAll&nonce=" + _nonce +
"\" title=\""); "\" title=\"");
out.write(_("Start all torrents and the I2P tunnel")); out.write(_("Start all torrents and the I2P tunnel"));
@ -228,7 +229,7 @@ public class I2PSnarkServlet extends Default {
displaySnark(out, snark, uri, i, stats, showPeers, showDebug); displaySnark(out, snark, uri, i, stats, showPeers, showDebug);
} }
if (snarks.size() <= 0) { if (snarks.isEmpty()) {
out.write("<tr class=\"snarkTorrentEven\">" + out.write("<tr class=\"snarkTorrentEven\">" +
"<td class=\"snarkTorrentEven\" align=\"center\"" + "<td class=\"snarkTorrentEven\" align=\"center\"" +
" colspan=\"8\"><i>"); " colspan=\"8\"><i>");
@ -485,11 +486,34 @@ public class I2PSnarkServlet extends Default {
} }
} }
private List getSortedSnarks(HttpServletRequest req) { /**
Set files = _manager.listTorrentFiles(); * Sort alphabetically in current locale, ignore case, ignore leading "the "
TreeSet fileNames = new TreeSet(Collator.getInstance()); // sorts it alphabetically * (I guess this is worth it, a lot of torrents start with "The "
* These are full path names which makes it harder
* @since 0.7.14
*/
private class TorrentNameComparator implements Comparator<String> {
private final Comparator collator = Collator.getInstance();
private final String skip = _manager.getDataDir().getAbsolutePath() + File.separator;
public int compare(String l, String r) {
if (l.startsWith(skip))
l = l.substring(skip.length());
if (r.startsWith(skip))
r = r.substring(skip.length());
if (l.toLowerCase().startsWith("the "))
l = l.substring(4);
if (r.toLowerCase().startsWith("the "))
r = r.substring(4);
return collator.compare(l, r);
}
}
private List<Snark> getSortedSnarks(HttpServletRequest req) {
Set<String> files = _manager.listTorrentFiles();
TreeSet<String> fileNames = new TreeSet(new TorrentNameComparator());
fileNames.addAll(files); fileNames.addAll(files);
ArrayList rv = new ArrayList(fileNames.size()); ArrayList<Snark> rv = new ArrayList(fileNames.size());
for (Iterator iter = fileNames.iterator(); iter.hasNext(); ) { for (Iterator iter = fileNames.iterator(); iter.hasNext(); ) {
String name = (String)iter.next(); String name = (String)iter.next();
Snark snark = _manager.getTorrent(name); Snark snark = _manager.getTorrent(name);