idk/muwire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

format the results as table, add download buttons

Browse Source
This commit is contained in:
Zlatin Balevsky
2019-11-30 21:55:41 +00:00
parent a2022415c2
commit 0bff4b55a5
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webui/src/main/java/com/muwire/webui/SearchResults.java
View File

@@ -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<Persona, Set<UIResultEvent>> getBySender() {
return bySender;
}
public Set<UIResultEvent> getByInfoHash(InfoHash infoHash) {
return bySender.values().stream().
flatMap(r -> r.stream()).
filter(r -> r.getInfohash().equals(infoHash)).
collect(Collectors.toSet());
}
}

14
webui/src/main/webapp/Home.jsp
View File

@@ -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<UIResultEvent> results = searchResults.getBySender().get(sender);
StringBuilder sb = new StringBuilder();
sb.append("<table width='100%'>");
results.forEach(result -> {
sb.append(result.getName()).append(" size: ").append(result.getSize()).append("</br>");
sb.append("<tr>");
sb.append("<td>").append(result.getName()).append("</td>");
sb.append("<td>").append(DataHelper.formatSize2Decimal(result.getSize(),false)).append("B").append("</td>");
sb.append("<td><form action='/MuWire/Download' method='post'><input type='hidden' name='infoHash' value='");
sb.append(net.i2p.data.Base64.encode(result.getInfohash().getRoot()));
sb.append("'/><input type='submit' value='Download'></form></td>");
sb.append("</tr>");
});
sb.append("</table>");
out.print(sb.toString());
}