This commit is contained in:
Telesphoreo 2022-04-17 18:54:38 -05:00
parent c7658647fc
commit 33a72983d2
2 changed files with 27 additions and 3 deletions

View file

@ -13,6 +13,8 @@ import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.text.CharacterIterator;
import java.text.StringCharacterIterator;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import lombok.Data; import lombok.Data;
@ -73,7 +75,10 @@ public class AbstractServlet extends HttpServlet
try try
{ {
Object object = mapping.method.invoke(this, req, resp); Object object = mapping.method.invoke(this, req, resp);
if (object != null) resp.getWriter().println(object.toString()); if (object != null)
{
resp.getWriter().println(object.toString());
}
} }
catch (IOException | IllegalAccessException | InvocationTargetException e) catch (IOException | IllegalAccessException | InvocationTargetException e)
{ {
@ -101,6 +106,25 @@ public class AbstractServlet extends HttpServlet
return contentBuilder.toString(); return contentBuilder.toString();
} }
// Code from https://programming.guide/java/formatting-byte-size-to-human-readable-format.html
public static String formattedSize(long bytes)
{
long absB = bytes == Long.MIN_VALUE ? Long.MAX_VALUE : Math.abs(bytes);
if (absB < 1024)
{
return bytes + " B";
}
long value = absB;
CharacterIterator ci = new StringCharacterIterator("KMGTPE");
for (int i = 40; i >= 0 && absB > 0xfffccccccccccccL >> i; i -= 10)
{
value >>= 10;
ci.next();
}
value *= Long.signum(bytes);
return String.format("%.1f %ciB", value / 1024.0, ci.current());
}
@Data @Data
public static class Mapping public static class Mapping
{ {

View file

@ -22,7 +22,7 @@ public class SchematicEndpoint extends AbstractServlet
} }
else else
{ {
OutputStream outputStream = null; OutputStream outputStream;
try try
{ {
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
@ -93,7 +93,7 @@ public class SchematicEndpoint extends AbstractServlet
{ {
sb.append("<tr>" + sb.append("<tr>" +
"<th scope=\"row\"><a href=\"" + worldeditFile.getName() + "\" download>" + worldeditFile.getName() + "</a></th>" + "<th scope=\"row\"><a href=\"" + worldeditFile.getName() + "\" download>" + worldeditFile.getName() + "</a></th>" +
"<td>" + worldeditFile.length() + "B" + "</td>" + "<td>" + formattedSize(worldeditFile.length()) + "</td>" +
"</tr>"); "</tr>");
} }
file = file.replace("${schematics}", sb.toString()); file = file.replace("${schematics}", sb.toString());