From 7183f15c5caeef251d61aecb9ec2af9a95a30f3b Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Thu, 12 Mar 2020 23:33:04 +0000 Subject: [PATCH] plumbing for /Feeds page --- .../java/com/muwire/webui/FeedServlet.java | 3 +- .../src/main/java/com/muwire/webui/Util.java | 1 + webui/src/main/js/feeds.js | 10 ++++ webui/src/main/webapp/Feeds.jsp | 53 +++++++++++++++++++ webui/src/main/webapp/sidebar.jsi | 6 +++ webui/templates/web.xml.template | 14 +++++ 6 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 webui/src/main/js/feeds.js create mode 100644 webui/src/main/webapp/Feeds.jsp diff --git a/webui/src/main/java/com/muwire/webui/FeedServlet.java b/webui/src/main/java/com/muwire/webui/FeedServlet.java index 2f847f8a..8f4c12b0 100644 --- a/webui/src/main/java/com/muwire/webui/FeedServlet.java +++ b/webui/src/main/java/com/muwire/webui/FeedServlet.java @@ -122,6 +122,7 @@ public class FeedServlet extends HttpServlet { } feedManager.subscribe(host); Util.pause(); + resp.sendRedirect("/MuWire/Feeds"); } else if (action.equals("unsubscribe")) { String personaB64 = req.getParameter("host"); if (personaB64 == null) { @@ -173,7 +174,7 @@ public class FeedServlet extends HttpServlet { Optional itemOptional = core.getFeedManager().getFeedItems(host). stream().filter(item -> item.getInfoHash().equals(infoHash)).findFirst(); - if (itemOptional.isEmpty()) + if (!itemOptional.isPresent()) return; FeedItem item = itemOptional.get(); diff --git a/webui/src/main/java/com/muwire/webui/Util.java b/webui/src/main/java/com/muwire/webui/Util.java index 7bf30568..10fe8bc1 100644 --- a/webui/src/main/java/com/muwire/webui/Util.java +++ b/webui/src/main/java/com/muwire/webui/Util.java @@ -51,6 +51,7 @@ public class Util { _x("Downloading"), _x("Enter Reason (Optional)"), _x("ETA"), + _x("Feeds"), _x("Fetching Certificates"), _x("File"), _x("Hashing"), diff --git a/webui/src/main/js/feeds.js b/webui/src/main/js/feeds.js new file mode 100644 index 00000000..25984e81 --- /dev/null +++ b/webui/src/main/js/feeds.js @@ -0,0 +1,10 @@ + +function initFeeds() { + setTimeout(refreshActive, 1) + setInterval(refreshActive, 3000) +} + + +function refreshActive() { + // TODO: write +} diff --git a/webui/src/main/webapp/Feeds.jsp b/webui/src/main/webapp/Feeds.jsp new file mode 100644 index 00000000..c55e0daa --- /dev/null +++ b/webui/src/main/webapp/Feeds.jsp @@ -0,0 +1,53 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ page import="com.muwire.webui.*" %> +<%@include file="initcode.jsi"%> + +<% + +String pagetitle=Util._t("Feeds"); + +%> + + + +<%@ include file="css.jsi"%> + + + + + + + +<%@ include file="header.jsi"%> + +
+
+
+
+
+
+
+
+
+
+
+
+
+ + diff --git a/webui/src/main/webapp/sidebar.jsi b/webui/src/main/webapp/sidebar.jsi index 270b1ed0..8b88c5de 100644 --- a/webui/src/main/webapp/sidebar.jsi +++ b/webui/src/main/webapp/sidebar.jsi @@ -43,6 +43,12 @@ <%=Util._t("Browse")%> + +
+
+ <%=Util._t("Feeds")%> +
+
diff --git a/webui/templates/web.xml.template b/webui/templates/web.xml.template index 22f4a804..78f64717 100644 --- a/webui/templates/web.xml.template +++ b/webui/templates/web.xml.template @@ -66,6 +66,11 @@ com.muwire.webui.UploadServlet + + com.muwire.webui.FeedServlet + com.muwire.webui.FeedServlet + + com.muwire.webui.MuWireServlet /index.jsp @@ -121,6 +126,10 @@ /Upload + + com.muwire.webui.FeedServlet + /Feed + __JASPER__ @@ -184,4 +193,9 @@ Mappings without the .jsp suffix /Uploads + + com.muwire.webui.Feeds_jsp + /Feeds + +