diff --git a/webui/src/main/java/com/muwire/webui/SearchResults.java b/webui/src/main/java/com/muwire/webui/SearchResults.java index 566a9e9d..789fe048 100644 --- a/webui/src/main/java/com/muwire/webui/SearchResults.java +++ b/webui/src/main/java/com/muwire/webui/SearchResults.java @@ -7,7 +7,9 @@ import java.util.Map; import java.util.Set; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Collectors; +import com.muwire.core.InfoHash; import com.muwire.core.Persona; import com.muwire.core.search.UIResultBatchEvent; import com.muwire.core.search.UIResultEvent; @@ -44,5 +46,12 @@ public class SearchResults { public Map> getBySender() { return bySender; } + + public Set getByInfoHash(InfoHash infoHash) { + return bySender.values().stream(). + flatMap(r -> r.stream()). + filter(r -> r.getInfohash().equals(infoHash)). + collect(Collectors.toSet()); + } } diff --git a/webui/src/main/webapp/Home.jsp b/webui/src/main/webapp/Home.jsp index 03d4ca89..47a051f8 100644 --- a/webui/src/main/webapp/Home.jsp +++ b/webui/src/main/webapp/Home.jsp @@ -5,7 +5,7 @@ <%@ page import="com.muwire.webui.*" %> <%@ page import="com.muwire.core.*" %> <%@ page import="com.muwire.core.search.*" %> -<%@ page import="net.i2p.data.Base64" %> +<%@ page import="net.i2p.data.*" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> @@ -71,14 +71,22 @@ SearchResults searchResults = searchManager.getResults().get(uuid); String senderB64 = request.getParameter("sender"); - Persona sender = new Persona(new ByteArrayInputStream(Base64.decode(senderB64))); + Persona sender = new Persona(new ByteArrayInputStream(net.i2p.data.Base64.decode(senderB64))); Set results = searchResults.getBySender().get(sender); StringBuilder sb = new StringBuilder(); + sb.append(""); results.forEach(result -> { - sb.append(result.getName()).append(" size: ").append(result.getSize()).append("
"); + sb.append(""); + sb.append(""); + sb.append(""); + sb.append(""); + sb.append(""); }); + sb.append("
").append(result.getName()).append("").append(DataHelper.formatSize2Decimal(result.getSize(),false)).append("B").append("
"); out.print(sb.toString()); }