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); byte[] ih = Base64.decode(b64);
// ignore value - TODO put tracker URL in value // ignore value - TODO put tracker URL in value
if (ih != null && ih.length == 20) 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? // 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); _log = ctx.logManager().getLog(FetchAndAdd.class);
_mgr = mgr; _mgr = mgr;
_url = url; _url = url;
_name = "* " + _("Download torrent file from {0}", url); _name = _("Download torrent file from {0}", url);
byte[] fake = null; byte[] fake = null;
try { try {
fake = SHA1.getInstance().digest(url.getBytes("ISO-8859-1")); 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()); TreeSet<String> fileNames = new TreeSet(new TorrentNameComparator());
fileNames.addAll(files); fileNames.addAll(files);
ArrayList<Snark> rv = new ArrayList(fileNames.size()); ArrayList<Snark> rv = new ArrayList(fileNames.size());
int magnet = 0;
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);
if (snark != null) if (snark != null) {
rv.add(snark); // put downloads and magnets first
if (snark.getStorage() == null)
rv.add(magnet++, snark);
else
rv.add(snark);
}
} }
return rv; return rv;
} }
@ -1783,7 +1789,7 @@ public class I2PSnarkServlet extends DefaultServlet {
} }
ihash = xt.substring("urn:btih:".length()); ihash = xt.substring("urn:btih:".length());
trackerURL = getTrackerParam(url); trackerURL = getTrackerParam(url);
name = "* " + _("Magnet") + ' ' + ihash; name = _("Magnet") + ' ' + ihash;
String dn = getParam("dn", url); String dn = getParam("dn", url);
if (dn != null) if (dn != null)
name += " (" + Storage.filterName(dn) + ')'; name += " (" + Storage.filterName(dn) + ')';
@ -1793,7 +1799,7 @@ public class I2PSnarkServlet extends DefaultServlet {
int col = ihash.indexOf(':'); int col = ihash.indexOf(':');
if (col >= 0) if (col >= 0)
ihash = ihash.substring(0, col); ihash = ihash.substring(0, col);
name = "* " + _("Magnet") + ' ' + ihash; name = _("Magnet") + ' ' + ihash;
} else { } else {
return; return;
} }

5
history.txt
View File

@ -1,3 +1,8 @@
2012-08-31 zzz
* i2psnark: Remove * from magnet and download names
* Router: Lengthen shutdown spinner life
* Startup: Don't complain about clients.config missing on Android
2012-08-29 zzz 2012-08-29 zzz
* ClientManager: Cleanups * ClientManager: Cleanups
* i2psnark: * i2psnark:

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

@ -18,7 +18,7 @@ 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 = 21; public final static long BUILD = 22;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "";