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

i2psnark: Remove * from magnet and download names

Browse Source
This commit is contained in:
zzz
2012-08-31 13:58:37 +00:00
parent 26898f38ad
commit 506626d6b1
5 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1484,7 +1484,7 @@ public class SnarkManager implements Snark.CompleteListener {
byte[] ih = Base64.decode(b64);
// ignore value - TODO put tracker URL in value
if (ih != null && ih.length == 20)
addMagnet("* " + _("Magnet") + ' ' + I2PSnarkUtil.toHex(ih), ih, null, false);
addMagnet(_("Magnet") + ' ' + I2PSnarkUtil.toHex(ih), ih, null, false);
// else remove from config?
}
}

2
apps/i2psnark/java/src/org/klomp/snark/web/FetchAndAdd.java
View File

@ -72,7 +72,7 @@ public class FetchAndAdd extends Snark implements EepGet.StatusListener, Runnabl
_log = ctx.logManager().getLog(FetchAndAdd.class);
_mgr = mgr;
_url = url;
_name = "* " + _("Download torrent file from {0}", url);
_name = _("Download torrent file from {0}", url);
byte[] fake = null;
try {
fake = SHA1.getInstance().digest(url.getBytes("ISO-8859-1"));

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

@ -912,11 +912,17 @@ public class I2PSnarkServlet extends DefaultServlet {
TreeSet<String> fileNames = new TreeSet(new TorrentNameComparator());
fileNames.addAll(files);
ArrayList<Snark> rv = new ArrayList(fileNames.size());
int magnet = 0;
for (Iterator iter = fileNames.iterator(); iter.hasNext(); ) {
String name = (String)iter.next();
Snark snark = _manager.getTorrent(name);
if (snark != null)
rv.add(snark);
if (snark != null) {
// put downloads and magnets first
if (snark.getStorage() == null)
rv.add(magnet++, snark);
else
rv.add(snark);
}
}
return rv;
}
@ -1783,7 +1789,7 @@ public class I2PSnarkServlet extends DefaultServlet {
}
ihash = xt.substring("urn:btih:".length());
trackerURL = getTrackerParam(url);
name = "* " + _("Magnet") + ' ' + ihash;
name = _("Magnet") + ' ' + ihash;
String dn = getParam("dn", url);
if (dn != null)
name += " (" + Storage.filterName(dn) + ')';
@ -1793,7 +1799,7 @@ public class I2PSnarkServlet extends DefaultServlet {
int col = ihash.indexOf(':');
if (col >= 0)
ihash = ihash.substring(0, col);
name = "* " + _("Magnet") + ' ' + ihash;
name = _("Magnet") + ' ' + ihash;
} else {
return;
}