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

To improve themability, make torrent info table in snark filemanager a single column

Browse Source
This commit is contained in:
str4d
2012-07-09 21:17:02 +00:00
parent 9c7f9a935b
commit 8d9909acfb
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2054,63 +2054,63 @@ public class I2PSnarkServlet extends DefaultServlet {
buf.append("<table class=\"snarkTorrentInfo\">\n"); buf.append("<table class=\"snarkTorrentInfo\">\n");
buf.append("<tr><th>") buf.append("<tr><th>")
.append(_("Torrent")) .append(_("Torrent"))
.append(":</th><td>") .append(": ")
.append(snark.getBaseName()) .append(snark.getBaseName())
.append("</td></tr>\n"); .append("</th></tr>\n");
int pieces = snark.getPieces(); int pieces = snark.getPieces();
double completion = (pieces - snark.getNeeded()) / (double) pieces; double completion = (pieces - snark.getNeeded()) / (double) pieces;
if (completion < 1.0) if (completion < 1.0)
buf.append("<tr><th>") buf.append("<tr><td>")
.append(_("Completion")) .append(_("Completion"))
.append(":</th><td>") .append(": ")
.append((new DecimalFormat("0.00%")).format(completion)) .append((new DecimalFormat("0.00%")).format(completion))
.append("</td></tr>\n"); .append("</td></tr>\n");
else else
buf.append("<tr><td colspan=\"2\">") buf.append("<tr><td>")
.append(_("Complete")) .append(_("Complete"))
.append("</td></tr>\n"); .append("</td></tr>\n");
// else unknown // else unknown
long needed = snark.getNeededLength(); long needed = snark.getNeededLength();
if (needed > 0) if (needed > 0)
buf.append("<tr><th>") buf.append("<tr><td>")
.append(_("Remaining")) .append(_("Remaining"))
.append(":</th><td>") .append(": ")
.append(formatSize(needed)) .append(formatSize(needed))
.append("</td></tr>\n"); .append("</td></tr>\n");
buf.append("<tr><th>") buf.append("<tr><td>")
.append(_("Size")) .append(_("Size"))
.append(":</th><td>") .append(": ")
.append(formatSize(snark.getTotalLength())) .append(formatSize(snark.getTotalLength()))
.append("</td></tr>\n"); .append("</td></tr>\n");
MetaInfo meta = snark.getMetaInfo(); MetaInfo meta = snark.getMetaInfo();
if (meta != null) { if (meta != null) {
List files = meta.getFiles(); List files = meta.getFiles();
int fileCount = files != null ? files.size() : 1; int fileCount = files != null ? files.size() : 1;
buf.append("<tr><th>") buf.append("<tr><td>")
.append(_("Files")) .append(_("Files"))
.append(":</th><td>") .append(": ")
.append(fileCount) .append(fileCount)
.append("</td></tr>\n"); .append("</td></tr>\n");
} }
buf.append("<tr><th>") buf.append("<tr><td>")
.append(_("Pieces")) .append(_("Pieces"))
.append(":</th><td>") .append(": ")
.append(pieces) .append(pieces)
.append("</td></tr>\n"); .append("</td></tr>\n");
buf.append("<tr><th>") buf.append("<tr><td>")
.append(_("Piece size")) .append(_("Piece size"))
.append(":</th><td>") .append(": ")
.append(formatSize(snark.getPieceLength(0))) .append(formatSize(snark.getPieceLength(0)))
.append("</td></tr>\n"); .append("</td></tr>\n");
if (meta != null) { if (meta != null) {
String announce = meta.getAnnounce(); String announce = meta.getAnnounce();
if (announce != null) { if (announce != null) {
buf.append("<tr><th>"); buf.append("<tr><td>");
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(":</th><td>"); buf.append(_("Tracker")).append(": ");
if (announce.startsWith("http://")) if (announce.startsWith("http://"))
announce = announce.substring(7); announce = announce.substring(7);
int slsh = announce.indexOf('/'); int slsh = announce.indexOf('/');
@ -2124,23 +2124,23 @@ public class I2PSnarkServlet extends DefaultServlet {
String hex = I2PSnarkUtil.toHex(snark.getInfoHash()); String hex = I2PSnarkUtil.toHex(snark.getInfoHash());
if (meta == null || !meta.isPrivate()) { if (meta == null || !meta.isPrivate()) {
buf.append("<tr><th>") buf.append("<tr><td>")
.append(toImg("magnet", _("Magnet link"))) .append(toImg("magnet", _("Magnet link")))
.append("</th><td><a href=\"") .append(" <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");
} else { } else {
buf.append("<tr><td colspan=\"2\">") buf.append("<tr><td>")
.append(_("Private torrent")) .append(_("Private torrent"))
.append("</td></tr>\n"); .append("</td></tr>\n");
} }
// We don't have the hash of the torrent file // We don't have the hash of the torrent file
//buf.append("<tr><th>").append(_("Maggot link")).append(":</th><td><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><th>") buf.append("<tr><td>")
.append(_("Torrent file")) .append(_("Torrent file"))
.append(":</th><td>") .append(": ")
.append(snark.getName()) .append(snark.getName())
.append("</td></tr>\n"); .append("</td></tr>\n");
} else { } else {