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

Reordered torrent info section in snark filemanager - reduced to 4 info lines

Browse Source
This commit is contained in:
str4d
2012-07-10 19:03:48 +00:00
parent ebc4d53fa9
commit 709c75c517
1 changed files with 48 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2052,57 +2052,20 @@ public class I2PSnarkServlet extends DefaultServlet {
if (snark != null) { if (snark != null) {
// first table - torrent info // first table - torrent info
buf.append("<table class=\"snarkTorrentInfo\">\n"); buf.append("<table class=\"snarkTorrentInfo\">\n");
buf.append("<tr><th>") buf.append("<tr><th><b>")
.append(_("Torrent")) .append(_("Torrent"))
.append(": ") .append(":</b> ")
.append(snark.getBaseName()) .append(snark.getBaseName())
.append("</th></tr>\n"); .append("</th></tr>\n");
int pieces = snark.getPieces();
double completion = (pieces - snark.getNeeded()) / (double) pieces;
if (completion < 1.0)
buf.append("<tr><td>") buf.append("<tr><td>")
.append(_("Completion")) .append("<img alt=\"\" border=\"0\" src=\"" + _imgPath + "file.png\" >&nbsp;<b>")
.append(": ") .append(_("Torrent file"))
.append((new DecimalFormat("0.00%")).format(completion)) .append(":</b> ")
.append("</td></tr>\n"); .append(snark.getName())
else
buf.append("<tr><td>")
.append(_("Complete"))
.append("</td></tr>\n");
// else unknown
long needed = snark.getNeededLength();
if (needed > 0)
buf.append("<tr><td>")
.append(_("Remaining"))
.append(": ")
.append(formatSize(needed))
.append("</td></tr>\n");
buf.append("<tr><td>")
.append(_("Size"))
.append(": ")
.append(formatSize(snark.getTotalLength()))
.append("</td></tr>\n");
MetaInfo meta = snark.getMetaInfo();
if (meta != null) {
List files = meta.getFiles();
int fileCount = files != null ? files.size() : 1;
buf.append("<tr><td>")
.append(_("Files"))
.append(": ")
.append(fileCount)
.append("</td></tr>\n");
}
buf.append("<tr><td>")
.append(_("Pieces"))
.append(": ")
.append(pieces)
.append("</td></tr>\n");
buf.append("<tr><td>")
.append(_("Piece size"))
.append(": ")
.append(formatSize(snark.getPieceLength(0)))
.append("</td></tr>\n"); .append("</td></tr>\n");
MetaInfo meta = snark.getMetaInfo();
if (meta != null) { if (meta != null) {
String announce = meta.getAnnounce(); String announce = meta.getAnnounce();
if (announce != null) { if (announce != null) {
@ -2110,7 +2073,7 @@ public class I2PSnarkServlet extends DefaultServlet {
String trackerLink = getTrackerLink(announce, snark.getInfoHash()); String trackerLink = getTrackerLink(announce, snark.getInfoHash());
if (trackerLink != null) if (trackerLink != null)
buf.append(trackerLink).append(' '); buf.append(trackerLink).append(' ');
buf.append(_("Tracker")).append(": "); buf.append("<b>").append(_("Tracker")).append(":</b> ");
if (announce.startsWith("http://")) if (announce.startsWith("http://"))
announce = announce.substring(7); announce = announce.substring(7);
int slsh = announce.indexOf('/'); int slsh = announce.indexOf('/');
@ -2126,7 +2089,7 @@ public class I2PSnarkServlet extends DefaultServlet {
if (meta == null || !meta.isPrivate()) { if (meta == null || !meta.isPrivate()) {
buf.append("<tr><td>") buf.append("<tr><td>")
.append(toImg("magnet", _("Magnet link"))) .append(toImg("magnet", _("Magnet link")))
.append(" <a href=\"") .append(" <b>Magnet:</b> <a href=\"")
.append(MAGNET_FULL).append(hex).append("\">") .append(MAGNET_FULL).append(hex).append("\">")
.append(MAGNET_FULL).append(hex).append("</a>") .append(MAGNET_FULL).append(hex).append("</a>")
.append("</td></tr>\n"); .append("</td></tr>\n");
@ -2138,10 +2101,45 @@ public class I2PSnarkServlet extends DefaultServlet {
// We don't have the hash of the torrent file // We don't have the hash of the torrent file
//buf.append("<tr><td>").append(_("Maggot link")).append(": <a href=\"").append(MAGGOT).append(hex).append(':').append(hex).append("\">") //buf.append("<tr><td>").append(_("Maggot link")).append(": <a href=\"").append(MAGGOT).append(hex).append(':').append(hex).append("\">")
// .append(MAGGOT).append(hex).append(':').append(hex).append("</a></td></tr>"); // .append(MAGGOT).append(hex).append(':').append(hex).append("</a></td></tr>");
buf.append("<tr><td>") buf.append("<tr><td>")
.append(_("Torrent file")) .append("<img alt=\"\" border=\"0\" src=\"" + _imgPath + "size.png\" >&nbsp;<b>")
.append(": ") .append(_("Size"))
.append(snark.getName()) .append(":</b> ")
.append(formatSize(snark.getTotalLength()));
int pieces = snark.getPieces();
double completion = (pieces - snark.getNeeded()) / (double) pieces;
if (completion < 1.0)
buf.append("&nbsp;<img alt=\"\" border=\"0\" src=\"" + _imgPath + "head_rx.png\" >&nbsp;<b>")
.append(_("Completion"))
.append(":</b> ")
.append((new DecimalFormat("0.00%")).format(completion));
else
buf.append("&nbsp;<img alt=\"\" border=\"0\" src=\"" + _imgPath + "head_rx.png\" >&nbsp;")
.append(_("Complete"));
// else unknown
long needed = snark.getNeededLength();
if (needed > 0)
buf.append("&nbsp;<img alt=\"\" border=\"0\" src=\"" + _imgPath + "head_rx.png\" >&nbsp;<b>")
.append(_("Remaining"))
.append(":</b> ")
.append(formatSize(needed));
if (meta != null) {
List files = meta.getFiles();
int fileCount = files != null ? files.size() : 1;
buf.append("&nbsp;<img alt=\"\" border=\"0\" src=\"" + _imgPath + "file.png\" >&nbsp;<b>")
.append(_("Files"))
.append(":</b> ")
.append(fileCount);
}
buf.append("&nbsp;<img alt=\"\" border=\"0\" src=\"" + _imgPath + "file.png\" >&nbsp;<b>")
.append(_("Pieces"))
.append(":</b> ")
.append(pieces);
buf.append("&nbsp;<img alt=\"\" border=\"0\" src=\"" + _imgPath + "file.png\" >&nbsp;<b>")
.append(_("Piece size"))
.append(":</b> ")
.append(formatSize(snark.getPieceLength(0)))
.append("</td></tr>\n"); .append("</td></tr>\n");
} else { } else {
// shouldn't happen // shouldn't happen